diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-12-14 00:46:11 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-12-14 00:46:11 +0200 |
| commit | 74a56f30aa0ef4daef41ef5fdac98610b2b109df (patch) | |
| tree | f526ea45ddc0e0724c2c34ecc59b70cd7ea3c2a2 /indra/newview/llfloaterscriptdebug.cpp | |
| parent | 4ab4c4498a04576a3cddf3533359a15a636b53b6 (diff) | |
| parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterscriptdebug.cpp')
| -rw-r--r-- | indra/newview/llfloaterscriptdebug.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp index 468537e659..1ea3a07536 100644 --- a/indra/newview/llfloaterscriptdebug.cpp +++ b/indra/newview/llfloaterscriptdebug.cpp @@ -138,7 +138,10 @@ void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std: { if(objectp->isHUDAttachment()) { - ((LLViewerObject*)gAgentAvatarp)->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI)); + if (isAgentAvatarValid()) + { + ((LLViewerObject*)gAgentAvatarp)->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI)); + } } else { |