diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-12-16 13:51:52 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-12-16 13:51:52 -0500 |
| commit | 11f23ca436d65c4a896be8718b2fb5dae1e5c314 (patch) | |
| tree | 2495ddf1fd00e936861d5ae18b3da4aeea862605 /indra/newview/llfloaterscriptdebug.cpp | |
| parent | 4a136572857fcf5d5fd21789a777bbde67c1076d (diff) | |
| parent | f5f504b0f946582efc85b0e76f38e9242aed11bb (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-bugsplat
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 { |