diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-12-21 06:44:41 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-12-21 06:44:41 +0000 |
| commit | df4d167cd13fd89a85e4d30dca94e40c934707d7 (patch) | |
| tree | cde9373bce657013bf04c83ab60b4a4aa826fc76 /indra/newview/llfolderview.h | |
| parent | 8fde5f0d3241205067e5d7bf5380757e764eff31 (diff) | |
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
Diffstat (limited to 'indra/newview/llfolderview.h')
| -rw-r--r-- | indra/newview/llfolderview.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 9fcf94d802..37b9ee6c13 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -323,6 +323,7 @@ protected: static LLColor4 sHighlightFgColor; static LLColor4 sFilterBGColor; static LLColor4 sFilterTextColor; + static LLColor4 sLoadingMessageTextColor; LLString mLabel; LLString mSearchableLabel; @@ -349,6 +350,8 @@ protected: BOOL mDragAndDropTarget; LLPointer<LLViewerImage> mArrowImage; LLPointer<LLViewerImage> mBoxImage; + BOOL mIsLoading; + LLTimer mTimeSinceRequestStart; // This function clears the currently selected item, and records // the specified selected item appropriately for display and use |