diff options
author | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
commit | dfd78e83d91832b486a5bba6b1bb1cce621163ab (patch) | |
tree | 5d27537583ea1f06c0e7b469f83ed65c93f70d15 /indra/llui/llfloater.h | |
parent | 22ea5ac41ca3a1f7a884b56526791f611834f76b (diff) | |
parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) |
Pulled merge from release
Diffstat (limited to 'indra/llui/llfloater.h')
-rwxr-xr-x | indra/llui/llfloater.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 75715ef296..12eb3cdbfa 100755 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -32,6 +32,7 @@ #define LL_FLOATER_H #include "llpanel.h" +#include "lltoolbar.h" #include "lluuid.h" //#include "llnotificationsutil.h" #include <set> @@ -514,6 +515,8 @@ private: // LLFloaterView // Parent of all floating panels +const S32 FLOATER_MIN_VISIBLE_PIXELS = 16; + class LLFloaterView : public LLUICtrl { public: @@ -572,10 +575,15 @@ public: void setFloaterSnapView(LLHandle<LLView> snap_view) {mSnapView = snap_view; } LLFloater* getFrontmostClosableFloater(); + void setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LLRect& toolbar_rect); + private: void hiddenFloaterClosed(LLFloater* floater); LLRect mLastSnapRect; + LLRect mToolbarLeftRect; + LLRect mToolbarBottomRect; + LLRect mToolbarRightRect; LLHandle<LLView> mSnapView; BOOL mFocusCycleMode; S32 mSnapOffsetBottom; |