From f796c33d43b03e2ebd7ccdf4ee3c09da858263eb Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 19 Jul 2018 11:59:02 +0300
Subject: [PATCH] MAINT-8844 Null check (just to be on the safe side)
---
indra/newview/llselectmgr.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 57b144aa51c..fce21fa30af 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -3686,14 +3686,14 @@ BOOL LLSelectMgr::selectGetEditMoveLinksetPermissions(bool &move, bool &modify)
iter != getSelection()->end(); iter++)
{
LLSelectNode* nodep = *iter;
- if (!nodep->mValid)
+ LLViewerObject* object = nodep->getObject();
+ if (!object || !nodep->mValid)
{
move = false;
modify = false;
return FALSE;
}
- LLViewerObject* object = nodep->getObject();
LLViewerObject *root_object = object->getRootEdit();
bool this_object_movable = false;
if (object->permMove() && !object->isPermanentEnforced() &&
--
GitLab