diff --git a/doc/contributions.txt b/doc/contributions.txt index 2b39e15e2a9cf0635d08011a0d993a61eab2ac21..e491df284eb18f9cecad4b7f52137b4658a36dbd 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 4314c8a9e2a2253e4f8d77451d76908c03010a1b..56d79f62c7bf0586b15c66991bc76951f3c1b564 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"