diff options
| author | eli <none@none> | 2011-09-22 18:08:17 -0700 |
|---|---|---|
| committer | eli <none@none> | 2011-09-22 18:08:17 -0700 |
| commit | 94943e2c828c161358ceb62879b5a40db9738788 (patch) | |
| tree | aa4c0405ff9d10ecd6b6c30e948cad7628ad736c /indra/newview/skins/default/xui/en/floater_tools.xml | |
| parent | d63ba05e1dd226e2b8e0b610ed9134c934bf6612 (diff) | |
sync with viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_tools.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 8901583799..9b02f7d273 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -48,11 +48,11 @@ </floater.string> <floater.string name="status_selectcount"> - [OBJ_COUNT] objects ( [PRIM_COUNT] prims[PE_STRING] ) selected + [OBJ_COUNT] objects selected, land impact [LAND_IMPACT] </floater.string> <floater.string - name="status_selectprimequiv"> - , [SEL_WEIGHT] prim equivs + name="status_remaining_capacity"> + Remaining capacity [LAND_CAPACITY]. </floater.string> <button follows="left|top" @@ -738,11 +738,11 @@ font="SansSerifSmall" layout="topleft" left="10" - name="selection_weight" + name="remaining_capacity" top_pad="0" visible="false" width="280"> - Physics weight [PHYS_WEIGHT], Render Cost [DISP_WEIGHT]. + [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights More info] </text> <!-- <text --> <!-- text_color="LtGray_50" --> @@ -2000,25 +2000,21 @@ even though the user gets a free copy. visible="false" width="150"> <combo_box.item - label="(none)" - name="None" - value="None" /> - <combo_box.item label="Sphere" name="Sphere" - value="Sphere" /> + value="1" /> <combo_box.item label="Torus" name="Torus" - value="Torus" /> + value="2" /> <combo_box.item label="Plane" name="Plane" - value="Plane" /> + value="3" /> <combo_box.item label="Cylinder" name="Cylinder" - value="Cylinder" /> + value="4" /> </combo_box> </panel> <panel |