diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-17 15:36:52 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-17 15:36:52 -0500 |
| commit | 4f46c4ef41298a58c165288511b1e919acbff6b8 (patch) | |
| tree | c7b5149cfa2566f9d11b3a0ca5235ed423d7c539 /indra | |
| parent | 80eeff0297be277c79683c293ab46eda2a5e7fb0 (diff) | |
Disable fast alpha by default. Pull scene importer option from upload menu.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory_add.xml | 14 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_main_inventory.xml | 10 |
3 files changed, 3 insertions, 23 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2fb3f52692..8d6a1790f1 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 05a4e60de7..4e178eef96 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 cbe36626fe..65da20ae8c 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -90,16 +90,6 @@ 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" name="Bulk Upload"> |