diff options
| author | Richard Linden <none@none> | 2011-09-02 20:24:06 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-09-02 20:24:06 -0700 |
| commit | fc45e9cbf6ea74412acd8bb55098cfd15493292b (patch) | |
| tree | 27c697035feb1d5d7e6de07e9834d49271b5b1ee /indra/newview/llfolderview.h | |
| parent | 0ab6eee0996c78d32b722157140cea5a21a5e460 (diff) | |
| parent | 1836dd12c9b45e90aeab095dd4cc3e9cdcaf2190 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llfolderview.h')
| -rw-r--r-- | indra/newview/llfolderview.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 705a76a7b4..8af01e9102 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -314,6 +314,7 @@ protected: signal_t mReshapeSignal; S32 mSignalSelectCallback; S32 mMinWidth; + S32 mRunningHeight; std::map<LLUUID, LLFolderViewItem*> mItemMap; BOOL mDragAndDropThisFrame; |