summaryrefslogtreecommitdiff
path: root/indra/newview/lltransientfloatermgr.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-13 10:08:55 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-13 10:08:55 -0500
commit618249155ae333c64c693a0f7f38453f3c871787 (patch)
treedb28a3725a4e099735d4ce457ecf90267f8401da /indra/newview/lltransientfloatermgr.cpp
parent6f8ff871cdd0402d07800444f0524079fe02fac6 (diff)
parente27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff)
Automated merge up from viewer-development
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*>()));