From 0dac371e064412c5d33261ad98ba7ba56d2f0272 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Mon, 18 Jan 2010 22:20:11 +0200 Subject: Fixed low bug (EXT-4310) '+' btn on My Landmarks tab of Places panel duplicates behavior of Star btn in nav bar - Added alert if trying to create landmark for same location more than once. --HG-- branch : product-engine --- indra/newview/llpanellandmarks.cpp | 4 ++-- indra/newview/skins/default/xui/en/notifications.xml | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 30acf37f82..d6e407a0ed 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -35,6 +35,7 @@ #include "llbutton.h" #include "llfloaterreg.h" +#include "llnotificationsutil.h" #include "llsdutil.h" #include "llsdutil_math.h" #include "llregionhandle.h" @@ -632,8 +633,7 @@ void LLLandmarksPanel::onAddAction(const LLSD& userdata) const LLViewerInventoryItem* landmark = LLLandmarkActions::findLandmarkForAgentPos(); if(landmark) { - LLSideTray::getInstance()->showPanel("panel_places", - LLSD().with("type", "landmark").with("id",landmark->getUUID())); + LLNotificationsUtil::add("LandmarkAlreadyExists"); } else { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 957b4d74db..1ec004b194 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1401,6 +1401,16 @@ Please try again later. You have added "[LANDMARK_NAME]" to your [FOLDER_NAME] folder. + +You already have a landmark for this location. + + +