Merge remote branch 'mccabe/1.2.0-next' into next

author: Jacek Antonelli 2009-09-25 22:14:34 -0500
committer: Jacek Antonelli 2009-09-25 22:14:34 -0500
commit: a1041a6fa17368e13d610df9d5eb23e307654815 (patch)
tree: 5f8c22e1bbdeb727600c31ff60f908b785c2faae /linden/indra/newview/skins/default/xui
parent: Moved "Show HUD Attachments" back to View, restored shortcut. (diff)
parent: Fixed region names not showing up on regions with zero avatars (diff)
download: meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.zip
meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.gz
meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.bz2
meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.xz
3 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 3485812..54f7775 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -51,7 +51,7 @@
             tool_tip="Offer this friend a teleport to your current location" width="80" />
        <button bottom_delta="-25" follows="top|right" height="22" label="Track"
             left_delta="0" name="track_btn"
-             tool_tip="Create a beacon to track this avatar" width="80" />
+             tool_tip="Create a beacon to track friends you can map" width="80" />
        <button bottom_delta="-25" follows="top|right" height="22" label="Invite..."
             left_delta="0" name="invite_btn"
             tool_tip="Remove this person from your friends list" width="80" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index a57c568..00f3f3e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -389,7 +389,7 @@
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="LastOwner:" v_pad="0" width="78">
+                             mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
        Last Owner:
      </text>
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
index 0172b41..d1f5fc8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -25,7 +25,7 @@
    <on_check function="MiniMap.CheckRotate" userdata="" />
  </menu_item_check>
  <menu_item_separator />
-  <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show Map"
+  <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show World Map"
                 left="0" mouse_opaque="true" name="Show Map" width="128">
    <on_click function="MiniMap.ShowWorldMap" userdata="" />
  </menu_item_call>
author	Jacek Antonelli	2009-09-25 22:14:34 -0500
committer	Jacek Antonelli	2009-09-25 22:14:34 -0500
commit	a1041a6fa17368e13d610df9d5eb23e307654815 (patch)
tree	5f8c22e1bbdeb727600c31ff60f908b785c2faae /linden/indra/newview/skins/default/xui
parent	Moved "Show HUD Attachments" back to View, restored shortcut. (diff)
parent	Fixed region names not showing up on regions with zero avatars (diff)
download	meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.zip meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.gz meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.bz2 meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.xz

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml index 3485812..54f7775 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -51,7 +51,7 @@
51	tool_tip="Offer this friend a teleport to your current location" width="80" />	51	tool_tip="Offer this friend a teleport to your current location" width="80" />
52	<button bottom_delta="-25" follows="top\|right" height="22" label="Track"	52	<button bottom_delta="-25" follows="top\|right" height="22" label="Track"
53	left_delta="0" name="track_btn"	53	left_delta="0" name="track_btn"
54	tool_tip="Create a beacon to track this avatar" width="80" />	54	tool_tip="Create a beacon to track friends you can map" width="80" />
55	<button bottom_delta="-25" follows="top\|right" height="22" label="Invite..."	55	<button bottom_delta="-25" follows="top\|right" height="22" label="Invite..."
56	left_delta="0" name="invite_btn"	56	left_delta="0" name="invite_btn"
57	tool_tip="Remove this person from your friends list" width="80" />	57	tool_tip="Remove this person from your friends list" width="80" />


diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml index a57c568..00f3f3e 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -389,7 +389,7 @@
389	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	389	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
390	bottom_delta="-20" drop_shadow_visible="true" follows="left\|top"	390	bottom_delta="-20" drop_shadow_visible="true" follows="left\|top"
391	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"	391	font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
392	mouse_opaque="true" name="LastOwner:" v_pad="0" width="78">	392	mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
393	Last Owner:	393	Last Owner:
394	</text>	394	</text>
395	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	395	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"


diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml index 0172b41..d1f5fc8 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -25,7 +25,7 @@
25	<on_check function="MiniMap.CheckRotate" userdata="" />	25	<on_check function="MiniMap.CheckRotate" userdata="" />
26	</menu_item_check>	26	</menu_item_check>
27	<menu_item_separator />	27	<menu_item_separator />
28	<menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show Map"	28	<menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show World Map"
29	left="0" mouse_opaque="true" name="Show Map" width="128">	29	left="0" mouse_opaque="true" name="Show Map" width="128">
30	<on_click function="MiniMap.ShowWorldMap" userdata="" />	30	<on_click function="MiniMap.ShowWorldMap" userdata="" />
31	</menu_item_call>	31	</menu_item_call>