summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaces.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-06 14:31:17 -0500
committerOz Linden <oz@lindenlab.com>2011-01-06 14:31:17 -0500
commita9686db3e606ec45d23265fd34a1a35498f39857 (patch)
treeb20758ac0beda679834eafbcdd203780449be334 /indra/newview/llpanelplaces.cpp
parent7105d98e24185f9ce31be1fe1b26c3ae1552e71f (diff)
parent1034db639462d95e54e9bf9e4d63500b745bb0a2 (diff)
merge changes for storm-438
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
-rw-r--r--indra/newview/llpanelplaces.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 1869e92c8c..00ac34efa5 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -753,6 +753,11 @@ void LLPanelPlaces::onOverflowButtonClicked()
// there is no landmark already pointing to that parcel in agent's inventory.
menu->getChild<LLMenuItemCallGL>("landmark")->setEnabled(is_agent_place_info_visible &&
!LLLandmarkActions::landmarkAlreadyExists());
+ // STORM-411
+ // Creating landmarks for remote locations is impossible.
+ // So hide menu item "Make a Landmark" in "Teleport History Profile" panel.
+ menu->setItemVisible("landmark", mPlaceInfoType != TELEPORT_HISTORY_INFO_TYPE);
+ menu->arrangeAndClear();
}
else if (mPlaceInfoType == LANDMARK_INFO_TYPE && mLandmarkMenu != NULL)
{