diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
commit | edf5b6a8b71d9c4c01ce9c975864d4525cd7350c (patch) | |
tree | 68310a6824451c8c6f3af8ef73f2f9ec17c3a467 /indra/newview/llfloaterscriptdebug.cpp | |
parent | 01fb17cbc5a1d6a3526c4115787dbae74f7bdb07 (diff) | |
parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) |
pull changes for Sunshine beta
Diffstat (limited to 'indra/newview/llfloaterscriptdebug.cpp')
-rw-r--r-- | indra/newview/llfloaterscriptdebug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp index b691db1049..6c17f62c1e 100644 --- a/indra/newview/llfloaterscriptdebug.cpp +++ b/indra/newview/llfloaterscriptdebug.cpp @@ -105,7 +105,7 @@ void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std: if (objectp) { - objectp->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", TRUE, LLViewerTexture::BOOST_UI)); + 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], |