From b3a549b8b5e01809b2dd2006d6bf92a7a4d6baf7 Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Thu, 13 Nov 2025 01:56:26 +1000
Subject: [PATCH] [FIRE-36090] Fix crash in handleHover accessing null parent

Merged upstream in SLViewer PR#4986
---
 indra/newview/llmaniptranslate.cpp | 40 ++++++++++++++++--------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index 4b93d946ec..ca3b9a7ae4 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -1,4 +1,4 @@
-/**
+/**
  * @file llmaniptranslate.cpp
  * @brief LLManipTranslate class implementation
  *
@@ -716,24 +716,28 @@ bool LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                 // handle attachments in local space
                 if (object->isAttachment() && object->mDrawable.notNull())
                 {
-                    // calculate local version of relative move
-                    LLQuaternion objWorldRotation = object->mDrawable->mXform.getParent()->getWorldRotation();
-                    objWorldRotation.transQuat();
-
-                    LLVector3 old_position_local = object->getPosition();
-                    LLVector3 new_position_local = selectNode->mSavedPositionLocal + (clamped_relative_move_f * objWorldRotation);
-
-                    //RN: I forget, but we need to do this because of snapping which doesn't often result
-                    // in position changes even when the mouse moves
-                    object->setPosition(new_position_local);
-                    rebuild(object);
-                    gAgentAvatarp->clampAttachmentPositions();
-                    new_position_local = object->getPosition();
-
-                    if (selectNode->mIndividualSelection)
+                    LLXform* object_xform_parent = object->mDrawable->mXform.getParent();
+                    if (object_xform_parent)
                     {
-                        // counter-translate child objects if we are moving the root as an individual
-                        object->resetChildrenPosition(old_position_local - new_position_local, true);
+                        // calculate local version of relative move
+                        LLQuaternion objWorldRotation = object_xform_parent->getWorldRotation();
+                        objWorldRotation.transQuat();
+
+                        LLVector3 old_position_local = object->getPosition();
+                        LLVector3 new_position_local = selectNode->mSavedPositionLocal + (clamped_relative_move_f * objWorldRotation);
+
+                        //RN: I forget, but we need to do this because of snapping which doesn't often result
+                        // in position changes even when the mouse moves
+                        object->setPosition(new_position_local);
+                        rebuild(object);
+                        gAgentAvatarp->clampAttachmentPositions();
+                        new_position_local = object->getPosition();
+
+                        if (selectNode->mIndividualSelection)
+                        {
+                            // counter-translate child objects if we are moving the root as an individual
+                            object->resetChildrenPosition(old_position_local - new_position_local, true);
+                        }
                     }
                 }
                 else