diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-06-26 17:55:31 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-06-26 17:55:31 -0700 |
| commit | 173b4ec4561793ca5913c7ec89bc8b83a71b2702 (patch) | |
| tree | 0c1ecc1ca7cec546f00daa25199ea548d4bf4d3d /indra/newview/skins | |
| parent | bb59fff5a0e60b16e0726fb2da6cc6ee9cc3569c (diff) | |
| parent | de89e384544176f2e10225481ca2b0e7901167fb (diff) | |
merge
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_social.xml | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml index 76c15b9624..960f883595 100644 --- a/indra/newview/skins/default/xui/en/floater_social.xml +++ b/indra/newview/skins/default/xui/en/floater_social.xml @@ -379,16 +379,25 @@ <layout_panel name="place_map_panel" height="133"> - <icon + <loading_indicator follows="left|top" - height="128" - width="128" - image_name="Map_Placeholder_Icon" - layout="topleft" - top="5" - left="9" - name="map_placeholder"> - </icon> + height="24" + width="24" + name="map_loading_indicator" + top="57" + left="61" + visible="true"/> + <icon + follows="left|top" + height="128" + width="128" + image_name="Map_Placeholder_Icon" + layout="topleft" + top="5" + left="9" + visible="false" + name="map_placeholder"> + </icon> <check_box follows="left|top" initial_value="true" |