From a408bac29378072fbf36864164149458c978cfcc Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:59 -0500
Subject: Second Life viewer sources 1.17.1.0

---
 linden/indra/newview/lltexturectrl.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview/lltexturectrl.cpp')

diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index b5c1ace..6602096 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -119,7 +119,8 @@ public:
 
 	// LLFloater overrides
 	virtual void	onClose(bool app_quitting);
-
+	virtual BOOL    postBuild();
+	
 	// New functions
 	void setImageID( const LLUUID& image_asset_id);
 	void updateImageStats();
@@ -163,6 +164,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;
 
@@ -197,6 +200,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	mImageAssetID( owner->getImageAssetID() ),
 	mWhiteImageAssetID( gSavedSettings.getString( "UIImgWhiteUUID" ) ),
 	mOriginalImageAssetID(owner->getImageAssetID()),
+	mLabel(label),
 	mTentativeLabel(NULL),
 	mResolutionLabel(NULL),
 	mIsDirty( FALSE ),
@@ -456,6 +460,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)
-- 
cgit v1.1