From 4f46c4ef41298a58c165288511b1e919acbff6b8 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 17 Mar 2010 15:36:52 -0500
Subject: [PATCH] Disable fast alpha by default. Pull scene importer option
from upload menu.
---
indra/newview/app_settings/settings.xml | 2 +-
.../skins/default/xui/en/menu_inventory_add.xml | 14 ++------------
.../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 2fb3f526922..8d6a1790f16 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 05a4e60de79..4e178eef964 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 cbe36626fe9..65da20ae8cf 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"
--
GitLab