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

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

Browse Source 
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
This commit is contained in:
Shyotl
2012-11-29 11:54:41 -06:00
parent 3a4b6cf6b6 e17405d80a
commit 794dbacea3
358 changed files with 27109 additions and 8865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/skins/default/xui/en-us/floater_chatterbox.xml
View File

@@ -5,9 +5,9 @@
<icon enabled="false" image_name="tabarea.tga"
bg_alpha_color="blue" color="DefaultShadowLight" border="false"
bottom="-388" follows="left|right|bottom" height="17" left="1" scale_image="true"
mouse_opaque="false" name="chatterbox_tab_container" width="391"></icon>
<tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
name="chatterbox_tabs_horiz" tab_position="bottom" tab_width="80" width="395" />
mouse_opaque="false" name="chatterbox_tab_container" width="391"/>
<tab_container bottom="1" follows="left|right|top|bottom" height="371" left="0"
name="chatterbox_tabs_horiz" tab_position="bottom" tab_width="0" width="395" />
<!--<tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
name="chatterbox_tabs_vert" tab_position="left" tab_width="110" width="395" />-->
</multi_floater>

146
indra/newview/skins/default/xui/en-us/floater_merchant_outbox.xml Normal file
View File

@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<floater
positioning="cascading"
can_close="true"
can_resize="true"
height="440"
help_topic="floater_merchant_outbox"
min_width="300"
min_height="200"
name="floater_merchant_outbox"
save_rect="true"
save_visibility="false"
reuse_instance="true"
title="Merchant Outbox"
width="333">
<string name="OutboxFolderCount0">No folders</string>
<string name="OutboxFolderCount1">1 folder</string>
<string name="OutboxFolderCountN">[NUM] folders</string>
<string name="OutboxImporting">Sending folders...</string>
<string name="OutboxInitializing">Initializing...</string>
<!--panel
name="panel_1 this panel killed xui names, for some reason"
follows="all"
layout="topleft"
left="0"
top="0"
label=""
height="440"
width="333"-->
<panel
name="outbox_inventory_placeholder_panel"
mouse_opaque="false"
follows="all"
layout="topleft"
bottom="70"
left="10"
width="308"
height="352"
bg_opaque_color="InventoryBackgroundColor">
<text
name="outbox_inventory_placeholder_title"
type="string"
follows="top|left|right"
layout="topleft"
top="355"
left="0"
width="308"
height="25"
wrap="true"
halign="center"
font="SansSerifBold">
Loading...
</text>
<text_editor
name="outbox_inventory_placeholder_text"
type="string"
follows="top|left|right"
layout="topleft"
top="337"
left="0"
width="308"
bottom="130"
wrap="true"
enabled="false"
font="SansSerifSmall"
hide_scrollbar="true"
hide_border="true"
bg_readonly_color="0 0 0 0"
halign="left" />
</panel>
<inventory_panel
name="panel_outbox_inventory"
mouse_opaque="false"
filename="panel_outbox_inventory.xml"
follows="all"
layout="topleft"
bottom="70"
left="10"
width="308"
height="352"
bg_opaque_color="InventoryBackgroundColor"/>
<panel
name="panel_2"
mouse_opaque="false"
follows="bottom|left|right"
left="10"
bottom="5"
width="313"
top="70">
<panel
name="outbox_generic_drag_target"
mouse_opaque="false"
follows="left|right"
bottom="33"
left="0"
width="308"
height="25"
background_visible="false"
bg_alpha_color="0.950 0.412 0.173 0.35"
border="true"
bevel_style="in"
visible="true">
<text
name="text_1"
type="string"
follows="all"
layout="topleft"
height="20"
left="5"
width="293"
halign="center"
font="SansSerifMedium"
font_shadow="hard"
valign="top">
Drag items here to create folders
</text>
</panel>
<text
name="outbox_folder_count"
type="string"
follows="all"
layout="topleft"
bottom_delta="-27"
left="0"
width="150"
height="20"
wrap="true"
halign="left"
valign="center"
font="SansSerif"/>
<button
label="Send to Marketplace"
tool_tip="Push to my Marketplace Storefront"
name="outbox_import_btn"
follows="bottom|right"
tab_stop="false"
halign="center"
bottom_delta="-3"
left="160"
height="25"
width="150"
enabled="false" />
</panel>
<text name="import_progress_indicator" left="160" height="440" top="438" width="333" follows="all" visible="false">Import in progress</text>
<!--/panel-->
</floater>

410
indra/newview/skins/default/xui/en-us/floater_post_process.xml
View File

@@ -1,249 +1,249 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-350" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="false" height="400" left="50" min_height="400"
min_width="300" mouse_opaque="true" name="Post-Process Floater"
title="Post-Process Settings" width="400">
<tab_container bottom="-400" follows="left|top" height="384" left="0"
mouse_opaque="false" name="Post-Process Tabs" tab_position="left"
width="400">
<panel border="true" bottom="-400" follows="left|top|right|bottom" height="384"
label="Color Filter" left="1" mouse_opaque="false"
name="ColorFilterPanel" width="398">
<check_box bottom="-20" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_color_filter" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterGammaText" v_pad="0"
width="355">
Gamma
</text>
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14"
max_val="10" min_val="-.25" mouse_opaque="true" name="gamma"
show_text="true" value="1.0" width="200" />
can_resize="false" height="400" left="50" min_height="400"
min_width="300" mouse_opaque="true" name="Post-Process Floater"
title="Post-Process Settings" width="400">
<tab_container bottom="0" follows="left|top" height="384" left="0"
mouse_opaque="false" name="Post-Process Tabs" tab_position="left"
width="400">
<panel border="true" bottom="-400" follows="left|top|right|bottom" height="400"
label="Color Filter" left="1" mouse_opaque="false"
name="ColorFilterPanel" width="398">
<check_box follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_color_filter" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterBrightnessText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterGammaText" v_pad="0"
width="355">
Gamma
</text>
<slider bottom_delta="-35" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14" val_width="35"
max_val="10" min_val="-.25" mouse_opaque="true" name="gamma"
show_text="true" value="1.0" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterBrightnessText" v_pad="0"
width="355">
Brightness
</text>
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14"
max_val="4" min_val="0" mouse_opaque="true" name="brightness"
show_text="true" value="1.0" width="200" />
<slider bottom_delta="-35" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14" val_width="35"
max_val="4" min_val="0" mouse_opaque="true" name="brightness"
show_text="true" value="1.0" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterSaturationText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterSaturationText" v_pad="0"
width="355">
Saturation
</text>
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14"
max_val="2" min_val="-1" mouse_opaque="true"
name="saturation" show_text="true" value="1.0" width="200" />
<slider bottom_delta="-35" can_edit_text="true" decimal_digits="2" follows="left"
height="18" increment="0.01" initial_val="1.0" label="" left="14" val_width="35"
max_val="2" min_val="-2" mouse_opaque="true"
name="saturation" show_text="true" value="1.0" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterContrastText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterContrastText" v_pad="0"
width="355">
Contrast
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="2" follows="left" height="18" increment="0.01"
initial_val="1.0" label="" left="14" max_val="4" min_val="0"
mouse_opaque="true" name="contrast" show_text="true"
value="1.0" width="200" />
<slider bottom_delta="-35" can_edit_text="true"
decimal_digits="2" follows="left" height="18" increment="0.01" val_width="35"
initial_val="1.0" label="" left="14" max_val="4" min_val="0"
mouse_opaque="true" name="contrast" show_text="true"
value="1.0" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterBaseText" v_pad="0"
width="355">
Contrast Base Colora
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="ColorFilterBaseText" v_pad="0"
width="355">
Contrast Base Colors
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="R" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[0]" show_text="true" value="1.0"
width="200" />
<slider bottom_delta="-35" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="R" label_width="7" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[0]" show_text="true" value="1.0"
width="200" />
<slider bottom_delta="-20" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="G" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[1]" show_text="true" value="1.0"
width="200" />
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="G" label_width="7" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[1]" show_text="true" value="1.0"
width="200" />
<slider bottom_delta="-20" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="B" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[2]" show_text="true" value="1.0"
width="200" />
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.0" label="B" label_width="7" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[2]" show_text="true" value="1.0"
width="200" />
<slider bottom_delta="-20" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="0.5" label="I" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[3]" show_text="true" value="1.0"
width="200" />
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="0.5" label="I" label_width="7" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="contrast_base[3]" show_text="true" value="1.0"
width="200" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="384"
label="Gauss Blur" left="1" mouse_opaque="false"
name="GaussBlurPanel" width="398">
<check_box bottom="-20" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_gauss_blur" width="200" />
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Gauss Blur" left="1" mouse_opaque="false"
name="GaussBlurPanel" width="398">
<check_box follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_gauss_blur" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="GaussBlurPassesText" v_pad="0"
width="355">
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="GaussBlurPassesText" v_pad="0"
width="355">
Passes to apply
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="0" follows="left"
height="18" increment="1" initial_val="9" label="" left="14"
max_val="25" min_val="1" mouse_opaque="true"
name="gauss_blur_passes" show_text="true" value="0.7" width="200" />
<slider bottom_delta="-35" can_edit_text="true"
decimal_digits="0" follows="left"
height="18" increment="1" initial_val="9" label="" left="14"
max_val="25" min_val="1" mouse_opaque="true"
name="gauss_blur_passes" show_text="true" value="0.7" width="200" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="384"
label="Night Vision" left="1" mouse_opaque="false"
name="NightVisionPanel" width="398">
<check_box bottom="-20" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_night_vision" width="200" />
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Night Vision" left="1" mouse_opaque="false"
name="NightVisionPanel" width="398">
<check_box follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_night_vision" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionBrightMultText" v_pad="0"
width="355">
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionBrightMultText" v_pad="0"
width="355">
Light Amplification Multiple
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left"
height="18" increment="0.01" initial_val="3.0" label="" left="14"
max_val="10" min_val="1" mouse_opaque="true"
name="brightness_multiplier" show_text="true" value="0.7" width="200" />
<slider bottom_delta="-35" can_edit_text="true" val_width="50"
decimal_digits="3" follows="left"
height="18" increment="0.01" initial_val="3.0" label="" left="14"
max_val="10" min_val="1" mouse_opaque="true"
name="brightness_multiplier" show_text="true" value="0.7" width="220" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionNoiseSizeText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionNoiseSizeText" v_pad="0"
width="355">
Noise Size
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left" height="18" increment="0.1"
initial_val="1" label="" left="14" max_val="100" min_val="1"
mouse_opaque="true" name="noise_size" show_text="true"
value="1.0" width="200" />
<slider bottom_delta="-35" can_edit_text="true" val_width="50"
decimal_digits="3" follows="left" height="18" increment="0.1"
initial_val="1" label="" left="14" max_val="100" min_val="1"
mouse_opaque="true" name="noise_size" show_text="true"
value="1.0" width="220" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionNoiseStrengthText"
v_pad="0" width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="NightVisionNoiseStrengthText"
v_pad="0" width="355">
Noise Strength
</text>
<slider bottom_delta="-30" can_edit_text="true" decimal_digits="3"
follows="left" height="18" increment="0.01" initial_val="0.3" label=""
left="14" max_val="1" min_val="0" mouse_opaque="true"
name="noise_strength" show_text="true" value="1.0" width="200" />
<slider bottom_delta="-35" can_edit_text="true" decimal_digits="3" val_width="50"
follows="left" height="18" increment="0.01" initial_val="0.3" label=""
left="14" max_val="1" min_val="0" mouse_opaque="true"
name="noise_strength" show_text="true" value="1.0" width="220" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="384"
label="Posterize" left="1" mouse_opaque="false"
name="PosterizePanel" width="398">
<check_box bottom="-20" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_posterize" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
width="355">
Layer Count
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left"
height="18" increment="1" initial_val="10" label="" left="14"
max_val="20" min_val="1" mouse_opaque="true"
name="posterize_layers" show_text="true" value="10" width="200" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="384"
label="MotionBlur" left="1" mouse_opaque="false"
name="MotionBlurPanel" width="398">
<check_box bottom="-20" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_motionblur" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="MotionBlurText" v_pad="0"
width="355">
Motionblur Strength
</text>
<slider bottom_delta="-30" can_edit_text="true"
decimal_digits="0" follows="left"
height="18" increment="1" initial_val="8" label="" left="14"
max_val="30" min_val="1" mouse_opaque="true"
name="blur_strength" show_text="true" value="0.7" width="200" />
</panel>
<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Bloom" left="1" mouse_opaque="true"
name="BloomPanel" width="398">
<check_box bottom="-20" control_name="BloomToggle" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="BloomToggle" width="200" />
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Posterize" left="1" mouse_opaque="false"
name="PosterizePanel" width="398">
<check_box follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_posterize" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
width="355">
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
width="355">
Layer Count
</text>
<slider bottom_delta="-35" can_edit_text="true"
decimal_digits="3" follows="left"
height="18" increment="1" initial_val="10" label="" left="14"
max_val="20" min_val="1" mouse_opaque="true"
name="posterize_layers" show_text="true" value="10" width="200" />
</panel>
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="384"
label="MotionBlur" left="1" mouse_opaque="false"
name="MotionBlurPanel" width="398">
<check_box follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="enable_motionblur" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="MotionBlurText" v_pad="0"
width="355">
Motionblur Strength
</text>
<slider bottom_delta="-19" can_edit_text="true"
decimal_digits="0" follows="left"
height="18" increment="1" initial_val="8" label="" left="14"
max_val="30" min_val="1" mouse_opaque="true"
name="blur_strength" show_text="true" value="0.7" width="200" />
</panel>
<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Bloom" left="1" mouse_opaque="true"
name="BloomPanel" width="398">
<check_box control_name="BloomToggle" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="4" mouse_opaque="true" name="BloomToggle" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
width="355">
Luminosity Extraction
</text>
<slider bottom_delta="-30" can_edit_text="true" control_name="BloomExtract"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="0.9" label="" left="14" max_val="1" min_val="0"
mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
width="200" />
<slider bottom_delta="-35" can_edit_text="true" control_name="BloomExtract"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="0.9" label="" left="14" max_val="1" min_val="0" val_width="41"
mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
Bloom Size
</text>
<slider bottom_delta="-30" can_edit_text="true" control_name="BloomSize"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="3.0" label="" left="14" max_val="20" min_val="0"
mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
width="200" />
<slider bottom_delta="-35" can_edit_text="true" control_name="BloomSize"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="3.0" label="" left="14" max_val="20" min_val="0" val_width="41"
mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
width="355">
bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
width="355">
Bloom Strength
</text>
<slider bottom_delta="-30" can_edit_text="true" control_name="BloomStrength"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.2" label="" left="14" max_val="10" min_val="0"
mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
width="200" />
</panel>-->
<slider bottom_delta="-35" can_edit_text="true" control_name="BloomStrength"
decimal_digits="3" follows="left" height="18" increment="0.01"
initial_val="1.2" label="" left="14" max_val="10" min_val="0" val_width="41"
mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
width="200" />
</panel>-->
<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
label="Extras" left="1" mouse_opaque="false" name="Extras"
width="398">
<button bottom="-33" enabled="true" font="SansSerif" halign="center" height="20"
label="LoadEffect" label_selected="LoadEffect" left="15"
mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
<button bottom="-60" enabled="true" font="SansSerif" halign="center" height="20"
label="SaveEffect" label_selected="SaveEffect" left="15"
mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
<combo_box allow_text_entry="false" bottom="-33" follows="left|top" height="18"
left_delta="120" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
width="150" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-75"
enabled="true" follows="left|right|bottom" font="SansSerif"
handle_edit_keys_directly="false" height="20"
label="Effect Name" left="135" max_length="40" mouse_opaque="true"
name="PPEffectNameEditor" select_all_on_focus_received="false"
select_on_focus="false" tab_group="1" width="150" />
label="Extras" left="1" mouse_opaque="false" name="Extras"
width="398">
<combo_box allow_text_entry="false" follows="left|top" height="20"
left="15" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
width="150" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-43"
enabled="true" follows="left|right|bottom" font="SansSerif"
handle_edit_keys_directly="false" height="20"
label="Effect Name" left="15" max_length="40" mouse_opaque="true"
name="PPEffectNameEditor" select_all_on_focus_received="false"
select_on_focus="false" tab_group="1" width="250" />
<button bottom="-24" enabled="true" font="SansSerif" halign="center" height="20"
label="Load Effect" label_selected="Load Effect" left_delta="170"
mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
<button bottom_delta="-43" enabled="true" font="SansSerif" halign="center" height="20"
label="Save Effect" label_selected="Save Effect"
mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
</panel>
</tab_container>
</floater>

3
indra/newview/skins/default/xui/en-us/floater_radar.xml
View File

@@ -338,8 +338,11 @@
/>
</panel>
</tab_container>
<string name="template">[NAME] [ACTION] [RANGE].</string>
<!-- [ACTION] -->
<string name="has_entered">has entered</string>
<string name="has_left">has left</string>
<!-- [RANGE] -->
<string name="the_sim">the sim</string>
<string name="draw_distance">draw distance</string>
<string name="shout_range">shout range</string>

3
indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
View File

@@ -2,6 +2,9 @@
<floater can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="false" height="590" min_height="100" min_width="100"
name="floater_report_abuse" title="Report Abuse" width="390">
<string name="Screenshot">
Screenshot
</string>
<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
follows="left|top" height="114" label="" left="238" mouse_opaque="true"
name="screenshot" width="134" />

6
indra/newview/skins/default/xui/en-us/menu_inventory.xml
View File

@@ -311,11 +311,13 @@
</menu_item_call>
<menu_item_separator name="Marketplace Separator" />
<menu_item_call bottom_delta="-18" height="18" label="Copy to Merchant Outbox" left="0" mouse_opaque="true"
name="Merchant Copy" width="128"/>
name="Merchant Copy" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="copy_to_outbox" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Send to Marketplace" left="0" mouse_opaque="true"
name="Marketplace Send" width="128"/>
name="Marketplace Send" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="send_to_marketplace" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="--no options--" left="0"
mouse_opaque="true" name="--no options--" width="128" />
<!--menu_item_separator name="Wearable Separator" -->

6
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -547,6 +547,12 @@
<on_click function="PromptShowURL" name="ManageMyAccount_url"
userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
</menu_item_call>
<menu_item_check
label="Merchant Outbox..."
name="MerchantOutbox">
<on_click function="ShowFloater" userdata="outbox" />
<on_check function="FloaterVisible" userdata="outbox" />
</menu_item_check>
<menu_item_call bottom="-286" enabled="true" height="19" label="Buy [CURRENCY]..." left="0"
mouse_opaque="true" name="Buy and Sell L$..." width="166">
<on_click function="ShowFloater" userdata="buy currency" />

17
indra/newview/skins/default/xui/en-us/panel_outbox_inventory.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<outbox_inventory_panel
name="inventory_outbox"
start_folder="Outbox"
follows="all" layout="topleft"
top="0" left="0" height="165" width="308"
top_pad="0"
bg_opaque_color="0.169 0.169 0.169 1"
bg_alpha_color="0.169 0.169 0.169 1"
background_visible="true"
border="false"
bevel_style="none"
show_item_link_overlays="true"
tool_tip="Drag and drop items here to prepare them for sale on your storefront"
>
<scroll reserve_scroll_corner="false" />
</outbox_inventory_panel>

46
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -92,23 +92,17 @@
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" label="Building" name="Building">
<text bottom_delta="-19" follows="top" height="10" left_delta="30" name="text_box6">Pivot Point</text>
<text bottom_delta="-19" follows="top" height="10" left_delta="30" name="text_box6" halign="center" width="80">Pivot Point</text>
<spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X pos" label_width="40" left="10" max_val="256" min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y pos" label_width="40" max_val="256" min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Z pos" label_width="40" max_val="256" min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
<check_box bottom_delta="-20" follows="top" label="Values are percent" left_delta="-5" tool_tip="Default settings are Percentages and every axis set at 50" name="EmPivotPercToggle" control_name="AscentBuildPrefs_PivotIsPercent"/>
<check_box bottom_delta="60" follows="top" label="Enable highlighting of selected prims" left_delta="140" name="EmBuildPrefsRenderHighlight_toggle" control_name="RenderHighlightSelections"/>
<check_box bottom_delta="-20" follows="top" initial_value="false" label="Show axis arrow on root prim position" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
<view_border bevel_style="none" border_thickness="1" bottom="-180" follows="top" height="70" left="5" name="NextOwnerBorder" width="130"/>
<text bottom_delta="60" follows="top" height="10" left_delta="10" name="text_box7">Allow next owner:</text>
<check_box follows="top" height="16" initial_value="false" label="Copy permissions" tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="NextOwnerCopy"/>
<check_box follows="top" height="16" initial_value="false" label="Modify permission" tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="NextOwnerModify"/>
<check_box follows="top" height="16" initial_value="true" label="Transfer permission" tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
<texture_picker allow_no_texture="false" bottom="-190" can_apply_immediately="true" default_image_name="Default" follows="top" height="80" label=" Texture" left="155" name="texture control" control_name="EmeraldBuildPrefs_Texture" tool_tip="Click to choose a texture" width="64"/>
<check_box bottom="-131" left_delta="75" follows="top" height="16" label="Phantom" name="EmPhantomToggle" control_name="EmeraldBuildPrefs_Phantom"/>
<check_box follows="top" height="16" label="Physical" name="EmPhysicalToggle" control_name="EmeraldBuildPrefs_Physical"/>
<check_box follows="top" height="16" label="Temporary" name="EmTemporaryToggle" control_name="EmeraldBuildPrefs_Temporary"/>
<combo_box bottom="-190" left_delta="6" follows="top" height="18" name="material" width="64" control_name="BuildPrefs_Material">
<text bottom="-19" left="170" name="Dimensions" halign="center" width="70">Dimensions</text>
<spinner bottom_delta="-20" left_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="X size" label_width="40" max_val="10" min_val="0.0001" name="X size" width="110" control_name="BuildPrefs_Xsize"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="Y size" label_width="40" max_val="10" min_val="0.0001" name="Y size" width="110" control_name="BuildPrefs_Ysize"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="Z size" label_width="40" max_val="10" min_val="0.0001" name="Z size" width="110" control_name="BuildPrefs_Zsize"/>
<text bottom_delta="-15" left_delta="-6" follows="top" name="Material">Material:</text>
<combo_box bottom_delta="-5" left_delta="48" follows="top" height="18" name="material" width="74" control_name="BuildPrefs_Material">
<combo_item name="Stone" value="Stone">Stone</combo_item>
<combo_item name="Metal" value="Metal">Metal</combo_item>
<combo_item name="Glass" value="Glass">Glass</combo_item>
@@ -117,8 +111,16 @@
<combo_item name="Plastic" value="Plastic">Plastic</combo_item>
<combo_item name="Rubber" value="Rubber">Rubber</combo_item>
</combo_box>
<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-190" can_apply_immediately="true" color="1, 1, 1, 1" follows="top" height="80" label=" Color" left_delta="76" name="colorswatch" tool_tip="Click to open Color Picker" width="64" control_name="EmeraldBuildPrefs_Color"/>
<spinner bottom_delta="60" decimal_digits="0" follows="top" height="16" increment="1" label="Alpha" label_width="45" left_delta="70" max_val="100" min_val="0" name="alpha" width="97" control_name="EmeraldBuildPrefs_Alpha"/>
<text bottom="-19" left_delta="85" name="text_box7" halign="center" width="115">Next Owner Perms</text>
<check_box follows="top" height="16" initial_value="false" label="Copy permission" tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="NextOwnerCopy"/>
<check_box follows="top" height="16" initial_value="false" label="Modify permission" tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="NextOwnerModify"/>
<check_box follows="top" height="16" initial_value="true" label="Transfer permission" tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
<check_box bottom="-131" left="5" follows="top" height="16" label="Phantom" name="EmPhantomToggle" control_name="EmeraldBuildPrefs_Phantom"/>
<check_box follows="top" height="16" label="Physical" name="EmPhysicalToggle" control_name="EmeraldBuildPrefs_Physical"/>
<check_box follows="top" height="16" label="Temporary" name="EmTemporaryToggle" control_name="EmeraldBuildPrefs_Temporary"/>
<texture_picker allow_no_texture="false" bottom="-190" can_apply_immediately="true" default_image_name="Default" follows="top" height="80" label=" Texture" left="108" name="texture control" control_name="EmeraldBuildPrefs_Texture" tool_tip="Click to choose a texture" width="64"/>
<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-190" can_apply_immediately="true" color="1, 1, 1, 1" follows="top" height="80" label=" Color" left_delta="88" name="colorswatch" tool_tip="Click to open Color Picker" width="64" control_name="EmeraldBuildPrefs_Color"/>
<spinner bottom_delta="60" decimal_digits="0" follows="top" height="16" increment="1" label="Alpha" label_width="45" left_delta="88" max_val="100" min_val="0" name="alpha" width="97" control_name="EmeraldBuildPrefs_Alpha"/>
<spinner bottom_delta="-20" decimal_digits="2" follows="top" height="16" increment="0.05" label="Glow" label_width="45" max_val="1" min_val="0" name="glow" width="97" control_name="EmeraldBuildPrefs_Glow"/>
<check_box follows="top" height="16" label="Full Bright" name="EmFBToggle" control_name="EmeraldBuildPrefs_FullBright"/>
<text name="shine" follows="top">Shine</text>
@@ -129,14 +131,12 @@
<combo_item name="High" value="High">High</combo_item>
</combo_box>
<check_box name="EmeraldBuildPrefsEmbedItem" left="5" bottom_delta="-15" follows="top" initial_value="false" label="Put an item into new objects" control_name="EmeraldBuildPrefs_EmbedItem"/>
<view_border blevel_style="in" bottom_delta="-20" left="25" follows="top" height="16" name="build_item_drop_target_rect" width="140"/>
<text bottom_delta="0" left_delta="8" follows="top" height="16" name="Give inventory">Drop inventory item here</text>
<view_border blevel_style="in" bottom_delta="-35" left_delta="-8" follows="top" height="35" name="build_item_add_disp_rect" width="140"/>
<text bottom_delta="15" left_delta="0" follows="top" height="16" name="build_item_add_disp_rect_txt" halign="center" width="138">Currently set to:
ITEM</text>
<spinner bottom="369" left="370" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="X size" label_width="40" max_val="10" min_val="0.0001" name="X size" width="110" control_name="BuildPrefs_Xsize"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="Y size" label_width="40" max_val="10" min_val="0.0001" name="Y size" width="110" control_name="BuildPrefs_Ysize"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="Z size" label_width="40" max_val="10" min_val="0.0001" name="Z size" width="110" control_name="BuildPrefs_Zsize"/>
<view_border blevel_style="in" bottom_delta="-35" left="25" follows="top" height="35" name="build_item_drop_target_rect" width="194"/>
<text bottom_delta="16" left_delta="8" follows="top" height="16" name="Give inventory" halign="center" width="178">Drop inventory item here</text>
<view_border blevel_style="in" bottom_delta="-16" left_delta="-8" follows="top" height="16" name="build_item_add_disp_rect" width="194"/>
<text bottom_delta="0" left_delta="0" follows="top" height="16" name="build_item_add_disp_rect_txt" halign="center" width="192">Currently set to: ITEM</text>
<check_box bottom_delta="17" follows="top" left_delta="194" label="Highlight selected prims" name="EmBuildPrefsRenderHighlight_toggle" control_name="RenderHighlightSelections"/>
<check_box bottom_delta="-20" follows="top" initial_value="false" label="Axis arrow on root prim position" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
</panel>
</tab_container>

96
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -2818,8 +2818,8 @@ Where tag = tag string to match. Removes bot's matching the tag.
<!-- Strings needed by drop targets -->
<string name="CurrentlyNotSet">Currently not set</string>
<string name="CurrentlySetTo">Currently set to</string>
<string name="AnItemNotOnThisAccount">an item not on this account</string>
<string name="CurrentlySetTo">Currently set to: [ITEM]</string>
<string name="CurrentlySetToAnItemNotOnThisAccount">Currently set to an item not on this account</string>
<string name="NotLoggedIn">Not logged in</string>
<!-- Avatar busy/away mode -->
@@ -2854,6 +2854,23 @@ Where tag = tag string to match. Removes bot's matching the tag.
<!-- inventory -->
<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string>
<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
<string name="InventoryOutboxNotMerchantTitle">Anyone can sell items on the Marketplace.</string>
<string name="InventoryOutboxNotMerchantTooltip"></string>
<string name="InventoryOutboxNotMerchant">
If you'd like to become a merchant, you'll need to
</string>
<string name="InventoryOutboxNotMerchantSubs">create a Marketplace store.</string>
<string name="InventoryOutboxNoItemsTitle">Your outbox is empty.</string>
<string name="InventoryOutboxNoItemsTooltip"></string>
<string name="InventoryOutboxNoItems">
Drag folders to this area and click "Send to Marketplace" to list them for sale on the
</string>
<string name="InventoryOutboxNoItemsSubs">Marketplace.</string>
<!-- use value="" because they have preceding spaces -->
<string name="no_transfer" value=" (no transfer)" />
@@ -2918,6 +2935,52 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="Rubber">Rubber</string>
<string name="Light">Light</string>
<!-- Avatar Skeleton -->
<string name="Chest">Chest</string>
<string name="Skull">Skull</string>
<string name="Left Shoulder">Left Shoulder</string>
<string name="Right Shoulder">Right Shoulder</string>
<string name="Left Hand">Left Hand</string>
<string name="Right Hand">Right Hand</string>
<string name="Left Foot">Left Foot</string>
<string name="Right Foot">Right Foot</string>
<string name="Spine">Spine</string>
<string name="Pelvis">Pelvis</string>
<string name="Mouth">Mouth</string>
<string name="Chin">Chin</string>
<string name="Left Ear">Left Ear</string>
<string name="Right Ear">Right Ear</string>
<string name="Left Eyeball">Left Eyeball</string>
<string name="Right Eyeball">Right Eyeball</string>
<string name="Nose">Nose</string>
<string name="R Upper Arm">R Upper Arm</string>
<string name="R Forearm">R Forearm</string>
<string name="L Upper Arm">L Upper Arm</string>
<string name="L Forearm">L Forearm</string>
<string name="Right Hip">Right Hip</string>
<string name="R Upper Leg">R Upper Leg</string>
<string name="R Lower Leg">R Lower Leg</string>
<string name="Left Hip">Left Hip</string>
<string name="L Upper Leg">L Upper Leg</string>
<string name="L Lower Leg">L Lower Leg</string>
<string name="Stomach">Stomach</string>
<string name="Left Pec">Left Pec</string>
<string name="Right Pec">Right Pec</string>
<string name="Neck">Neck</string>
<string name="Root">Root</string>
<string name="unsupported point">unsupported point</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<!-- HUD Position -->
<string name="Center 2">Center 2</string>
<string name="Top Right">Top Right</string>
<string name="Top">Top</string>
<string name="Top Left">Top Left</string>
<string name="Center">Center</string>
<string name="Bottom Left">Bottom Left</string>
<string name="Bottom">Bottom</string>
<string name="Bottom Right">Bottom Right</string>
<!-- compile queue-->
<string name="CompileQueueDownloadedCompiling">Downloaded, now compiling</string>
<string name="CompileQueueScriptNotFound">Script not found on server.</string>
@@ -2958,6 +3021,9 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="IMMainland">mainland</string>
<string name="IMTeen">teen</string>
<!-- floater about land -->
<string name="Anyone">Anyone</string>
<!-- floater region info -->
<!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
<string name="RegionInfoError">error</string>
@@ -3697,6 +3763,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="IM_autoresponded_to">Autoresponse sent to</string>
<string name="IM_autoresponse_sent_item">was sent auto-response item</string>
<string name="Unnamed">(Unnamed)</string>
<string name="inventory_item_offered_to">Inventory item offered to</string>
<string name="Saved_message" value="(Saved [LONG_TIMESTAMP]) "/>
<string name="PowerUser1">You are bestowed with powers beyond mortal comprehension.</string>
<string name="PowerUser2">Use your newfound abilities wisely.</string>
@@ -3815,7 +3882,32 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="group_role_owners">Owners</string>
<string name="group_member_status_online">Online</string>
<string name="uploading_abuse_report">Uploading...
Abuse Report</string>
<!-- names for new inventory items-->
<string name="New Shape">New Shape</string>
<string name="New Skin">New Skin</string>
<string name="New Hair">New Hair</string>
<string name="New Eyes">New Eyes</string>
<string name="New Shirt">New Shirt</string>
<string name="New Pants">New Pants</string>
<string name="New Shoes">New Shoes</string>
<string name="New Socks">New Socks</string>
<string name="New Jacket">New Jacket</string>
<string name="New Gloves">New Gloves</string>
<string name="New Undershirt">New Undershirt</string>
<string name="New Underpants">New Underpants</string>
<string name="New Skirt">New Skirt</string>
<string name="New Alpha">New Alpha</string>
<string name="New Tattoo">New Tattoo</string>
<string name="New Physics">New Physics</string>
<string name="Invalid Wearable">Invalid Wearable</string>
<string name="New Gesture">New Gesture</string>
<string name="New Script">New Script</string>
<string name="New Note">New Note</string>
<string name="New Folder">New Folder</string>
<string name="DefaultMimeType">none/none</string>
<string name="Chat">Chat</string>

3
indra/newview/skins/default/xui/es/floater_radar.xml
View File

@@ -76,8 +76,11 @@
<button name="send_keys_btn" label="Anunciar Ahora" tool_tip="Envia todas las keys al HUD ahora"/>
</panel>
</tab_container>
<string name="template">[NAME] [ACTION] [RANGE].</string>
<!-- [ACTION] -->
<string name="has_entered">ha entrado en</string>
<string name="has_left">se ha retirado de</string>
<!-- [RANGE] -->
<string name="the_sim">el sim</string>
<string name="draw_distance">la distancia de dibujo</string>
<string name="shout_range">la distancia de grito</string>

4
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -1837,8 +1837,8 @@ Returns a key that is the UUID of the user seated on the prim.
<!-- Strings needed by drop targets -->
<string name="CurrentlyNotSet">No definido actualmente </string>
<string name="CurrentlySetTo">Actualmente definido a</string>
<string name="AnItemNotOnThisAccount">Un artículo no está en esta cuenta</string>
<string name="CurrentlySetTo">Actualmente definido a: [ITEM]</string>
<string name="CurrentlySetToAnItemNotOnThisAccount">Actualmente definido a un artículo no está en esta cuenta</string>
<string name="NotLoggedIn">Desconectado</string>
<!-- Avatar busy/away mode -->