diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:28:09 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:28:09 +0000 |
| commit | 2d1c918837cdc5a948619ac2b483d1719aac4069 (patch) | |
| tree | 7e0b4842a2f55cadd4cc44cb3d95d9581c2e5716 /indra/newview/llpreviewtexture.cpp | |
| parent | 161aff8e86ae690e6ba4124c9433bfed5025b133 (diff) | |
| parent | fa03910a34e5c32149793605bc481de00ada5e1c (diff) | |
viewer2 merge.
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 12 |
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); } |