summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-06-25 15:49:39 -0700
committerMerov Linden <merov@lindenlab.com>2013-06-25 15:49:39 -0700
commitec09ce526b477869aa76dddaa8e11eecca57989d (patch)
treed1ace9a1f76b62e47e2c69bd6ee96d8426bb8008 /indra/newview/skins/default/xui
parentfa48ae87415d7e5d5bf7549af30832a14d6a7de2 (diff)
ACME-612 : Implemented a loading indicator for the map tile when it's loading, also disable the checkbox during that time
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_social.xml27
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"