diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/llfloaterparcel.cpp | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/llfloaterparcel.cpp')
| -rw-r--r-- | indra/newview/llfloaterparcel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llfloaterparcel.cpp b/indra/newview/llfloaterparcel.cpp index 4213150553..fa7403874e 100644 --- a/indra/newview/llfloaterparcel.cpp +++ b/indra/newview/llfloaterparcel.cpp @@ -93,12 +93,12 @@ void* LLFloaterParcelInfo::createPanelPlace(void* data) //---------------------------------------------------------------------------- -LLFloaterParcelInfo::LLFloaterParcelInfo(const std::string& name, const LLUUID &parcel_id) -: LLFloater(name), +LLFloaterParcelInfo::LLFloaterParcelInfo(const LLUUID &parcel_id) +: LLFloater(), mParcelID( parcel_id ) { mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterParcelInfo::createPanelPlace, this); - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml", &getFactoryMap()); + LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml"); gPlaceInfoInstances.addData(parcel_id, this); } @@ -128,14 +128,14 @@ LLFloaterParcelInfo* LLFloaterParcelInfo::show(const LLUUID &parcel_id) { // ...bring that window to front floater = gPlaceInfoInstances.getData(parcel_id); - floater->open(); /*Flawfinder: ignore*/ + floater->openFloater(); floater->setFrontmost(true); } else { - floater = new LLFloaterParcelInfo("parcelinfo", parcel_id ); + floater = new LLFloaterParcelInfo( parcel_id ); floater->center(); - floater->open(); /*Flawfinder: ignore*/ + floater->openFloater(); floater->displayParcelInfo(parcel_id); floater->setFrontmost(true); } |