From bdb27b7e81a722162adb888370e7f429117d41e8 Mon Sep 17 00:00:00 2001
From: Ansariel Hiller <none@none>
Date: Fri, 11 Nov 2011 14:13:56 -0500
Subject: STORM-1685 Wrong named control in floater_world_map.xml Patch
 converted to hg format by Jonathan Yap.

---
 doc/contributions.txt                                    | 2 ++
 indra/newview/skins/default/xui/en/floater_world_map.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2b39e15e2a..e491df284e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -170,6 +170,7 @@ Ansariel Hiller
 	STORM-1101
 	VWR-25480
 	VWR-26150
+	STORM-1685
 Aralara Rajal
 Ardy Lay
 	STORM-859
@@ -586,6 +587,7 @@ Jonathan Yap
 	STORM-1222
 	STORM-1659
 	STORM-1674
+	STORM-1685
 Kadah Coba
 	STORM-1060
 Jondan Lundquist
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"
-- 
cgit v1.2.3