diff options
| author | James Cook <james@lindenlab.com> | 2008-05-20 23:24:16 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-05-20 23:24:16 +0000 |
| commit | 2b863df7c8fdede8db5d30349f7778d9f7897e28 (patch) | |
| tree | f08321bc46b7cd61ee756d33a3d0793a73c6b6ab /indra/newview/lltexturectrl.h | |
| parent | 38558960978a0741dd9c79c4c7a108b8a1f99eff (diff) | |
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.
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rw-r--r-- | indra/newview/lltexturectrl.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 |