diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-08-23 13:11:14 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-08-23 13:11:14 -0700 |
commit | 8961d10a2ab4dfbf935b38f7d997edaf75bc0f80 (patch) | |
tree | b975dc98262c38dc6ab9a1cb3cdbd0deb68bf4cd /indra/newview/llfolderview.h | |
parent | 4b2ba7236f4af762faec138d920e90f12d332b06 (diff) | |
parent | fea0917fbd9bde846001c00464a66e480ca1baa3 (diff) |
Merge from viewer-experience
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; |