diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2fb3f52692294d012e65b20dacf8d9689e15780f..8d6a1790f1654daa7eefc082cd5fc7fd2a59cf76 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6916,7 +6916,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>RenderFastUI</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 05a4e60de79cac66e116c466b8f9e522439e7bba..4e178eef96436b28a746d4c0dfad1540eb589322 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -42,7 +42,7 @@ <menu_item_call.on_enable function="File.EnableUpload" /> </menu_item_call> - <menu_item_call + <menu_item_call label="Model..." layout="topleft" name="Upload Model"> @@ -51,17 +51,7 @@ parameter="" /> <menu_item_call.on_enable function="File.EnableUploadModel" /> - </menu_item_call> - <menu_item_call - label="Scene..." - layout="topleft" - name="Upload Scene"> - <menu_item_call.on_click - function="File.UploadScene" - parameter="" /> - <menu_item_call.on_enable - function="File.EnableUpload" /> - </menu_item_call> + </menu_item_call> <menu_item_call label="Bulk (L$[COST] per file)..." layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index cbe36626fe942340816e87bf56f6d80fd0b96607..65da20ae8cf0b9fd801e0682585536d3212bdb81 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -89,16 +89,6 @@ <menu_item_call.on_enable function="File.EnableUploadModel" /> </menu_item_call> - <menu_item_call - label="Scene..." - layout="topleft" - name="Upload Scene"> - <menu_item_call.on_click - function="File.UploadScene" - parameter="" /> - <menu_item_call.on_enable - function="File.EnableUpload" /> - </menu_item_call> <menu_item_call label="Bulk (L$[COST] per file)..." layout="topleft"