[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.12-55-g5b64f45

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 9eaa7d9579e025943d86f04945709ceaa5069a77
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Sun Jul 13 11:59:06 2008 +0200

    rebase two patches due to file path changes in the source

diff --git a/debian/changelog b/debian/changelog
index 647bc19..f08a570 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+omvviewer (1.20.13-1) experimental; urgency=low
+
+  * New Upstream Version
+    + Fix some patches for file path changes    
+      - Modify VWR-5082_set_bulk_inv_permissions.dpatch
+      - Modify trademark_compliance.dpatch
+
+ -- Robin Cornelius <robin.cornelius at gmail.com>  Sat, 12 Jul 2008 22:15:56 +0200
+
 omvviewer (1.20.12-2) experimental; urgency=low
 
   * Fix packaging mistake that resulted in clouds2.tga appearing in wrong package
diff --git a/debian/patches/VWR-5082_set_bulk_inv_permissions.dpatch b/debian/patches/VWR-5082_set_bulk_inv_permissions.dpatch
index b358e52..4c1065e 100644
--- a/debian/patches/VWR-5082_set_bulk_inv_permissions.dpatch
+++ b/debian/patches/VWR-5082_set_bulk_inv_permissions.dpatch
@@ -67,8 +67,8 @@ index 3e99384..1ec71ac 100644
  	addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
 diff --git a/indra/newview/skins/xui/en-us/menu_viewer.xml b/indra/newview/skins/xui/en-us/menu_viewer.xml
 index 054f867..eacd0ed 100644
---- a/indra/newview/skins/xui/en-us/menu_viewer.xml
-+++ b/indra/newview/skins/xui/en-us/menu_viewer.xml
+--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
++++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
 @@ -756,6 +756,11 @@
  			<on_click function="Tools.SelectedScriptAction" userdata="stop" />
  			<on_enable function="EditableSelected" />
@@ -761,7 +761,7 @@ index 054f867..eacd0ed 100644
 +
 +#endif
 --- /dev/null	2008-07-08 17:15:34.716012103 +0100
-+++ slviewer/indra/newview/skins/xui/en-us/floater_bulk_perms.xml	2008-07-08 18:58:20.000000000 +0100
++++ slviewer/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml	2008-07-08 18:58:20.000000000 +0100
 @@ -0,0 +1,120 @@
 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 +<floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true"
diff --git a/debian/patches/trademark_compliance.dpatch b/debian/patches/trademark_compliance.dpatch
index ae3e79c..457069e 100644
--- a/debian/patches/trademark_compliance.dpatch
+++ b/debian/patches/trademark_compliance.dpatch
@@ -43,8 +43,8 @@ Index: indra/newview/llappviewer.cpp
  		FALSE, ignorePixelDepth);
 Index: indra/newview/skins/xui/en-us/floater_about.xml
 ===================================================================
---- ./indra/newview/skins/xui/en-us/floater_about.xml	(revision 378)
-+++ ./indra/newview/skins/xui/en-us/floater_about.xml	(working copy)
+--- ./indra/newview/skins/default/xui/en-us/floater_about.xml	(revision 378)
++++ ./indra/newview/skins/default/xui/en-us/floater_about.xml	(working copy)
 @@ -7,6 +7,12 @@
  	     follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
    max_length="65536" mouse_opaque="true" name="credits_editor" width="458"

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids