diff options
author | Merov Linden <merov@lindenlab.com> | 2011-10-21 18:37:26 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-10-21 18:37:26 -0700 |
commit | 05e2814261f1581169772f3917f1e82ad7521af9 (patch) | |
tree | 3496e856792d8d52e8c3b973082f18a266b5fdf1 /indra/newview/lltransientfloatermgr.h | |
parent | 5676e4a62efd2636840395a0667e3df3a48f1989 (diff) | |
parent | 51bdbc9481f6194b2851ee51c98d671e8b952aca (diff) |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/lltransientfloatermgr.h')
-rw-r--r-- | indra/newview/lltransientfloatermgr.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/lltransientfloatermgr.h b/indra/newview/lltransientfloatermgr.h index 2919244121..b4611c8c87 100644 --- a/indra/newview/lltransientfloatermgr.h +++ b/indra/newview/lltransientfloatermgr.h @@ -56,14 +56,15 @@ public: void removeControlView(LLView* view); private: + typedef std::set<LLHandle<LLView> > controls_set_t; + typedef std::map<ETransientGroup, controls_set_t > group_controls_t; + void hideTransientFloaters(S32 x, S32 y); void leftMouseClickCallback(S32 x, S32 y, MASK mask); - bool isControlClicked(std::set<LLView*>& set, S32 x, S32 y); -private: + bool isControlClicked(ETransientGroup group, controls_set_t& set, S32 x, S32 y); + std::set<LLTransientFloater*> mTransSet; - typedef std::set<LLView*> controls_set_t; - typedef std::map<ETransientGroup, std::set<LLView*> > group_controls_t; group_controls_t mGroupControls; }; |