2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 78f72b4..83b6e09 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -18,6 +18,11 @@
          
                 modified:   linden/indra/newview/llprefschat.cpp
         modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+                
+                
+     * Commented out permissions button (todo: backport this if there's time).
+         
+                modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
 
 
 2009-09-07  McCabe Maxsted  <hakushakukun@gmail.com>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 411eec3..bc18f44 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1240,9 +1240,9 @@
                               label="New Script" label_selected="New Script..."
                              left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
                              width="100" />
-      <button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
+      <!--<button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
             label="Permissions..." name="button permissions" font="SansSerif" halign="center"
-            mouse_opaque="true" scale_image="TRUE" />
+            mouse_opaque="true" scale_image="TRUE" />-->
                         <panel bottom_delta="-330" follows="left|top" height="325"  left="10"
                              mouse_opaque="true" name="ContentsInventory" width="252" />
                 </panel>