diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
| commit | 7a74f64d5eda050da0d966b0fa3e76b4b54888fa (patch) | |
| tree | b3cee2fdcf01e11cf13dca58f56c3b1d0e804739 /indra/newview/lltransientfloatermgr.cpp | |
| parent | b48dad17260a7f5fbfc4d0548b4386d62efc2e5e (diff) | |
| parent | 9d3174c0386e6eefba1949075971ce7f75571394 (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*>())); |