diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
| commit | bfd8efb05753ac9ed858476797b5d407c912d926 (patch) | |
| tree | 52905cf59bcd5b67ddc186b26a23959201353a7a /indra/newview/lltransientfloatermgr.cpp | |
| parent | ed64630a67c2c216c369099532323cab2e251cab (diff) | |
| parent | b778ba9b882ecb03e61b3b9bd833618ca096f5da (diff) | |
Automated merge up from viewer-development
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*>())); |