From c4384d64a11fe96764f240a9e220989ad5546f16 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sat, 29 Aug 2009 01:47:33 +0000
Subject: [PATCH] EXT-729 - moved XML from menu_minimap.xml to
menu_mini_map.xml and deleted menu_minimap.xml (translations all have
menu_mini_map.xml)
---
indra/newview/llfloatermap.cpp | 2 +-
.../skins/default/xui/en/menu_mini_map.xml | 37 ++++++++++---------
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index f9fc467c053..eac1b65f7d1 100644
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -94,7 +94,7 @@ BOOL LLFloaterMap::postBuild()
registrar.add("Minimap.Zoom", boost::bind(&LLFloaterMap::handleZoom, this, _2));
registrar.add("Minimap.Tracker", boost::bind(&LLFloaterMap::handleStopTracking, this, _2));
- mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_minimap.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+ mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_mini_map.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
if (mPopupMenu && !LLTracker::isTracking(0))
{
mPopupMenu->setItemEnabled ("Stop Tracking", false);
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index a5e1f35142a..5cbbd71bfeb 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -4,53 +4,54 @@
layout="topleft"
left="100"
mouse_opaque="false"
- name="popup"
+ name="Popup"
top="724"
+ visible="false"
width="128">
<menu_item_call
label="Zoom Close"
layout="topleft"
name="Zoom Close">
<menu_item_call.on_click
- function="MiniMap.ZoomLevel"
- parameter="2" />
+ function="Minimap.Zoom"
+ parameter="close" />
</menu_item_call>
<menu_item_call
label="Zoom Medium"
layout="topleft"
name="Zoom Medium">
<menu_item_call.on_click
- function="MiniMap.ZoomLevel"
- parameter="1" />
+ function="Minimap.Zoom"
+ parameter="medium" />
</menu_item_call>
<menu_item_call
label="Zoom Far"
layout="topleft"
name="Zoom Far">
<menu_item_call.on_click
- function="MiniMap.ZoomLevel"
- parameter="0" />
+ function="Minimap.Zoom"
+ parameter="far" />
</menu_item_call>
<menu_item_separator
- layout="topleft" />
+ layout="topleft"
+ name="Tracking Separator" />
<menu_item_call
- enabled="false"
label="Stop Tracking"
layout="topleft"
name="Stop Tracking">
<menu_item_call.on_click
- function="MiniMap.StopTracking" />
- <menu_item_call.on_enable
- function="MiniMap.EnableTracking" />
+ function="Minimap.Tracker"
+ parameter="task_properties" />
</menu_item_call>
+ <menu_item_separator
+ layout="topleft"
+ name="Tracking Separator" />
<menu_item_call
- enabled="false"
- label="Profile..."
+ label="World Map"
layout="topleft"
- name="Profile">
+ name="World Map">
<menu_item_call.on_click
- function="MiniMap.ShowProfile" />
- <menu_item_call.on_enable
- function="MiniMap.EnableProfile" />
+ function="ShowFloater"
+ parameter="world_map" />
</menu_item_call>
</menu>
--
GitLab