diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-02 17:06:08 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-02 17:06:08 -0500 |
commit | d529abbfe62c879e4c0e6397e55cc80030b735b8 (patch) | |
tree | 192c9f41686a8f6c32626b6b514978ae29a02b02 /indra/newview/lltransientfloatermgr.cpp | |
parent | f0bca5f0683db1540b640191ab2780224aceb800 (diff) | |
parent | 680328dd78e1d31a2f8836919a0f6140a76af5f4 (diff) |
merge
Diffstat (limited to 'indra/newview/lltransientfloatermgr.cpp')
-rw-r--r-- | indra/newview/lltransientfloatermgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltransientfloatermgr.cpp b/indra/newview/lltransientfloatermgr.cpp index 78dd602f39..6deab96b45 100644 --- a/indra/newview/lltransientfloatermgr.cpp +++ b/indra/newview/lltransientfloatermgr.cpp @@ -36,8 +36,11 @@ LLTransientFloaterMgr::LLTransientFloaterMgr() { - gViewerWindow->getRootView()->addMouseDownCallback(boost::bind( + if(gViewerWindow) + { + gViewerWindow->getRootView()->addMouseDownCallback(boost::bind( &LLTransientFloaterMgr::leftMouseClickCallback, this, _1, _2, _3)); + } mGroupControls.insert(std::pair<ETransientGroup, std::set<LLView*> >(GLOBAL, std::set<LLView*>())); mGroupControls.insert(std::pair<ETransientGroup, std::set<LLView*> >(DOCKED, std::set<LLView*>())); |