From 941cb9f4124c9ccfd5c845bc94639fa46df12c3d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 1 Apr 2008 17:45:04 +0000 Subject: merge release@83343 skinning-1-merge@83714 -> release QAR-424 --- indra/newview/llfloaterbuildoptions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterbuildoptions.cpp') 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*/ } } -- cgit v1.2.3