summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterevent.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-04-01 17:45:04 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-04-01 17:45:04 +0000
commit941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch)
treee0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llfloaterevent.cpp
parentecec626dec93524f7ef5831a5ba344d6449b99bc (diff)
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llfloaterevent.cpp')
-rw-r--r--indra/newview/llfloaterevent.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp
index 7c76923190..3579b2a058 100644
--- a/indra/newview/llfloaterevent.cpp
+++ b/indra/newview/llfloaterevent.cpp
@@ -37,10 +37,10 @@
// viewer project includes
#include "llcommandhandler.h"
#include "llpanelevent.h"
-#include "llvieweruictrlfactory.h"
// linden library includes
#include "lluuid.h"
+#include "lluictrlfactory.h"
////////////////////////////////////////////////////////////////////////////
// LLFloaterEventInfo
@@ -79,7 +79,7 @@ LLFloaterEventInfo::LLFloaterEventInfo(const std::string& name, const U32 event_
{
mFactoryMap["event_details_panel"] = LLCallbackMap(LLFloaterEventInfo::createEventDetail, this);
- gUICtrlFactory->buildFloater(this, "floater_preview_event.xml", &getFactoryMap());
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_event.xml", &getFactoryMap());
gEventInfoInstances.addData(event_id, this);
}
@@ -100,7 +100,7 @@ void* LLFloaterEventInfo::createEventDetail(void* userdata)
{
LLFloaterEventInfo *self = (LLFloaterEventInfo*)userdata;
self->mPanelEventp = new LLPanelEvent();
- gUICtrlFactory->buildPanel(self->mPanelEventp, "panel_event.xml");
+ LLUICtrlFactory::getInstance()->buildPanel(self->mPanelEventp, "panel_event.xml");
return self->mPanelEventp;
}