diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-01-16 11:32:24 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-01-16 11:32:24 +0200 |
| commit | 9121738b5b13d74dbc75a45605533d5fba31c089 (patch) | |
| tree | 37ab7f10527a51194215d6a5aa78ff13aaf88182 | |
| parent | 9779917899be2a31bb0cf7aa5df850837354a83b (diff) | |
MAINT-1245 FIXED Script error particle not displaying above agent when script error comes from a HUD
| -rw-r--r-- | indra/newview/llfloaterscriptdebug.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp index 6c17f62c1e..5f4bc9d301 100644 --- a/indra/newview/llfloaterscriptdebug.cpp +++ b/indra/newview/llfloaterscriptdebug.cpp @@ -34,6 +34,7 @@ #include "llrect.h" #include "llerror.h" #include "llstring.h" +#include "llvoavatarself.h" #include "message.h" // project include @@ -105,7 +106,14 @@ void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std: if (objectp) { - objectp->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI)); + if(objectp->isHUDAttachment()) + { + ((LLViewerObject*)gAgentAvatarp)->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI)); + } + else + { + objectp->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI)); + } floater_label = llformat("%s(%.0f, %.0f, %.0f)", user_name.c_str(), objectp->getPositionRegion().mV[VX], |