From 35c39d92e732c7e377697480a073995dd0a6fe7c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Sat, 19 Mar 2011 00:57:10 -0700
Subject: [PATCH] SOCIAL-762 FIX Viewer crash if first startup (with cleared
settings.xml file) is in Advanced mode
---
indra/newview/llviewermenu.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 3e0363849b..ec72df79d1 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -846,9 +846,13 @@ class LLAdvancedCheckFeature : public view_listener_t
void toggle_destination_and_avatar_picker(const LLSD& show)
{
S32 panel_idx = show.isDefined() ? show.asInteger() : -1;
- LLView* container = gViewerWindow->getRootView()->getChildView("avatar_picker_and_destination_guide_container");
+ LLView* container = gViewerWindow->getRootView()->findChildView("avatar_picker_and_destination_guide_container");
+ if (!container) return;
+
LLMediaCtrl* destinations = container->findChild<LLMediaCtrl>("destination_guide_contents");
LLMediaCtrl* avatar_picker = container->findChild<LLMediaCtrl>("avatar_picker_contents");
+ if (!destinations || !avatar_picker) return;
+
LLButton* avatar_btn = gViewerWindow->getRootView()->getChildView("bottom_tray")->getChild<LLButton>("avatar_btn");
LLButton* destination_btn = gViewerWindow->getRootView()->getChildView("bottom_tray")->getChild<LLButton>("destination_btn");
--
GitLab