diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-30 19:27:22 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-30 19:27:22 +0300 |
| commit | aabffa4d082d688c1e13105266a9093f7905db3f (patch) | |
| tree | ddcfc54bb0a5cbddb0e61df74520829ea93f0cea /indra/newview/llscreenchannel.cpp | |
| parent | 14b122380ec8532dedc0b41c765c1849f09a92d0 (diff) | |
EXT-8045 FIX check if sidetray is created
reviewed by Alexei Arabadji at https://codereview.productengine.com/secondlife/r/668/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llscreenchannel.cpp')
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 55c8809184..ef89c07c60 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -136,8 +136,11 @@ void LLScreenChannelBase::updatePositionAndSize(LLRect old_world_rect, LLRect ne void LLScreenChannelBase::init(S32 channel_left, S32 channel_right) { - LLSideTray* side_bar = LLSideTray::getInstance(); - side_bar->getCollapseSignal().connect(boost::bind(&LLScreenChannelBase::resetPositionAndSize, this, _2)); + if(LLSideTray::instanceCreated()) + { + LLSideTray* side_bar = LLSideTray::getInstance(); + side_bar->getCollapseSignal().connect(boost::bind(&LLScreenChannelBase::resetPositionAndSize, this, _2)); + } S32 channel_top = gViewerWindow->getWorldViewRectScaled().getHeight(); S32 channel_bottom = gViewerWindow->getWorldViewRectScaled().mBottom + gSavedSettings.getS32("ChannelBottomPanelMargin"); |