Merge branch 'texturepicker' into next

3 files changed, 6 insertions, 2 deletions

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/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index ccc3ab2..e58b0b4 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -1304,6 +1304,7 @@ public:
 
 BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask)
 {
+        if (!getEnabled()) { return FALSE; }
         getWindow()->setCursor(UI_CURSOR_HAND);
         return TRUE;
 }
@@ -1311,6 +1312,7 @@ BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask)
 
 BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 {
+        if (!getEnabled()) { return FALSE; }
         BOOL handled = LLUICtrl::handleMouseDown( x, y , mask );
         if( handled )
         {
@@ -1421,6 +1423,8 @@ BOOL LLTextureCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask,
                                           EAcceptance *accept,
                                           std::string& tooltip_msg)
 {
+        if (!getEnabled()) { return FALSE; }
+
         BOOL handled = FALSE;
 
         // this downcast may be invalid - but if the second test below
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