diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
commit | 5f99331f4a9ed5ed78af7b47bdad152949e63ec4 (patch) | |
tree | 78aa91b7a1ac5f31a4e1de11f1a30d4b53561a05 /indra/newview/llpanelplaces.cpp | |
parent | ed365b9c0eea12fa30629be7d26605b77eeedc05 (diff) | |
parent | 087c105317058dc3a011c937a5aceaf87fdecc26 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
-rw-r--r-- | indra/newview/llpanelplaces.cpp | 5 |
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) { |