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

Always show script debug icon regardless if script errors should be reported to nearby chat or script debug floater

Ansariel 2013-03-12 12:25:04 +01:00
parent f876f34707
commit f3e1045c95
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloaterscriptdebug.cpp
View File

@ -65,7 +65,10 @@ LLFloaterScriptDebug::~LLFloaterScriptDebug()
void LLFloaterScriptDebug::show(const LLUUID& object_id)
{
addOutputWindow(object_id);
// <FS:Ansariel> Script debug icon
//addOutputWindow(object_id);
addOutputWindow(object_id, true);
// </FS:Ansariel> Script debug icon
}
BOOL LLFloaterScriptDebug::postBuild()
@ -85,7 +88,8 @@ BOOL LLFloaterScriptDebug::postBuild()
return FALSE;
}
LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id)
//LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id)
LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID& object_id, bool show /* = false */)
{
LLMultiFloater* host = LLFloaterReg::showTypedInstance<LLMultiFloater>("script_debug", LLSD());
if (!host)
@ -96,6 +100,13 @@ LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id)
LLFloater* floaterp = LLFloaterReg::showInstance("script_debug_output", object_id, FALSE);
LLFloater::setFloaterHost(NULL);
// <FS:Ansariel> Script debug icon
if (gSavedSettings.getS32("ShowScriptErrorsLocation") == 0 && !show)
{
host->closeFloater();
}
// </FS:Ansariel> Script debug icon
return floaterp;
}

5
indra/newview/llfloaterscriptdebug.h
View File

@ -42,7 +42,10 @@ public:
static void addScriptLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color, const LLUUID& source_id);
protected:
static LLFloater* addOutputWindow(const LLUUID& object_id);
// <FS:Ansariel> Script debug icon
//static LLFloater* addOutputWindow(const LLUUID& object_id);
static LLFloater* addOutputWindow(const LLUUID& object_id, bool show = false);
// </FS:Ansariel> Script debug icon
protected:
static LLFloaterScriptDebug* sInstance;

12
indra/newview/llnearbychathandler.cpp
View File

@ -599,7 +599,8 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg,
return;
}
if (gSavedSettings.getS32("ShowScriptErrorsLocation")== 1)// show error in window //("ScriptErrorsAsChat"))
// <FS:Ansariel> Script debug icon
//if (gSavedSettings.getS32("ShowScriptErrorsLocation")== 1)// show error in window //("ScriptErrorsAsChat"))
{
LLColor4 txt_color;
@ -610,7 +611,14 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg,
chat_msg.mFromName,
txt_color,
chat_msg.mFromID);
return;
// <FS:Ansariel> Script debug icon
//return;
if (gSavedSettings.getS32("ShowScriptErrorsLocation") == 1)
{
return;
}
// </FS:Ansariel> Script debug icon
}
}