1 files changed, 6 insertions, 9 deletions

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index d0dcc8d51f..284fff4d8c 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -638,7 +638,7 @@ bool LLFloaterTexturePicker::postBuild()
 
     getChild<LLComboBox>("l_bake_use_texture_combo_box")->setCommitCallback(onBakeTextureSelect, this);
 
-    setBakeTextureEnabled(true);
+    setBakeTextureEnabled(mInventoryPickType != PICK_MATERIAL);
     return true;
 }
 
@@ -1775,7 +1775,7 @@ void LLTextureCtrl::onVisibilityChange(bool new_visibility)
     }
 }
 
-void LLTextureCtrl::setVisible( bool visible )
+void LLTextureCtrl::setVisible(bool visible )
 {
     if( !visible )
     {
@@ -1882,7 +1882,7 @@ void LLTextureCtrl::showPicker(bool take_focus)
         {
             texture_floaterp->setSetImageAssetIDCallback(boost::bind(&LLTextureCtrl::setImageAssetID, this, _1));
 
-            texture_floaterp->setBakeTextureEnabled(mBakeTextureEnabled);
+            texture_floaterp->setBakeTextureEnabled(mBakeTextureEnabled && mInventoryPickType != PICK_MATERIAL);
         }
 
         LLFloater* root_floater = gFloaterView->getParentFloater(this);
@@ -2112,7 +2112,7 @@ void LLTextureCtrl::setBakeTextureEnabled(bool enabled)
     LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
     if (floaterp)
     {
-        floaterp->setBakeTextureEnabled(enabled);
+        floaterp->setBakeTextureEnabled(enabled && mInventoryPickType != PICK_MATERIAL);
     }
 }
 
@@ -2243,11 +2243,8 @@ void LLTextureCtrl::draw()
             }
             else
             {
-                mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
-                mTexturep->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
-                mTexturep->forceToSaveRawImage(0);
-
-                preview = mTexturep;
+                preview = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+                preview->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
             }
         }
     }