diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llfloaterscriptdebug.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llfloaterscriptdebug.cpp')
| -rw-r--r-- | indra/newview/llfloaterscriptdebug.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp index 3a17e232b6..9a7634a739 100644 --- a/indra/newview/llfloaterscriptdebug.cpp +++ b/indra/newview/llfloaterscriptdebug.cpp @@ -31,7 +31,7 @@ #include "llviewerprecompiledheaders.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" #include "llfloaterscriptdebug.h" #include "llfontgl.h" @@ -84,7 +84,7 @@ BOOL LLFloaterScriptDebug::postBuild() if (mTabContainer) { // *FIX: apparantly fails for tab containers? -// mTabContainer->requires("all_scripts", WIDGET_TYPE_FLOATER); +// mTabContainer->requires<LLFloater>("all_scripts"); // mTabContainer->checkRequirements(); return TRUE; } @@ -104,7 +104,7 @@ LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id) sInstance = new LLFloaterScriptDebug(); LLCallbackMap::map_t factory_map; factory_map["all_scripts"] = LLCallbackMap(getOutputWindow, NULL); - gUICtrlFactory->buildFloater(sInstance, "floater_script_debug.xml", &factory_map); + LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_script_debug.xml", &factory_map); sInstance->setVisible(FALSE); } @@ -128,7 +128,7 @@ void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std: if (objectp) { - objectp->setIcon(gImageList.getImage(LLUUID(gViewerArt.getString("script_error.tga")))); + objectp->setIcon(gImageList.getImageFromFile("script_error.j2c", TRUE, TRUE)); floater_label = llformat("%s(%.2f, %.2f)", user_name.c_str(), objectp->getPositionRegion().mV[VX], objectp->getPositionRegion().mV[VY]); } else |