diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-07 10:39:05 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-07 10:39:05 -0500 |
commit | e1e38c4cee980f815091cd94c8a529ffe3e24918 (patch) | |
tree | 35b16f61bd120f83bb74a77d4417dce1108e0542 /indra/newview/lltransientfloatermgr.cpp | |
parent | c02d6a319f378d5dcc34c51b20f556f175d2a40a (diff) | |
parent | 09c01c4e925833873a83665fe0642637b65e547e (diff) |
merge changes for storm-34
Diffstat (limited to 'indra/newview/lltransientfloatermgr.cpp')
-rw-r--r-- | indra/newview/lltransientfloatermgr.cpp | 4 |
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*>())); |