[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 8526d3f6f4fdd83ab3a4c22a98d63755455583dc
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Sun Jul 13 12:04:56 2008 +0200

    finish rebasing patch

diff --git a/debian/patches/VWR-5082_set_bulk_inv_permissions.dpatch b/debian/patches/VWR-5082_set_bulk_inv_permissions.dpatch
index 4c1065e..d69a75b 100644
--- a/debian/patches/VWR-5082_set_bulk_inv_permissions.dpatch
+++ b/debian/patches/VWR-5082_set_bulk_inv_permissions.dpatch
@@ -65,7 +65,7 @@ index 3e99384..1ec71ac 100644
  
  	addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
  	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
+diff --git a/indra/newview/skins/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
 index 054f867..eacd0ed 100644
 --- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
 +++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml

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