Backported fix for SVC-2771 (script resetting can fail) from 1.22

3 files changed, 24 insertions, 3 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1f33ca1..0a2561a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -28,6 +28,12 @@
         Backported fix for VWR-3871 (prim position appears to be off) from 1.22.
 
 
+        * linden/indra/newview/llcompilequeue.cpp:
+        Backported fix for SVC-2771 (script resetting can fail) from 1.22.
+        * linden/indra/newview/llviewermenu.cpp:
+        Ditto.
+
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                       1.1.0 RC2                        -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp
index fc2742f..b4f1a22 100644
--- a/linden/indra/newview/llcompilequeue.cpp
+++ b/linden/indra/newview/llcompilequeue.cpp
@@ -59,6 +59,7 @@
 #include "llfloaterchat.h"
 #include "llviewerstats.h"
 #include "lluictrlfactory.h"
+#include "llselectmgr.h"
 
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
@@ -194,7 +195,20 @@ BOOL LLFloaterScriptQueue::start()
 {
         //llinfos << "LLFloaterCompileQueue::start()" << llendl;
         std::string buffer;
-        buffer = llformat("Starting %s of %d items.", mStartString.c_str(), mObjectIDs.count()); // *TODO: Translate
+
+        LLSelectMgr *mgr = LLSelectMgr::getInstance();
+        LLObjectSelectionHandle selectHandle = mgr->getSelection();
+        U32 n_objects = 0;
+        if (gSavedSettings.getBOOL("EditLinkedParts"))
+        {
+                n_objects = selectHandle->getObjectCount();
+        }
+        else
+        {
+                n_objects = selectHandle->getRootObjectCount();
+        }
+
+        buffer = llformat("Starting %s of %d items.", mStartString.c_str(), n_objects); // *TODO: Translate
         
         LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
         list->addCommentText(buffer);
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 31fdcc3..486e4f1 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5963,8 +5963,9 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
 {
         // Apply until an object fails
         QueueObjects func(q);
-        const bool firstonly = true;
-        bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly);
+        LLSelectMgr *mgr = LLSelectMgr::getInstance();
+        LLObjectSelectionHandle selectHandle = mgr->getSelection();
+        bool fail = selectHandle->applyToObjects(&func);
         if(fail)
         {
                 if ( !func.scripted )