diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
commit | 1034db639462d95e54e9bf9e4d63500b745bb0a2 (patch) | |
tree | 68b010fb3f9f2c4b67e59187d125090b1c69d72f /indra/newview/llpanelplaces.cpp | |
parent | 0eb491417e8479516b07cc9237242b60d36d10f5 (diff) | |
parent | eb0b8ab3ea19617a52881191bab21bfedcc5696d (diff) |
merge changes for storm-806
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) { |