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/llfloaterbuildoptions.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llfloaterbuildoptions.cpp')
| -rw-r--r-- | indra/newview/llfloaterbuildoptions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp index 5e4cc89f8e..35add8d5b5 100644 --- a/indra/newview/llfloaterbuildoptions.cpp +++ b/indra/newview/llfloaterbuildoptions.cpp @@ -37,7 +37,7 @@ #include "llviewerprecompiledheaders.h" #include "llfloaterbuildoptions.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" // library includes #include "llfontgl.h" @@ -79,7 +79,7 @@ void LLFloaterBuildOptions::show(void*) { LLFloaterBuildOptions* floater = new LLFloaterBuildOptions(); - gUICtrlFactory->buildFloater(floater, "floater_build_options.xml"); + LLUICtrlFactory::getInstance()->buildFloater(floater, "floater_build_options.xml"); floater->open(); /*Flawfinder: ignore*/ } } |