From 7c9468521c7db0140edf79d7662eecbbc79c6258 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 18 Feb 2010 19:24:43 -0600
Subject: Added missing "Set Default Permissions" menu entry. (#202)

This was accidentally left out during the SL 1.23 merge.
---
 ChangeLog.txt                                                | 6 ++++++
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 22e9a0a..ce9b92e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2010-02-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* Added missing "Set Default Permissions" menu entry. (#202)
+	  This was accidentally left out during the SL 1.23 merge.
+
+	  modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
 	* SNOW-492: LLDataPacker::unpackstring() is unsafe.
 	  Patch by Robin Cornelius.
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 3ec03f4..f8e569e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -30,6 +30,10 @@
                       label="Bulk Upload (L$[COST] per file)...">
         <on_click function="File.UploadBulk" userdata="" />
       </menu_item_call>
+      <menu_item_separator />
+      <menu_item_call name="perm prefs" label="Set Default Permissions...">
+        <on_click function="ShowFloater" userdata="perm prefs" />
+      </menu_item_call>
     </menu>
     <menu_item_separator />
 	  <menu_item_call name="Import" label="Import Object..." enabled="false">
-- 
cgit v1.1