diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 99ea670dd5..553fac7a14 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1116,6 +1116,13 @@ void LLScrollListCtrl::setCommentText(const std::string& comment_text) getChild("comment_text")->setValue(comment_text); } +// Allow appending of comment text +void LLScrollListCtrl::addCommentText(const std::string& comment_text) +{ + getChild("comment_text")->appendText(comment_text, true); +} +// Allow appending of comment text + LLScrollListItem* LLScrollListCtrl::addSeparator(EAddPosition pos) { LLScrollListItem::Params separator_params; diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index b274d5d5f0..511f7dc319 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -235,6 +235,9 @@ public: S32 getItemIndex( const LLUUID& item_id ) const; void setCommentText( const std::string& comment_text); + // Allow appending of comment text + void addCommentText( const std::string& comment_text); + // Allow appending of comment text LLScrollListItem* addSeparator(EAddPosition pos); // "Simple" interface: use this when you're creating a list that contains only unique strings, only diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp index a42677845e..a240e80e5a 100644 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -158,6 +158,9 @@ void LLFloaterScriptQueue::addObject(const LLUUID& id) BOOL LLFloaterScriptQueue::start() { + // Show script compile floater + setVisible(TRUE); + //llinfos << "LLFloaterCompileQueue::start()" << llendl; std::string buffer; @@ -211,7 +214,10 @@ BOOL LLFloaterScriptQueue::nextObject() if(isDone() && !mDone) { mDone = true; - getChild("queue output")->setCommentText(getString("Done")); + // Append text + //getChild("queue output")->setCommentText(getString("Done")); + getChild("queue output")->addCommentText(getString("Done")); + // Append text getChildView("close")->setEnabled(TRUE); } return successful_start; @@ -277,7 +283,10 @@ public: return; } - queue->getChild("queue output")->setCommentText(message); + // Append text + //queue->getChild("queue output")->setCommentText(message); + queue->getChild("queue output")->addCommentText(message); + // Append text } private: @@ -464,7 +473,10 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id, } if(queue && (buffer.size() > 0)) { - queue->getChild("queue output")->setCommentText(buffer); + // Append text + //queue->getChild("queue output")->setCommentText(buffer); + queue->getChild("queue output")->addCommentText(buffer); + // Append text } delete data; } @@ -637,7 +649,10 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj, LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it)); std::string buffer; buffer = getString("Resetting") + (": ") + item->getName(); - getChild("queue output")->setCommentText(buffer); + // Append text + //getChild("queue output")->setCommentText(buffer); + getChild("queue output")->addCommentText(buffer); + // Append text LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_ScriptReset); msg->nextBlockFast(_PREHASH_AgentData); @@ -690,7 +705,10 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj, LLScrollListCtrl* list = getChild("queue output"); std::string buffer; buffer = getString("Running") + (": ") + item->getName(); - list->setCommentText(buffer); + // Append text + //list->setCommentText(buffer); + list->addCommentText(buffer); + // Append text LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_SetScriptRunning); @@ -745,7 +763,10 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj, LLScrollListCtrl* list = getChild("queue output"); std::string buffer; buffer = getString("NotRunning") + (": ") +item->getName(); - list->setCommentText(buffer); + // Append text + //list->setCommentText(buffer); + list->addCommentText(buffer); + // Append text LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_SetScriptRunning);