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

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

Browse Source 
Conflicts(Actually git being dumb, I already merged these, just lost history):
	indra/newview/llfloateractivespeakers.h - local
	indra/newview/lloverlaybar.cpp - local
	indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote
This commit is contained in:
Lirusaito
2013-06-25 19:37:50 -04:00
parent 306df58793 2793ca9e04
commit c2cc398339
16 changed files with 284 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
indra/newview/skins/default/xui/en-us/floater_beacons.xml
View File

@@ -3,23 +3,68 @@
width="250" height="255"
name="beacons" title="Beacons"
rect_control="FloaterBeaconsRect" control_name="ShowBeaconsFloater">
<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="230" name="beacons_panel">
<check_box bottom_delta="-33" follows="left|top" left="0" name="always_on" label="Keep beacons when closing floater" control_name="keepbeacons" />
<check_box bottom_delta="-30" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />
<check_box bottom_delta="-30" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="25"
mouse_opaque="true" name="beacon_width_label" v_pad="0" width="128">
Beacon Width:
</text>
<slider bottom_delta="-20" can_edit_text="false" enabled="true" width="185" height="16" mouse_opaque="true"
decimal_digits="0" increment="1" initial_val="1" left="16" min_val="1.0" max_val="16.0"
name="beacon_width" show_text="true" value="1" control_name="DebugBeaconLineWidth"/>
</panel>
<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="230" name="beacons_panel">
<check_box bottom_delta="-24" follows="left|top" left="0" control_name="BeaconsKeepVisible" label="Keep beacons when closing floater" name="always_on"/>
<check_box bottom_delta="-30" follows="left|top" control_name="renderbeacons" label="Render Beacons" name="beacons">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="renderhighlights" label="Render Highlights" name="highlights">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<text
type="string"
length="1"
bottom_delta="-20"
follows="left|top"
height="16"
left="20"
name="beacon_width_label"
width="128">
Beacon Width:
</text>
<slider
control_name="DebugBeaconLineWidth"
decimal_digits="0"
height="16"
increment="1"
initial_value="1"
max_val="16"
min_val="1"
name="beacon_width"
bottom_delta="-14"
width="180" />
<check_box bottom_delta="-22" follows="left|top" left="0" control_name="physicalbeacon" label="Physical Objects" name="physical">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="scriptsbeacon" label="Scripted Objects" name="scripted">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="scripttouchbeacon" label="Scripted Objects with Touch Only" name="touch_only">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="soundsbeacon" label="Sound Sources" name="sounds">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="particlesbeacon" label="Particle Sources" name="particles">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box
bottom_delta="-20"
follows="left|top"
control_name="moapbeacon"
height="16"
left="0"
label="Media sources"
name="moapbeacon" >
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
</panel>
</floater>

2
indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml
View File

@@ -65,7 +65,7 @@
bottom="-45"
left="0"
border_size="0"
mouse_opaque="true"
mouse_opaque="false"
orientation="horizontal">
<!-- outer layout_panels center the inner one -->
<layout_panel

14
indra/newview/skins/default/xui/en-us/panel_progress.xml
View File

@@ -2,15 +2,15 @@
<panel bottom="0" follows="left|bottom|right|top" height="768" left="0" name="login_progress_panel" width="1024" visible="true">
<layout_stack name="stack1" orientation="horizontal" left="0" bottom="0" width="1024" height="768" follows="left|right|top|bottom">
<layout_panel name="panel1" user_resize="false" min_width="10" width="150"/>
<layout_panel name="panel2" user_resize="false" min_width="640" width="640" height="768">
<layout_panel name="panel2" user_resize="false" min_width="640" width="724" height="768">
<layout_stack name="stack2" orientation="vertical" left="0" bottom="0" height="768" width="640" follows="left|right|top|bottom">
<layout_panel name="panel3" min_height="10" height="200" width="640"/>
<layout_panel name="panel4" min_height="250" height="250" width="640" auto_resize="false">
<icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="640" height="250" follows="left|right|bottom|top"/>
<text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="640" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="640" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<layout_panel name="panel3" min_height="10" height="200" width="724"/>
<layout_panel name="panel4" min_height="250" height="250" width="724" auto_resize="false">
<icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="724" height="250" follows="left|right|bottom|top"/>
<text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-45" follows="left|right|top" />
<text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" bottom="5" width="600" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/>
<text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" bottom="5" width="700" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/>
</layout_panel>
<layout_panel name="panel5" min_width="10" height="200" width="640"/>
</layout_stack>

25
indra/newview/skins/default/xui/es/floater_beacons.xml
View File

@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="beacons" title="Balizas">
<panel name="beacons_panel">
<check_box name="always_on" label="Mantener balizas activas al cerrar"/>
<check_box name="touch_only" label="Solo Objetos con script de toque"/>
<check_box name="scripted" label="Objetos con Scripts"/>
<check_box name="physical" label="Objetos Materiales"/>
<check_box name="sounds" label="Fuentes de Sonidos"/>
<check_box name="particles" label="Fuentes de Partículas"/>
<check_box name="highlights" label="Activar los Realzados"/>
<check_box name="beacons" label="Activar Balizas"/>
<text name="beacon_width_label">
Ancho de la Baliza:
</text>
</panel>
<check_box label="Mantener balizas activas al cerrar" name="always_on"/>
<check_box label="Activar Balizas" name="beacons"/>
<check_box label="Activar los Realzados" name="highlights"/>
<text name="beacon_width_label">
Ancho de la Baliza:
</text>
<check_box label="Objetos Materiales" name="physical"/>
<check_box label="Objetos con Scripts" name="scripted"/>
<check_box label="Solo Objetos con script de toque" name="touch_only"/>
<check_box label="Fuentes de Sonidos" name="sounds"/>
<check_box label="Fuentes de Partículas" name="particles"/>
<check_box label="Fuentes de media" name="moapbeacon"/>
</panel>
</floater>

22
indra/newview/skins/default/xui/fr/floater_beacons.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="beacons" title="Balises">
<panel name="beacons_panel">
<check_box name="always_on" label="Keep beacons when closing floater"/>
<check_box name="touch_only" label="Objets scriptés avec &#x22;Toucher&#x22; uniquement"/>
<check_box name="scripted" label="Objets scriptés"/>
<check_box name="physical" label="Objets physiques"/>
<check_box name="sounds" label="Sources sonores"/>
<check_box name="particles" label="Sources de particules"/>
<check_box name="highlights" label="Mettre en surbrillance"/>
<check_box name="beacons" label="Montrer les balises"/>
<text name="beacon_width_label">
Largeur de la balise :
</text>
<check_box label="Montrer les balises" name="beacons"/>
<check_box label="Mettre en surbrillance" name="highlights"/>
<text name="beacon_width_label">
Largeur de la balise :
</text>
<check_box label="Objets physiques" name="physical"/>
<check_box label="Objets scriptés" name="scripted"/>
<check_box label="Objets scriptés avec &#x22;Toucher&#x22; uniquement" name="touch_only"/>
<check_box label="Sources sonores" name="sounds"/>
<check_box label="Sources des particules" name="particles"/>
<check_box label="Sources des médias" name="moapbeacon"/>
</panel>
</floater>

11
indra/newview/skins/default/xui/pt/floater_beacons.xml
View File

@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="beacons" title="Balizas">
<panel name="beacons_panel">
<check_box label="Objetos programados com toque apenas" name="touch_only"/>
<check_box label="Objetos programados" name="scripted"/>
<check_box label="Objetos físicos" name="physical"/>
<check_box label="Fontes de Som" name="sounds"/>
<check_box label="Fontes de Partículas" name="particles"/>
<check_box label="Renderização de Highlights" name="highlights"/>
<check_box label="Renderização de Balizas" name="beacons"/>
<text name="beacon_width_label">
Largura da Baliza
</text>
<check_box label="Objetos físicos" name="physical"/>
<check_box label="Objetos programados" name="scripted"/>
<check_box label="Objetos programados com toque apenas" name="touch_only"/>
<check_box label="Fontes de Som" name="sounds"/>
<check_box label="Fontes de Partículas" name="particles"/>
<check_box label="Fontes de mídia" name="moapbeacon"/>
</panel>
</floater>