summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2010-02-08 14:11:24 +0200
committerSergei Litovchuk <slitovchuk@productengine.com>2010-02-08 14:11:24 +0200
commit4e28c10971dc4f9a52a7b3f109143dbce3528d21 (patch)
tree1437a0c9f5b5a1415a0542a6294409b5b0eefda0
parent7d21ca8b2e2a15dddcd28595937cdc1b187d4435 (diff)
Fixed major bug (EXT-5017) Landmark Info panel opens immediately after
retrieving data about landmarking location. --HG-- branch : product-engine
-rw-r--r--indra/newview/llpanelplaces.cpp1
-rw-r--r--indra/newview/llviewermessage.cpp11
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index a49386cb5c..c0491cc00f 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -1023,7 +1023,6 @@ void LLPanelPlaces::showAddedLandmarkInfo(const std::vector<LLUUID>& items)
{
setItem(item);
}
- break;
}
}
}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 204a20ae6a..c5d3d7cb25 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -915,12 +915,13 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f
{
// Landmark creation handling is moved to LLPanelPlaces::showAddedLandmarkInfo()
// TODO* LLPanelPlaces dependency is going to be removed. See EXT-4347.
- if("create_landmark" == places_panel->getPlaceInfoType() && !places_panel->getItem())
- {
- //places_panel->setItem(item);
- }
+ //if("create_landmark" == places_panel->getPlaceInfoType() && !places_panel->getItem())
+ //{
+ // places_panel->setItem(item);
+ //}
+ //else
// we are opening a group notice attachment
- else
+ if("create_landmark" != places_panel->getPlaceInfoType())
{
LLSD args;
args["type"] = "landmark";