From c817166ebe67cefd02f8c9e3bb9195a6a86fa199 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 23 Jan 2013 14:17:48 -0500 Subject: 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). --- indra/newview/app_settings/settings.xml | 30 +++------------------- .../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 @@ -3258,17 +3258,6 @@ String Value http://events.secondlife.com/viewer/embed/event/ - - EveryoneCopy - - Comment - Everyone can copy the newly created objects - Persist - 1 - Type - Boolean - Value - 0 FeatureManagerHTTPTable @@ -9509,17 +9498,6 @@ Value 0 - ShareWithGroup - - Comment - Newly created objects are shared with the currently active group - Persist - 1 - Type - Boolean - Value - 0 - ShowAdvancedGraphicsSettings Comment @@ -13657,7 +13635,7 @@ Type Boolean Value - 0 + 1 NotecardsNextOwnerModify @@ -13668,7 +13646,7 @@ Type Boolean Value - 0 + 1 NotecardsNextOwnerTransfer @@ -13712,7 +13690,7 @@ Type Boolean Value - 0 + 1 GesturesNextOwnerModify @@ -13723,7 +13701,7 @@ Type Boolean Value - 0 + 1 GesturesNextOwnerTransfer 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="" /> - - -