summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-16 16:06:37 -0500
committerOz Linden <oz@lindenlab.com>2011-11-16 16:06:37 -0500
commit8fef9576189f6e3bfb2e1ec0bc2b770186f26c5d (patch)
tree51bef9b3c5b61ebd42974f642454948d0888ba00 /indra/newview/skins/default
parent0bfc95fe7c8d50cb1a998339a53affc78fdc517e (diff)
parentbdb27b7e81a722162adb888370e7f429117d41e8 (diff)
merge changes for storm-1685
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_world_map.xml2
1 files changed, 1 insertions, 1 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 4314c8a9e2..56d79f62c7 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -468,7 +468,7 @@
left="3"
top_pad="7"
mouse_opaque="true"
- name="region_icon"
+ name="location_icon"
width="16" />
<search_editor
follows="top|right"