summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-10-26 15:03:55 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-10-26 15:03:55 +0300
commit631b7de4b2262855984ed1d35ae7859507b12e9e (patch)
treea4565131ab96209817ec1be65194c9243c7b1e61 /indra/newview
parent89625f92473bd2894acd287caeeb1d20673f8ddb (diff)
SL-18444 Either connection should be create in onOpen or disconnect happen in destructor
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinspectobject.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp
index 42bf416efb..3d13985f08 100644
--- a/indra/newview/llinspectobject.cpp
+++ b/indra/newview/llinspectobject.cpp
@@ -142,6 +142,10 @@ LLInspectObject::LLInspectObject(const LLSD& sd)
LLInspectObject::~LLInspectObject()
{
+ if (mSelectionUpdateSlot.connected())
+ {
+ mSelectionUpdateSlot.disconnect();
+ }
}
/*virtual*/
@@ -247,11 +251,6 @@ void LLInspectObject::onClose(bool app_quitting)
mObjectSelection = NULL;
mPreviousObjectID = mObjectID;
- if (mSelectionUpdateSlot.connected())
- {
- mSelectionUpdateSlot.disconnect();
- }
-
getChild<LLMenuButton>("gear_btn")->hideMenu();
}