summaryrefslogtreecommitdiff
path: root/indra/newview/lltransientfloatermgr.h
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-10-21 17:26:47 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2011-10-21 17:26:47 +0200
commit0297f55c6d4be505fe6831a593ed2630d565e14a (patch)
tree8caa874f98483f8110d5157be9d47b580e561a3d /indra/newview/lltransientfloatermgr.h
parent45b10b07473f011bbb9db687fca6daf1190e3d5d (diff)
EXP-1416 FIXED "Speak" and "Voice controls" buttons added as control views in LLTransientFloaterMgr to prevent hiding the transient IM floater.
Diffstat (limited to 'indra/newview/lltransientfloatermgr.h')
-rw-r--r--indra/newview/lltransientfloatermgr.h9
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;
};