From 2b863df7c8fdede8db5d30349f7778d9f7897e28 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 20 May 2008 23:24:16 +0000
Subject: svn merge -r87877:87878
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui/maint-ui-12-qa-5
 which is the last iteration of the maint-ui series of branches.  Future work
 will be in featurettes.

---
 indra/newview/lltexturectrl.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/lltexturectrl.h')

diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index dbdade3b78..5dabf07ce5 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -147,6 +147,8 @@ public:
 	
 	void setOnSelectCallback(LLUICtrlCallback cb)	{ mOnSelectCallback = cb; }
 
+	void setShowLoadingPlaceholder(BOOL showLoadingPlaceholder);
+
 private:
 	BOOL allowDrop(LLInventoryItem* item);
 	BOOL doDrop(LLInventoryItem* item);
@@ -175,6 +177,8 @@ private:
 	LLViewBorder*			 mBorder;
 	BOOL					 mValid;
 	BOOL					 mDirty;
+	BOOL					 mShowLoadingPlaceholder;
+	LLString				 mLoadingPlaceholderString;
 };
 
 // XUI HACK: When floaters converted, switch this file to lltexturepicker.h/cpp
-- 
cgit v1.3