From c7e39a3684c23c911769fa4601b7e6f6eaea25b4 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 26 Dec 2023 21:59:21 -0500
Subject: [PATCH] Manual merge of fix
---
indra/newview/llpanelobject.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 9ae82f94308..c8222522fc9 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -2762,7 +2762,7 @@ void LLPanelObject::onRotSelect(bool success, LLViewerObject* obj, const LLTextu
void LLPanelObject::onParamsSelect(bool success, LLViewerObject* obj, const LLTextureEntry& te)
{
- if (success && obj != mObject && (obj && obj->permModify() && !obj->isMesh()) && (mObject && mObject->permModify() && !mObject->isMesh()))
+ if (success && obj != mObject.get() && (obj && obj->permModify() && !obj->isMesh()) && (mObject && mObject->permModify() && !mObject->isMesh()))
{
if (obj->getVolume() && LL_PCODE_VOLUME == obj->getPCode())
{
--
GitLab