diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-07-10 22:02:26 +0000 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-07-10 22:02:26 +0000 |
| commit | 77f56a3f3db72b2938eadb0868fc7be975dabafa (patch) | |
| tree | eb220e9890d0208969746a3e86fecf84b19e436b /indra/newview/llfloaterscriptdebug.cpp | |
| parent | e4dc104e3296319476bb0d6c327d6a326c967976 (diff) | |
merge QAR-1579: texture-cleanup-1.
Diffstat (limited to 'indra/newview/llfloaterscriptdebug.cpp')
| -rw-r--r-- | indra/newview/llfloaterscriptdebug.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp index b2bb343681..6cca4927a9 100644 --- a/indra/newview/llfloaterscriptdebug.cpp +++ b/indra/newview/llfloaterscriptdebug.cpp @@ -45,7 +45,7 @@ #include "llviewertexteditor.h" #include "llviewercontrol.h" #include "llviewerobjectlist.h" -#include "llviewerimagelist.h" +#include "llviewertexturelist.h" // // Statics @@ -131,7 +131,7 @@ void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std: if (objectp) { - objectp->setIcon(gImageList.getImageFromFile("script_error.j2c", TRUE, TRUE)); + objectp->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", TRUE, TRUE)); floater_label = llformat("%s(%.2f, %.2f)", user_name.c_str(), objectp->getPositionRegion().mV[VX], objectp->getPositionRegion().mV[VY]); } else |