summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_world_map.xml
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-01-20 15:30:07 -0800
committerCallum Prentice <callum@lindenlab.com>2010-01-20 15:30:07 -0800
commit8aadfb1cb63a9527835c6c5127d041d924455505 (patch)
tree3fd5f231cae133ec25f0d0d4bf9eda53d0d4c0e4 /indra/newview/skins/default/xui/en/floater_world_map.xml
parent622f8b59ceb286f955351b6185a98919f03ed136 (diff)
parent20af2d325a4340aca997efbea752849e9f15d041 (diff)
Merge with tip
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_world_map.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_world_map.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 8904d4f49c..65c9c2a8fa 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -77,7 +77,7 @@
top_delta="6"
left_pad="5"
layout="topleft"
- name="person_label"
+ name="me_label"
width="90">
Me
</text>
@@ -196,7 +196,7 @@
height="16"
layout="topleft"
left_pad="0"
- name="auction_label"
+ name="by_owner_label"
top_delta="3"
width="100">
by owner