summaryrefslogtreecommitdiff
path: root/indra/newview/lltransientfloatermgr.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-12-08 16:04:07 -0800
committerRichard Linden <none@none>2010-12-08 16:04:07 -0800
commitca2141ce90d484284bf57d72feb82e290958b061 (patch)
tree0e2ea77f0b7c2a9c9f9e69c09c0be22567afac3b /indra/newview/lltransientfloatermgr.cpp
parentd9b4570883652d647c05083c18fac1a088efd6e2 (diff)
parentc28b476a6806a426593e6798ea537f13ca354fc8 (diff)
merge with viewer-dev
Diffstat (limited to 'indra/newview/lltransientfloatermgr.cpp')
-rw-r--r--indra/newview/lltransientfloatermgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltransientfloatermgr.cpp b/indra/newview/lltransientfloatermgr.cpp
index 6deab96b45..c648a6a28a 100644
--- a/indra/newview/lltransientfloatermgr.cpp
+++ b/indra/newview/lltransientfloatermgr.cpp
@@ -38,8 +38,8 @@ LLTransientFloaterMgr::LLTransientFloaterMgr()
{
if(gViewerWindow)
{
- gViewerWindow->getRootView()->addMouseDownCallback(boost::bind(
- &LLTransientFloaterMgr::leftMouseClickCallback, this, _1, _2, _3));
+ gViewerWindow->getRootView()->getChild<LLUICtrl>("popup_holder")->setMouseDownCallback(boost::bind(
+ &LLTransientFloaterMgr::leftMouseClickCallback, this, _2, _3, _4));
}
mGroupControls.insert(std::pair<ETransientGroup, std::set<LLView*> >(GLOBAL, std::set<LLView*>()));