livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer

meow-7.2.2
Ansariel 2020-11-26 15:03:08 +01:00
parent ba969c6c4d 300f6f8b8e
commit 857505513a
4 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llpanelcontents.cpp
View File

@ -54,7 +54,7 @@
#include "lltrans.h"
#include "llviewerassettype.h"
#include "llviewerinventory.h"
#include "llviewermenu.h"
#include "llviewermenu.h" // <FS> Script reset in edit floater
#include "llviewerobject.h"
#include "llviewerregion.h"
#include "llviewerwindow.h"
@ -87,7 +87,7 @@ BOOL LLPanelContents::postBuild()
childSetAction("button new script",&LLPanelContents::onClickNewScript, this);
childSetAction("button permissions",&LLPanelContents::onClickPermissions, this);
childSetAction("btn_reset_scripts", &LLPanelContents::onClickResetScripts, this);
childSetAction("btn_reset_scripts", &LLPanelContents::onClickResetScripts, this); // <FS> Script reset in edit floater
childSetAction("button refresh",&LLPanelContents::onClickRefresh, this);
mPanelInventoryObject = getChild<LLPanelObjectInventory>("contents_inventory");
@ -113,7 +113,7 @@ void LLPanelContents::getState(LLViewerObject *objectp )
if( !objectp )
{
getChildView("button new script")->setEnabled(FALSE);
getChildView("btn_reset_scripts")->setEnabled(FALSE);
getChildView("btn_reset_scripts")->setEnabled(FALSE); // <FS> Script reset in edit floater
return;
}
@ -153,7 +153,6 @@ void LLPanelContents::getState(LLViewerObject *objectp )
// ((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1)
// || (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1)));
// getChildView("btn_reset_scripts")->setEnabled(editable);
BOOL objectIsOK = FALSE;
if( editable && all_volume && ( (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1) || (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1) ) )
{
@ -261,11 +260,13 @@ void LLPanelContents::onClickPermissions(void *userdata)
gFloaterView->getParentFloater(self)->addDependentFloater(LLFloaterReg::showInstance("bulk_perms"));
}
// <FS> Script reset in edit floater
// static
void LLPanelContents::onClickResetScripts(void *userdata)
{
handle_selected_script_action("reset");
}
// </FS>
// static
void LLPanelContents::onClickRefresh(void *userdata)

2
indra/newview/llpanelcontents.h
View File

@ -53,7 +53,7 @@ public:
static void onClickNewScript(void*);
static void onClickPermissions(void*);
static void onClickResetScripts(void*);
static void onClickResetScripts(void*); // <FS> Script reset in edit floater
static void onClickRefresh(void*);
// Key suffix for "tentative" fields

52
indra/newview/llviewermenu.cpp
View File

@ -8975,11 +8975,62 @@ class LLToolsSelectedScriptAction : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
// <FS> Script reset in edit floater
//std::string action = userdata.asString();
//bool mono = false;
//std::string msg, name;
//std::string title;
//if (action == "compile mono")
//{
// name = "compile_queue";
// mono = true;
// msg = "Recompile";
// title = LLTrans::getString("CompileQueueTitle");
//}
//if (action == "compile lsl")
//{
// name = "compile_queue";
// msg = "Recompile";
// title = LLTrans::getString("CompileQueueTitle");
//}
//else if (action == "reset")
//{
// name = "reset_queue";
// msg = "Reset";
// title = LLTrans::getString("ResetQueueTitle");
//}
//else if (action == "start")
//{
// name = "start_queue";
// msg = "SetRunning";
// title = LLTrans::getString("RunQueueTitle");
//}
//else if (action == "stop")
//{
// name = "stop_queue";
// msg = "SetRunningNot";
// title = LLTrans::getString("NotRunQueueTitle");
//}
//LLUUID id; id.generate();
//LLFloaterScriptQueue* queue = LLFloaterReg::getTypedInstance<LLFloaterScriptQueue>(name, LLSD(id));
//if (queue)
//{
// queue->setMono(mono);
// queue_actions(queue, msg);
// queue->setTitle(title);
//}
//else
//{
// LL_WARNS() << "Failed to generate LLFloaterScriptQueue with action: " << action << LL_ENDL;
//}
handle_selected_script_action(userdata.asString());
// </FS>
return true;
}
};
// <FS> Script reset in edit floater
void handle_selected_script_action(const std::string& action)
{
// [RLVa:KB] - Checked: 2010-04-19 (RLVa-1.2.0f) | Modified: RLVa-1.0.5a
@ -9041,6 +9092,7 @@ void handle_selected_script_action(const std::string& action)
LL_WARNS() << "Failed to generate LLFloaterScriptQueue with action: " << action << LL_ENDL;
}
}
// </FS>
void handle_selected_texture_info(void*)
{

2
indra/newview/llviewermenu.h
View File

@ -126,7 +126,7 @@ void handle_object_edit();
void handle_attachment_edit(const LLUUID& inv_item_id);
void handle_attachment_touch(const LLUUID& inv_item_id);
bool enable_attachment_touch(const LLUUID& inv_item_id);
void handle_selected_script_action(const std::string& action);
void handle_selected_script_action(const std::string& action); // <FS> Script reset in edit floater
// <FS:Techwolf Lupindo> area search
// expose this function so other classes can call it