diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
| commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
| tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/newview/lltexturectrl.cpp | |
| parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) | |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 958635c796..4ac08f2a81 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -99,7 +99,8 @@ public: // LLFloater overrides virtual void onClose(bool app_quitting); - + virtual BOOL postBuild(); + // New functions void setImageID( const LLUUID& image_asset_id); void updateImageStats(); @@ -143,6 +144,8 @@ protected: LLUUID mSpecialCurrentImageAssetID; // Used when the asset id has no corresponding texture in the user's inventory. LLUUID mOriginalImageAssetID; + std::string mLabel; + LLTextBox* mTentativeLabel; LLTextBox* mResolutionLabel; @@ -177,6 +180,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker( mImageAssetID( owner->getImageAssetID() ), mWhiteImageAssetID( gSavedSettings.getString( "UIImgWhiteUUID" ) ), mOriginalImageAssetID(owner->getImageAssetID()), + mLabel(label), mTentativeLabel(NULL), mResolutionLabel(NULL), mIsDirty( FALSE ), @@ -436,6 +440,21 @@ void LLFloaterTexturePicker::onClose(bool app_quitting) } // virtual +BOOL LLFloaterTexturePicker::postBuild() +{ + LLFloater::postBuild(); + + if (!mLabel.empty()) + { + std::string pick = childGetText("pick title"); + + setTitle(pick + mLabel); + } + + return TRUE; +} + +// virtual void LLFloaterTexturePicker::draw() { if (mOwner) |