From 953aec0613081686f7a56af0e9255f4ce15cf9cc Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 13 Aug 2009 05:50:56 +0000 Subject: More merge fixes (side panel merge issue) --- indra/newview/llsidetray.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llsidetray.cpp') diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 438b1b558f..0558cc3488 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -152,6 +152,9 @@ static const S32 splitter_margin = 1; //virtual void LLSideTrayTab::arrange(S32 width, S32 height ) { + if(!mMainPanel) + return; + S32 offset = 0; LLView* title_panel = getChildView(TAB_PANEL_CAPTION_NAME, true, false); -- cgit v1.2.3