diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterparcel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterparcel.cpp b/linden/indra/newview/llfloaterparcel.cpp index e3189a9..6288782 100644 --- a/linden/indra/newview/llfloaterparcel.cpp +++ b/linden/indra/newview/llfloaterparcel.cpp | |||
@@ -37,10 +37,10 @@ | |||
37 | // viewer project includes | 37 | // viewer project includes |
38 | #include "llcommandhandler.h" | 38 | #include "llcommandhandler.h" |
39 | #include "llpanelplace.h" | 39 | #include "llpanelplace.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 | // Globals | 46 | // Globals |
@@ -84,7 +84,7 @@ void* LLFloaterParcelInfo::createPanelPlace(void* data) | |||
84 | { | 84 | { |
85 | LLFloaterParcelInfo* self = (LLFloaterParcelInfo*)data; | 85 | LLFloaterParcelInfo* self = (LLFloaterParcelInfo*)data; |
86 | self->mPanelParcelp = new LLPanelPlace(); // allow edit self | 86 | self->mPanelParcelp = new LLPanelPlace(); // allow edit self |
87 | gUICtrlFactory->buildPanel(self->mPanelParcelp, "panel_place.xml"); | 87 | LLUICtrlFactory::getInstance()->buildPanel(self->mPanelParcelp, "panel_place.xml"); |
88 | return self->mPanelParcelp; | 88 | return self->mPanelParcelp; |
89 | } | 89 | } |
90 | 90 | ||
@@ -96,7 +96,7 @@ LLFloaterParcelInfo::LLFloaterParcelInfo(const std::string& name, const LLUUID & | |||
96 | mParcelID( parcel_id ) | 96 | mParcelID( parcel_id ) |
97 | { | 97 | { |
98 | mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterParcelInfo::createPanelPlace, this); | 98 | mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterParcelInfo::createPanelPlace, this); |
99 | gUICtrlFactory->buildFloater(this, "floater_preview_url.xml", &getFactoryMap()); | 99 | LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml", &getFactoryMap()); |
100 | gPlaceInfoInstances.addData(parcel_id, this); | 100 | gPlaceInfoInstances.addData(parcel_id, this); |
101 | } | 101 | } |
102 | 102 | ||