From 82507059ee320ccb4762e70e1764dbc109b015ea Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 26 May 2011 04:13:41 -0500
Subject: Disabled the texture_picker in "Local Texture Properties". (IMP-476)
Before, the texture_picker widget in the "Local Texture Properties"
floater was interactive, even though using it had no effect. Now it is
disabled (noninteractive), to avoid misleading or confusing the user.
---
linden/indra/newview/floaterlocalassetbrowse.cpp | 2 +-
.../newview/skins/default/xui/en-us/floater_local_asset_browse.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index 8ea13cc..8633ac4 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -943,7 +943,7 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
sLFInstance->mLinkTxt->setText( unit->getLinkStatus() );
sLFInstance->mTypeComboBox->selectNthItem( unit->getType() );
- sLFInstance->mTextureView->setEnabled(true);
+ sLFInstance->mTextureView->setEnabled(false);
sLFInstance->mUpdateChkBox->setEnabled(true);
sLFInstance->mTypeComboBox->setEnabled(true);
}
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
index f9bb3a7..a8ce59c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
@@ -118,12 +118,12 @@
default_image_name="Default"
can_apply_immediately="true"
follows="left|top"
- label="Texture"
bottom_delta="20"
left_delta="0"
mouse_opaque="true"
name="texture_view"
visible="true"
+ enabled="false"
/>
<check_box
--
cgit v1.1