summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-18 10:56:46 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-18 10:56:46 +0000
commiteae7cbbb4a027b436452e454b1e5ffa457a5da3e (patch)
treee344dcc9b748948bc562e1aec6ca7374d4ed3127 /indra/newview
parentd1f48407056359d8b52c9822127119c3115d99e1 (diff)
EXT-5460 OK and Cancel buttons missing from own snapshots
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpreviewtexture.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 76b02f07ec..9b46a59782 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -116,7 +116,8 @@ BOOL LLPreviewTexture::postBuild()
}
childSetAction("save_tex_btn", LLPreviewTexture::onSaveAsBtn, this);
- childSetVisible("save_tex_btn", canSaveAs());
+ childSetVisible("save_tex_btn", true);
+ childSetEnabled("save_tex_btn", canSaveAs());
if (!mCopyToInv)
{
@@ -469,7 +470,7 @@ void LLPreviewTexture::loadAsset()
mImage->forceToSaveRawImage(0) ;
mAssetStatus = PREVIEW_ASSET_LOADING;
updateDimensions();
- childSetVisible("save_tex_btn", canSaveAs());
+ childSetEnabled("save_tex_btn", canSaveAs());
}
LLPreview::EAssetStatus LLPreviewTexture::getAssetStatus()
@@ -487,7 +488,12 @@ void LLPreviewTexture::updateImageID()
if(item)
{
mImageID = item->getAssetUUID();
- mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID();
+
+ // here's the old logic...
+ //mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID();
+ // here's the new logic... 'cos we hate disappearing buttons.
+ mShowKeepDiscard = TRUE;
+
mCopyToInv = FALSE;
mIsCopyable = item->checkPermissionsSet(PERM_ITEM_UNRESTRICTED);
}