diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-16 16:06:37 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-16 16:06:37 -0500 |
| commit | 8fef9576189f6e3bfb2e1ec0bc2b770186f26c5d (patch) | |
| tree | 51bef9b3c5b61ebd42974f642454948d0888ba00 | |
| parent | 0bfc95fe7c8d50cb1a998339a53affc78fdc517e (diff) | |
| parent | bdb27b7e81a722162adb888370e7f429117d41e8 (diff) | |
merge changes for storm-1685
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_world_map.xml | 2 |
2 files changed, 3 insertions, 1 deletions
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" |