Merge branch '2025.04'

1 files changed, 11 insertions, 5 deletions

diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index c09c02d32b..74c5079268 100644
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -89,9 +89,17 @@ bool LLFloaterBulkPermission::postBuild()
     {
         mBulkChangeNextOwnerTransfer = true;
     }
+
+    mQueueOutputList = getChild<LLScrollListCtrl>("queue output");
     return true;
 }
 
+void LLFloaterBulkPermission::onClose(bool app_quitting)
+{
+    removeVOInventoryListener();
+    LLFloater::onClose(app_quitting);
+}
+
 void LLFloaterBulkPermission::doApply()
 {
     // Inspects a stream of selected object contents and adds modifiable ones to the given array.
@@ -216,7 +224,7 @@ void LLFloaterBulkPermission::onCommitCopy()
 bool LLFloaterBulkPermission::start()
 {
     // note: number of top-level objects to modify is mObjectIDs.size().
-    getChild<LLScrollListCtrl>("queue output")->setCommentText(getString("start_text"));
+    mQueueOutputList->setCommentText(getString("start_text"));
     return nextObject();
 }
 
@@ -239,7 +247,7 @@ bool LLFloaterBulkPermission::nextObject()
 
     if(isDone() && !mDone)
     {
-        getChild<LLScrollListCtrl>("queue output")->setCommentText(getString("done_text"));
+        mQueueOutputList->setCommentText(getString("done_text"));
         mDone = true;
     }
     return successful_start;
@@ -294,8 +302,6 @@ void LLFloaterBulkPermission::doCheckUncheckAll(bool check)
 
 void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInventoryObject::object_list_t* inv)
 {
-    LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
-
     LLInventoryObject::object_list_t::const_iterator it = inv->begin();
     LLInventoryObject::object_list_t::const_iterator end = inv->end();
     for ( ; it != end; ++it)
@@ -362,7 +368,7 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInve
                     status_text.setArg("[STATUS]", "");
                 }
 
-                list->setCommentText(status_text.getString());
+                mQueueOutputList->setCommentText(status_text.getString());
 
                 //TODO if we are an object inside an object we should check a recuse flag and if set
                 //open the inventory of the object and recurse - Michelle2 Zenovka