diff options
author | seth_productengine <none@none> | 2011-08-02 00:16:13 +0300 |
---|---|---|
committer | seth_productengine <none@none> | 2011-08-02 00:16:13 +0300 |
commit | 1b7b319ae22ac7598b7b3d75ccbec75263450e07 (patch) | |
tree | 9a3e656c90635062cf5f2d7c11c1bb0a24efff7a /indra/newview/skins | |
parent | 6c7653c65bd3f9907bcd4a8a54e4e5c1d172d15e (diff) |
SH-2170 WIP Object and land data added to new weights floater.
The data is updated upon object selection change. The land data is displayed for the land containing the primary selected object.
Loading indicators added for land impacts.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_object_weights.xml | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml index f377386679..a73db3af32 100644 --- a/indra/newview/skins/default/xui/en/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml @@ -222,6 +222,14 @@ top_pad="3" value="--" width="40" /> + <loading_indicator + follows="left|top" + height="16" + layout="topleft" + left="34" + name="selected_loading_indicator" + top_delta="0" + width="16" /> <text follows="left|top" height="16" @@ -241,6 +249,14 @@ top_pad="3" value="--" width="40" /> + <loading_indicator + follows="left|top" + height="16" + layout="topleft" + left="34" + name="rezzed_on_land_loading_indicator" + top_delta="0" + width="16" /> <text follows="left|top" height="16" @@ -260,12 +276,20 @@ top_pad="3" value="--" width="40" /> + <loading_indicator + follows="left|top" + height="16" + layout="topleft" + left="34" + name="remaining_capacity_loading_indicator" + top_delta="0" + width="16" /> <text follows="left|top" height="16" layout="topleft" left_pad="10" - name="remaining_capacity" + name="remaining_capacity_label" top_delta="0" value="Remaining capacity" width="130" /> @@ -279,12 +303,20 @@ top_pad="3" value="--" width="40" /> + <loading_indicator + follows="left|top" + height="16" + layout="topleft" + left="34" + name="total_capacity_loading_indicator" + top_delta="0" + width="16" /> <text follows="left|top" height="16" layout="topleft" left_pad="10" - name="total_capacity" + name="total_capacity_label" top_delta="0" value="Total capacity" width="130" /> @@ -303,7 +335,7 @@ height="16" layout="topleft" left="10" - name="total_capacity" + name="help_SLURL" top_pad="10" value="[secondlife:///www.secondlife.com What is all this?...]" width="180" /> |