diff options
| author | Paul Guslisty <pguslisty@productengine.com> | 2010-12-20 18:04:59 +0200 |
|---|---|---|
| committer | Paul Guslisty <pguslisty@productengine.com> | 2010-12-20 18:04:59 +0200 |
| commit | bdd07a7a648dc7e2c290d5aa837c22c20c4af31c (patch) | |
| tree | ed8e52ac938f0245fa359bff12bf3720bfdc04c6 /indra | |
| parent | 452d9d5e3d5261fa5154bd1fe7ef6298dcacf074 (diff) | |
STORM-411 FIXED The most of additional options in the Teleport History profile are always disabled
- Deleted unimplemented menu items from XML
- Hide "Make a Landmark" menu item in case "Teleport History Place Profile" panel is opened
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelplaces.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_place.xml | 22 |
2 files changed, 5 insertions, 22 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) { diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml index 1b96eb51f0..288811d2f6 100644 --- a/indra/newview/skins/default/xui/en/menu_place.xml +++ b/indra/newview/skins/default/xui/en/menu_place.xml @@ -24,26 +24,4 @@ function="Places.OverflowMenu.Enable" parameter="can_create_pick" /> </menu_item_call> - <menu_item_separator - layout="topleft"/> - <menu_item_call - enabled="false" - label="Buy Pass" - layout="topleft" - name="pass"> - <menu_item_call.on_click - function="Places.OverflowMenu.Action" - parameter="pass" /> - </menu_item_call> - <menu_item_separator - layout="topleft"/> - <menu_item_call - enabled="false" - label="Edit" - layout="topleft" - name="edit"> - <menu_item_call.on_click - function="Places.OverflowMenu.Action" - parameter="edit" /> - </menu_item_call> </toggleable_menu> |