diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llfloaterevent.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterevent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterevent.cpp b/linden/indra/newview/llfloaterevent.cpp index 71767c6..778a3d5 100644 --- a/linden/indra/newview/llfloaterevent.cpp +++ b/linden/indra/newview/llfloaterevent.cpp | |||
@@ -37,10 +37,10 @@ | |||
37 | // viewer project includes | 37 | // viewer project includes |
38 | #include "llcommandhandler.h" | 38 | #include "llcommandhandler.h" |
39 | #include "llpanelevent.h" | 39 | #include "llpanelevent.h" |
40 | #include "llvieweruictrlfactory.h" | ||
41 | 40 | ||
42 | // linden library includes | 41 | // linden library includes |
43 | #include "lluuid.h" | 42 | #include "lluuid.h" |
43 | #include "lluictrlfactory.h" | ||
44 | 44 | ||
45 | //////////////////////////////////////////////////////////////////////////// | 45 | //////////////////////////////////////////////////////////////////////////// |
46 | // LLFloaterEventInfo | 46 | // LLFloaterEventInfo |
@@ -79,7 +79,7 @@ LLFloaterEventInfo::LLFloaterEventInfo(const std::string& name, const U32 event_ | |||
79 | { | 79 | { |
80 | 80 | ||
81 | mFactoryMap["event_details_panel"] = LLCallbackMap(LLFloaterEventInfo::createEventDetail, this); | 81 | mFactoryMap["event_details_panel"] = LLCallbackMap(LLFloaterEventInfo::createEventDetail, this); |
82 | gUICtrlFactory->buildFloater(this, "floater_preview_event.xml", &getFactoryMap()); | 82 | LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_event.xml", &getFactoryMap()); |
83 | gEventInfoInstances.addData(event_id, this); | 83 | gEventInfoInstances.addData(event_id, this); |
84 | } | 84 | } |
85 | 85 | ||
@@ -100,7 +100,7 @@ void* LLFloaterEventInfo::createEventDetail(void* userdata) | |||
100 | { | 100 | { |
101 | LLFloaterEventInfo *self = (LLFloaterEventInfo*)userdata; | 101 | LLFloaterEventInfo *self = (LLFloaterEventInfo*)userdata; |
102 | self->mPanelEventp = new LLPanelEvent(); | 102 | self->mPanelEventp = new LLPanelEvent(); |
103 | gUICtrlFactory->buildPanel(self->mPanelEventp, "panel_event.xml"); | 103 | LLUICtrlFactory::getInstance()->buildPanel(self->mPanelEventp, "panel_event.xml"); |
104 | 104 | ||
105 | return self->mPanelEventp; | 105 | return self->mPanelEventp; |
106 | } | 106 | } |