From 080407d92f2846397472be1ab533a9da7f8b66cb Mon Sep 17 00:00:00 2001 From: Shyotl Date: Mon, 10 Oct 2011 00:24:44 -0500 Subject: [PATCH] Picker crash fix. Required due to LL changing behavior of orphan object rendering. (rightclicking an orphan... that techincally shouldn't be being drawn to begin with, would crash) --- indra/newview/lltoolpie.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 5c35454b9..aaa4f5e77 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -391,6 +391,11 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show) object = (LLViewerObject*)object->getParent(); } + if (!object) + { + return TRUE; // unexpected, but escape + } + // Object is an avatar, so check for mute by id. LLVOAvatar* avatar = (LLVOAvatar*)object; std::string name = avatar->getFullname();