diff options
| author | Jonathan Yap <none@none> | 2013-01-23 14:17:48 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-01-23 14:17:48 -0500 |
| commit | c817166ebe67cefd02f8c9e3bb9195a6a86fa199 (patch) | |
| tree | 43753d75f3cc50317c10ea1eff260f532baaacee /indra | |
| parent | be65c429be67a85d66f9b5db61d70f6268640acc (diff) | |
STORM-68 STORM-68 Remove obsolete menu entry for default uploads.
Remove two matching entries in settings.xml (the other three were already eliminated).
Adjust default permissions for new notecards and gestures to C/M/T (the current default).
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 30 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory_add.xml | 7 |
2 files changed, 4 insertions, 33 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7a3c1df0bc..203f6800aa 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3259,17 +3259,6 @@ <key>Value</key> <string>http://events.secondlife.com/viewer/embed/event/</string> </map> - <key>EveryoneCopy</key> - <map> - <key>Comment</key> - <string>Everyone can copy the newly created objects</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>FeatureManagerHTTPTable</key> <map> <key>Comment</key> @@ -9509,17 +9498,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>ShareWithGroup</key> - <map> - <key>Comment</key> - <string>Newly created objects are shared with the currently active group</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>ShowAdvancedGraphicsSettings</key> <map> <key>Comment</key> @@ -13657,7 +13635,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>NotecardsNextOwnerModify</key> <map> @@ -13668,7 +13646,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>NotecardsNextOwnerTransfer</key> <map> @@ -13712,7 +13690,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>GesturesNextOwnerModify</key> <map> @@ -13723,7 +13701,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>GesturesNextOwnerTransfer</key> <map> diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml index e91f5af3d5..8bc4df6c79 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -63,13 +63,6 @@ function="File.UploadBulk" parameter="" /> </menu_item_call> - <menu_item_call - label="Set Default Upload Permissions" - name="perm prefs"> - <menu_item_call.on_click - function="Floater.Toggle" - parameter="perm_prefs" /> - </menu_item_call> </menu> <menu_item_call |