diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp index 7fe349b76c..58903a08f2 100644 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -159,10 +159,6 @@ void LLFloaterScriptQueue::addObject(const LLUUID& id) BOOL LLFloaterScriptQueue::start() { - // Show script compile floater - setTitle(mFloaterTitle); - setVisible(TRUE); - std::string buffer; LLSelectMgr *mgr = LLSelectMgr::getInstance(); @@ -291,10 +287,7 @@ private: LLFloaterCompileQueue::LLFloaterCompileQueue(const LLSD& key) : LLFloaterScriptQueue(key) { - // Proper floater title - //setTitle(LLTrans::getString("CompileQueueTitle")); - mFloaterTitle = LLTrans::getString("CompileQueueTitle"); - // Proper floater title + setTitle(LLTrans::getString("CompileQueueTitle")); setStartString(LLTrans::getString("CompileQueueStart")); mUploadQueue = new LLAssetUploadQueue(new LLCompileFloaterUploadQueueSupplier(key.asUUID())); @@ -616,10 +609,7 @@ void LLFloaterCompileQueue::saveItemByItemID(const LLUUID& asset_id) LLFloaterResetQueue::LLFloaterResetQueue(const LLSD& key) : LLFloaterScriptQueue(key) { - // Proper floater title - //setTitle(LLTrans::getString("ResetQueueTitle")); - mFloaterTitle = LLTrans::getString("ResetQueueTitle"); - // Proper floater title + setTitle(LLTrans::getString("ResetQueueTitle")); setStartString(LLTrans::getString("ResetQueueStart")); } @@ -671,10 +661,7 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj, LLFloaterRunQueue::LLFloaterRunQueue(const LLSD& key) : LLFloaterScriptQueue(key) { - // Proper floater title - //setTitle(LLTrans::getString("RunQueueTitle")); - mFloaterTitle = LLTrans::getString("RunQueueTitle"); - // Proper floater title + setTitle(LLTrans::getString("RunQueueTitle")); setStartString(LLTrans::getString("RunQueueStart")); } @@ -729,10 +716,7 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj, LLFloaterNotRunQueue::LLFloaterNotRunQueue(const LLSD& key) : LLFloaterScriptQueue(key) { - // Proper floater title - //setTitle(LLTrans::getString("NotRunQueueTitle")); - mFloaterTitle = LLTrans::getString("NotRunQueueTitle"); - // Proper floater title + setTitle(LLTrans::getString("NotRunQueueTitle")); setStartString(LLTrans::getString("NotRunQueueStart")); } @@ -788,10 +772,7 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj, LLFloaterDeleteQueue::LLFloaterDeleteQueue(const LLSD& key) : LLFloaterScriptQueue(key) { - // Proper floater title - //setTitle(LLTrans::getString("DeleteQueueTitle")); - mFloaterTitle = LLTrans::getString("DeleteQueueTitle"); - // Proper floater title + setTitle(LLTrans::getString("DeleteQueueTitle")); setStartString(LLTrans::getString("DeleteQueueStart")); } diff --git a/indra/newview/llcompilequeue.h b/indra/newview/llcompilequeue.h index dfa9decbe6..71fdcd3514 100644 --- a/indra/newview/llcompilequeue.h +++ b/indra/newview/llcompilequeue.h @@ -102,8 +102,6 @@ protected: std::string mStartString; bool mMono; - // Floater title - std::string mFloaterTitle; }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 849a4465c2..2e47b63e3b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7640,6 +7640,7 @@ class LLToolsSelectedScriptAction : public view_listener_t { name = "delete_queue"; msg = "delete"; + title = LLTrans::getString("DeleteQueueTitle"); } // Delete scripts LLUUID id; id.generate();