Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Meeting Request: Pick up LL's changes to land impact (Also introduces Land Impact floater)

Browse Source 
Small change to lltextbox allowing us to use value attribute with <text/>'s YAY!!

Cleaned up in llfloatertools as well to better diff.
This commit is contained in:
Inusaito Sayori
2014-05-23 06:19:43 -04:00
parent 2ce3f2c131
commit 828941a204
20 changed files with 1112 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/skins/default/xui/de/floater_object_weights.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="object_weights" title="Erweitert">
<floater.string name="nothing_selected" value="--"/>
<text name="selected_text" value="AUSGEWÄHLT"/>
<text name="objects" value="--"/>
<text name="objects_label" value="Objekte"/>
<text name="prims" value="--"/>
<text name="prims_label" value="Primitive"/>
<text name="weights_of_selected_text" value="GEWICHT DER AUSGEWÄHLTEN"/>
<text name="download" value="--"/>
<text name="download_label" value="Herunterladen"/>
<text name="physics" value="--"/>
<text name="physics_label" value="Physik"/>
<text name="server" value="--"/>
<text name="server_label" value="Server"/>
<text name="display" value="--"/>
<text name="display_label" value="Anzeige"/>
<text name="land_impacts_text" value="AUSWIRKUNGEN AUF LAND"/>
<text name="selected" value="--"/>
<text name="selected_label" value="Ausgewählt"/>
<text name="rezzed_on_land" value="--"/>
<text name="rezzed_on_land_label" value="Auf Land gerezzt"/>
<text name="remaining_capacity" value="--"/>
<text name="remaining_capacity_label" value="Verbleibende Kapazität"/>
<text name="total_capacity" value="--"/>
<text name="total_capacity_label" value="Gesamtkapazität"/>
<text name="help_SLURL" value="[secondlife:///app/help/object_weights Was ist das?...]"/>
</floater>

3
indra/newview/skins/default/xui/de/floater_tools.xml
View File

@@ -452,6 +452,5 @@
<string name="grid_world_text">Welt</string>
<string name="grid_reference_text">Referenz</string>
<string name="grid_attachment_text">Anhänge</string>
<string name="status_selectprimequiv">, Kosten: [SEL_WEIGHT]</string>
<string name="status_selectcount">Prims: [COUNT][PE_STRING]</string>
<string name="status_selectcount">Prims: [OBJ_COUNT], Kosten: [LAND_IMPACT]</string>
</floater>

326
indra/newview/skins/default/xui/en-us/floater_object_weights.xml Normal file
View File

@@ -0,0 +1,326 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_close="true"
can_tear_off="false"
height="290"
help_topic="object_weights"
name="object_weights"
save_rect="true"
single_instance="true"
title="Advanced Object Weights"
width="200">
<floater.string
name="nothing_selected"
value="--"/>
<text
follows="left|top"
height="16"
left="10"
name="selected_text"
font-style="BOLD"
bottom="-36"
value="SELECTED"
width="180" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="objects"
bottom_delta="-19"
value="--"
width="40" />
<text
follows="left|top"
height="16"
left_delta="50"
name="objects_label"
bottom_delta="0"
value="Objects"
width="130" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="prims"
bottom_delta="-19"
value="--"
width="40" />
<text
follows="left|top"
height="16"
left_delta="50"
name="prims_label"
bottom_delta="0"
value="Prims"
width="130" />
<view_border
bevel_style="none"
follows="top|left"
height="0"
left="10"
name="selected_text_border"
bottom_delta="-6"
width="180"/>
<text
follows="left|top"
height="16"
left="10"
name="weights_of_selected_text"
font-style="BOLD"
bottom_delta="-22"
value="WEIGHTS OF SELECTED"
width="180" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="download"
bottom_delta="-19"
value="--"
width="40" />
<!-- Singu TODO: loading_indicators.
<loading_indicator
follows="left|top"
height="16"
left="34"
name="download_loading_indicator"
bottom_delta="0"
width="16" />
-->
<text
follows="left|top"
height="16"
left_delta="50"
name="download_label"
bottom_delta="0"
value="Download"
width="130" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="physics"
bottom_delta="-19"
value="--"
width="40" />
<!-- Singu TODO: loading_indicators.
<loading_indicator
follows="left|top"
height="16"
left="34"
name="physics_loading_indicator"
bottom_delta="0"
width="16" />
-->
<text
follows="left|top"
height="16"
left_delta="50"
name="physics_label"
bottom_delta="0"
value="Physics"
width="130" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="server"
bottom_delta="-19"
value="--"
width="40" />
<!-- Singu TODO: loading_indicators.
<loading_indicator
follows="left|top"
height="16"
left="34"
name="server_loading_indicator"
bottom_delta="0"
width="16" />
-->
<text
follows="left|top"
height="16"
left_delta="50"
name="server_label"
bottom_delta="0"
value="Server"
width="130" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="display"
bottom_delta="-19"
value="--"
width="40" />
<!-- Singu TODO: loading_indicators.
<loading_indicator
follows="left|top"
height="16"
left="34"
name="display_loading_indicator"
bottom_delta="0"
width="16" />
-->
<text
follows="left|top"
height="16"
left_delta="50"
name="display_label"
bottom_delta="0"
value="Display"
width="130" />
<view_border
bevel_style="none"
follows="top|left"
height="0"
left="10"
name="weights_text_border"
bottom_delta="-6"
width="180"/>
<text
follows="left|top"
height="16"
left="10"
name="land_impacts_text"
font-style="BOLD"
bottom_delta="-24"
value="LAND IMPACTS"
width="180" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="selected"
bottom_delta="-19"
value="--"
width="40" />
<!-- Singu TODO: loading_indicators.
<loading_indicator
follows="left|top"
height="16"
left="34"
name="selected_loading_indicator"
bottom_delta="0"
width="16" />
-->
<text
follows="left|top"
height="16"
left_delta="50"
name="selected_label"
bottom_delta="0"
value="Selected"
width="130" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="rezzed_on_land"
bottom_delta="-19"
value="--"
width="40" />
<!-- Singu TODO: loading_indicators.
<loading_indicator
follows="left|top"
height="16"
left="34"
name="rezzed_on_land_loading_indicator"
bottom_delta="0"
width="16" />
-->
<text
follows="left|top"
height="16"
left_delta="50"
name="rezzed_on_land_label"
bottom_delta="0"
value="Rezzed on land"
width="130" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="remaining_capacity"
bottom_delta="-19"
value="--"
width="40" />
<!-- Singu TODO: loading_indicators.
<loading_indicator
follows="left|top"
height="16"
layout="topleft"
left="34"
name="remaining_capacity_loading_indicator"
bottom_delta="0"
width="16" />
-->
<text
follows="left|top"
height="16"
left_delta="50"
name="remaining_capacity_label"
bottom_delta="0"
value="Remaining capacity"
width="130" />
<text
follows="left|top"
halign="right"
height="16"
left="10"
name="total_capacity"
bottom_delta="-19"
value="--"
width="40" />
<!-- Singu TODO: loading_indicators.
<loading_indicator
follows="left|top"
height="16"
left="34"
name="total_capacity_loading_indicator"
bottom_delta="0"
width="16" />
-->
<text
follows="left|top"
height="16"
left_delta="50"
name="total_capacity_label"
bottom_delta="0"
value="Total capacity"
width="130" />
<!-- Singu TODO: Help stuffs
Singu Note: Add 25 to the height of this floater when uncommenting
<view_border
bevel_style="none"
follows="top|left"
height="0"
left="10"
name="land_impacts_text_border"
bottom_delta="-6"
width="180"/>
<text
follows="left|top"
height="16"
left="10"
name="help_SLURL"
bottom_delta="-24"
value="[secondlife:///app/help/object_weights What is all this?...]"
width="180" />
-->
</floater>

20
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -5,6 +5,13 @@
name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
short_title="Build" width="272">
<floater.string name="status_selectcount">
Primitives: [OBJ_COUNT], LI: [LAND_IMPACT]
</floater.string>
<floater.string
name="status_remaining_capacity">
Remaining capacity [LAND_CAPACITY].
</floater.string>
<!-- Main floater tabs -->
<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
@@ -401,10 +408,13 @@
mouse_opaque="true" name="link_num_obj_count" v_pad="0" width="143">
[DESC] [NUM]
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-170" left="118" drop_shadow_visible="true" follows="left|top"
halign="right" height="16" mouse_opaque="true" name="selection_empty" width="143">Nothing selected.</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-170" left="118" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="right" height="16"
mouse_opaque="true" name="prim_count" v_pad="0" width="143"/>
font="SansSerifSmall" halign="right" height="16" font-style="UNDERLINE"
mouse_opaque="true" name="selection_count" v_pad="0" width="143"/>
<!-- Sub-tabs -->
@@ -1477,10 +1487,4 @@
<string name="grid_attachment_text">
Attachment
</string>
<string name="status_selectprimequiv">
, Cost: [SEL_WEIGHT]
</string>
<string name="status_selectcount">
Primitives: [COUNT][PE_STRING]
</string>
</floater>

28
indra/newview/skins/default/xui/es/floater_object_weights.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="object_weights" title="Avanzadas">
<floater.string name="nothing_selected" value="--"/>
<text name="selected_text" value="SELECCIONADOS"/>
<text name="objects" value="--"/>
<text name="objects_label" value="Objetos"/>
<text name="prims" value="--"/>
<text name="prims_label" value="Primitivas"/>
<text name="weights_of_selected_text" value="PESOS DE SELECCIONADOS"/>
<text name="download" value="--"/>
<text name="download_label" value="Descargar"/>
<text name="physics" value="--"/>
<text name="physics_label" value="Física"/>
<text name="server" value="--"/>
<text name="server_label" value="Servidor"/>
<text name="display" value="--"/>
<text name="display_label" value="Mostrar"/>
<text name="land_impacts_text" value="IMPACTOS EN EL TERRENO"/>
<text name="selected" value="--"/>
<text name="selected_label" value="Seleccionados"/>
<text name="rezzed_on_land" value="--"/>
<text name="rezzed_on_land_label" value="Colocados en el terreno"/>
<text name="remaining_capacity" value="--"/>
<text name="remaining_capacity_label" value="Capacidad restante"/>
<text name="total_capacity" value="--"/>
<text name="total_capacity_label" value="Capacidad total"/>
<text name="help_SLURL" value="[secondlife:///app/help/object_weights ¿Qué es todo esto?...]"/>
</floater>

6
indra/newview/skins/default/xui/es/floater_tools.xml
View File

@@ -106,7 +106,6 @@
<text name="link_num_obj_count">
[DESC] [NUM]
</text>
<text name="prim_count"/>
<!-- Sub-tabs -->
@@ -645,10 +644,7 @@ name="button abandon land"/>
<string name="grid_attachment_text">
Añadido
</string>
<string name="status_selectprimequiv">
, Peso: [SEL_WEIGHT]
</string>
<string name="status_selectcount">
Primitivas: [COUNT][PE_STRING]
Primitivas: [OBJ_COUNT], Peso: [LAND_IMPACT]
</string>
</floater>

28
indra/newview/skins/default/xui/fr/floater_object_weights.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="object_weights" title="Avanc<6E><63>">
<floater.string name="nothing_selected" value="--"/>
<text name="selected_text" value="SÉLECTION"/>
<text name="objects" value="--"/>
<text name="objects_label" value="Objets"/>
<text name="prims" value="--"/>
<text name="prims_label" value="Prims"/>
<text name="weights_of_selected_text" value="POIDS DE LA SÉLECTION"/>
<text name="download" value="--"/>
<text name="download_label" value="Téléchargement"/>
<text name="physics" value="--"/>
<text name="physics_label" value="Physique"/>
<text name="server" value="--"/>
<text name="server_label" value="Serveur"/>
<text name="display" value="--"/>
<text name="display_label" value="Affichage"/>
<text name="land_impacts_text" value="IMPACTS SUR LE TERRAIN"/>
<text name="selected" value="--"/>
<text name="selected_label" value="Sélection"/>
<text name="rezzed_on_land" value="--"/>
<text name="rezzed_on_land_label" value="Rezzés sur le terrain"/>
<text name="remaining_capacity" value="--"/>
<text name="remaining_capacity_label" value="Capacité restante"/>
<text name="total_capacity" value="--"/>
<text name="total_capacity_label" value="Capacité totale"/>
<text name="help_SLURL" value="[secondlife:///app/help/object_weights De quoi s&apos;agit-il ?...]"/>
</floater>

3
indra/newview/skins/default/xui/fr/floater_tools.xml
View File

@@ -96,9 +96,6 @@
<text name="Strength:">
Force
</text>
<text name="prim_count">
Prims : [COUNT]
</text>
<!-- Sub-tabs -->

28
indra/newview/skins/default/xui/it/floater_object_weights.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="object_weights" title="Avanzate">
<floater.string name="nothing_selected" value="--"/>
<text name="selected_text" value="SELEZIONATI"/>
<text name="objects" value="--"/>
<text name="objects_label" value="Oggetti"/>
<text name="prims" value="--"/>
<text name="prims_label" value="Prim"/>
<text name="weights_of_selected_text" value="PESO ELEMENTI SELEZIONATI"/>
<text name="download" value="--"/>
<text name="download_label" value="Scarica"/>
<text name="physics" value="--"/>
<text name="physics_label" value="Fisica"/>
<text name="server" value="--"/>
<text name="server_label" value="Server"/>
<text name="display" value="--"/>
<text name="display_label" value="Visualizzazione"/>
<text name="land_impacts_text" value="IMPATTO TERRENO"/>
<text name="selected" value="--"/>
<text name="selected_label" value="Selezionati"/>
<text name="rezzed_on_land" value="--"/>
<text name="rezzed_on_land_label" value="Rezzati sul terreno"/>
<text name="remaining_capacity" value="--"/>
<text name="remaining_capacity_label" value="Capacità restante"/>
<text name="total_capacity" value="--"/>
<text name="total_capacity_label" value="Capacità totale"/>
<text name="help_SLURL" value="[secondlife:///app/help/object_weights Di cosa si tratta?...]"/>
</floater>

28
indra/newview/skins/default/xui/pt/floater_object_weights.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="object_weights" title="Avan<61><6E>ado">
<floater.string name="nothing_selected" value="--"/>
<text name="selected_text" value="SELECIONADO"/>
<text name="objects" value="--"/>
<text name="objects_label" value="Objetos"/>
<text name="prims" value="--"/>
<text name="prims_label" value="Prims"/>
<text name="weights_of_selected_text" value="PESOS DOS SELECIONADOS"/>
<text name="download" value="--"/>
<text name="download_label" value="Baixar"/>
<text name="physics" value="--"/>
<text name="physics_label" value="Físico"/>
<text name="server" value="--"/>
<text name="server_label" value="Servidor"/>
<text name="display" value="--"/>
<text name="display_label" value="Visualização"/>
<text name="land_impacts_text" value="IMPACTOS NO TERRENO"/>
<text name="selected" value="--"/>
<text name="selected_label" value="Selecionado"/>
<text name="rezzed_on_land" value="--"/>
<text name="rezzed_on_land_label" value="Resolução no terreno"/>
<text name="remaining_capacity" value="--"/>
<text name="remaining_capacity_label" value="Capacidade restante"/>
<text name="total_capacity" value="--"/>
<text name="total_capacity_label" value="Capacidade total"/>
<text name="help_SLURL" value="[secondlife:///app/help/object_weights What is all this?...]"/>
</floater>

2
indra/newview/skins/default/xui/pt/floater_tools.xml
View File

@@ -648,6 +648,6 @@
Anexo
</string>
<string name="status_selectcount">
primitivas: [COUNT][PE_STRING]
primitivas: [COUNT], LI: [LAND_IMPACT]
</string>
</floater>