diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-31 11:02:24 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-31 11:02:24 -0700 |
| commit | b39dd46bf3e1c1ccdffe9b4ac4e9ad68b0c3cd69 (patch) | |
| tree | 46e20f39ef94514de3f93a98aba75ad627209e84 /indra/llui/lldockcontrol.h | |
| parent | 5d99b221fa8ea75b128e3cc771ed91baa8b11311 (diff) | |
| parent | e86adb53f4df0cb0b9d8ea9b6cc805782d9fcf71 (diff) | |
merge changes for storm-1673
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; |