diff options
author | prep <prep@lindenlab.com> | 2011-09-14 10:41:52 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2011-09-14 10:41:52 -0400 |
commit | df40eca093b1a238daea9cd23c44f6e39719bf51 (patch) | |
tree | 205c15512a7fa363ebcea0de8e3ce16a3a58ca38 /indra/newview/llfolderview.h | |
parent | 4efca483d7dc8c8a50ebe247c6c163c263ed20f5 (diff) | |
parent | a250df980b3f37e245d30e51ab65831ae1de0ce0 (diff) |
merge
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; |