diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-08 14:00:08 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-08 14:00:08 -0500 |
| commit | 4b36aeb9736fb71de7087063444652c9d87f370c (patch) | |
| tree | 90741aaadb16d5f844d073222e5c56987f283a56 /indra/llui/lldockcontrol.h | |
| parent | 09179d1346ccf2fa07b2dec6a72592beb3bd262f (diff) | |
| parent | 28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff) | |
merge
Diffstat (limited to 'indra/llui/lldockcontrol.h')
| -rw-r--r-- | indra/llui/lldockcontrol.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lldockcontrol.h b/indra/llui/lldockcontrol.h index 2e7359245f..c9602011f6 100644 --- a/indra/llui/lldockcontrol.h +++ b/indra/llui/lldockcontrol.h @@ -43,6 +43,7 @@ public: { TOP, LEFT, + RIGHT, BOTTOM }; @@ -79,12 +80,13 @@ private: private: get_allowed_rect_callback_t mGetAllowedRectCallback; bool mEnabled; - bool mRecalculateDocablePosition; + bool mRecalculateDockablePosition; bool mDockWidgetVisible; DocAt mDockAt; LLView* mDockWidget; LLRect mPrevDockRect; LLRect mRootRect; + LLRect mFloaterRect; LLFloater* mDockableFloater; LLUIImagePtr mDockTongue; S32 mDockTongueX; |