From b609970d4fc5385f45bee74493dd22d0cb68ec36 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 20 Sep 2014 21:43:54 +0200 Subject: [PATCH] FIRE-14646: When clicking on a SLURL, location text in place details is incorrect if standalone place details floater is used --- indra/newview/fsfloaterplacedetails.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/newview/fsfloaterplacedetails.cpp b/indra/newview/fsfloaterplacedetails.cpp index 453226cafb..b3c7f130cd 100644 --- a/indra/newview/fsfloaterplacedetails.cpp +++ b/indra/newview/fsfloaterplacedetails.cpp @@ -330,6 +330,12 @@ void FSFloaterPlaceDetails::onOpen(const LLSD& key) mDisplayInfo = REMOTE_PLACE; setTitle(getString("title_remote_place")); + mPanelPlaceInfo->resetLocation(); + mPanelPlaceInfo->setInfoType(LLPanelPlaceInfo::PLACE); + mPanelPlaceInfo->setHeaderVisible(FALSE); + mPanelPlaceInfo->setVisible(TRUE); + mPanelLandmarkInfo->setVisible(FALSE); + if (key.has("id")) { LLUUID parcel_id = key["id"].asUUID(); @@ -349,12 +355,6 @@ void FSFloaterPlaceDetails::onOpen(const LLSD& key) mPanelPlaceInfo->displayParcelInfo(LLUUID(), mGlobalPos); } - mPanelPlaceInfo->resetLocation(); - mPanelPlaceInfo->setInfoType(LLPanelPlaceInfo::PLACE); - mPanelPlaceInfo->setHeaderVisible(FALSE); - mPanelPlaceInfo->setVisible(TRUE); - mPanelLandmarkInfo->setVisible(FALSE); - updateVerbs(); } else if (key_type == "teleport_history")