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

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-08-10 23:30:16 -04:00
parent d79a8fc87b f5923860fa
commit 0770150455
182 changed files with 8731 additions and 3500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,6 +146,25 @@
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="400"
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="400"
label="Bloom" left="1" mouse_opaque="true"
name="BloomPanel" width="398">

44
indra/newview/skins/default/xui/en-us/floater_region_debug_console.xml Normal file
View File

@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_close="true"
can_minimize="true"
name="region_debug_console"
title="Region Debug"
can_resize="true"
layout="topleft"
min_height="300"
min_width="300"
height="400"
width="600"
default_tab_group="1">
<text_editor
left="10"
type="string"
length="1"
follows="all"
font="Monospace"
bottom="-373"
height="353"
width="576"
ignore_tab="false"
layout="topleft"
max_length="65536"
name="region_debug_console_output"
show_line_numbers="false"
word_wrap="true"
track_bottom="true"
enabled="false">
</text_editor>
<line_editor
border_style="line"
border_thickness="1"
tab_group="1"
follows="left|bottom|right"
font="SansSerif"
height="19"
layout="topleft"
bottom_delta="-20"
max_length="127"
name="region_debug_console_input"
width="576" />
</floater>

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

@@ -409,7 +409,7 @@
mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
You can modify this object.
</text>
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Share with group" left="10"
mouse_opaque="true" name="checkbox share with group"
tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
@@ -420,21 +420,21 @@
<string name="text deed">
Deed
</string>
<button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Deed..." label_selected="Deed..." left_delta="172"
mouse_opaque="true" name="button deed" scale_image="TRUE"
tool_tip="Group shared objects can be deeded by a group officer."
width="78" />
<check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Allow anyone to move" left="10"
mouse_opaque="true" name="checkbox allow everyone move" width="142" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Allow anyone to copy" left="10"
mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Show in search" left="10" name="search_check"
tool_tip="Let people see this object in search results" width="78" />
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="For Sale" left="10" mouse_opaque="true"
name="checkbox for sale" width="78" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -446,7 +446,7 @@
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
<radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
<radio_group bottom_delta="-18" draw_border="false" follows="left|top|right" height="16"
left="42" mouse_opaque="true" name="sale type" width="218">
<radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
name="Original" width="70">
@@ -462,7 +462,7 @@
</radio_item>
</radio_group>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-298" drop_shadow_visible="true" follows="left|top|right"
bottom_delta="-5" drop_shadow_visible="true" follows="left|top|right"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
Next owner can:
@@ -477,12 +477,12 @@
initial_value="false" label="Resell/Give away" left_delta="60"
mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-332" drop_shadow_visible="true" follows="left|top"
bottom="-334" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="label click action" v_pad="0" width="150">
When Left-Clicked:
</text>
<combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
<combo_box bottom_delta="-24" allow_text_entry="false" follows="left|top" height="20"
left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
<!-- Do not reorder these items, the index numbers are
used internally. JC -->
@@ -549,6 +549,40 @@
mouse_opaque="true" name="F:" v_pad="0" width="74">
F:
</text>
<panel bottom="-302" border="true" height="155" left="5" width="260" />
<panel
bottom="-328"
border="false"
follows="left|top"
layout="topleft"
mouse_opaque="false"
name="pathfinding_attrs_panel"
left="0"
top_pad="0"
height="25"
width="290">
<text
type="string"
follows="left|top"
name="pathfinding_attributes_label"
top_pad="4"
width="150"
left="10">
Pathfinding attributes:
</text>
<text
bottom_delta="0"
left_delta="120"
type="string"
text_color="TextLinkColor"
follows="left|top"
name="pathfinding_attributes_value"
width="130"
word_wrap="false"
left_pad="0">
Test
</text>
</panel>
<string name="text modify info 1">
You can modify this object.
</string>
@@ -561,6 +595,12 @@
<string name="text modify info 4">
You cannot modify these objects.
</string>
<string name="text modify info 5">
You can't modify this object across a region boundary
</string>
<string name="text modify info 6">
You can't modify these objects across a region boundary
</string>
<string name="text modify warning">
Must select entire object to set permissions.
</string>

82
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -101,6 +101,21 @@
</form>
</template>
<template name="okhelpignore">
<form>
<button
default="true"
index="0"
name="OK"
text="$yestext"/>
<button
index="1"
name="Help"
text="$helptext"/>
<ignore text="$ignoretext"/>
</form>
</template>
<template name="yesnocancelbuttons">
<form>
<button
@@ -1526,6 +1541,13 @@ Unable to link because you don&apos;t have modify permission on all the objects.
Please make sure none are locked, and that you own all of them.
</notification>
<notification
icon="alertmodal.tga"
name="CannotLinkPermanent"
type="alertmodal">
Objects cannot be linked across region boundaries.
</notification>
<notification
icon="alertmodal.tga"
name="CannotLinkDifferentOwners"
@@ -5956,6 +5978,53 @@ You cannot create objects here.
<unique/>
</notification>
<notification
icon="notify.tga"
name="PathfindingDirty"
type="notify">
<unique/>
The region has pending pathfinding changes. If you have build rights, you may rebake the region by clicking on the “Rebake region” button.
</notification>
<notification
icon="notify.tga"
name="DynamicPathfindingDisabled"
type="notify">
<unique/>
Dynamic pathfinding is not enabled on this region. Scripted objects using pathfinding LSL calls may not operate as expected on this region.
</notification>
<notification
icon="alertmodal.tga"
name="PathfindingRebakeNavmesh"
type="alertmodal">
<unique/>
Changing certain objects in this region could cause other moving objects to behave incorrectly. To make moving objects behave correctly, click the “Rebake region” button. Choose “Help” for more information.
<url
option="1"
name="url"
target = "_external">
http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
</url>
<usetemplate
name="okhelpignore"
ignoretext="Changing certain objects in this region could cause other moving objects to behave incorrectly."
yestext="OK"
helptext="Help"
/>
</notification>
<notification
icon="alertmodal.tga"
name="PathfindingCannotRebakeNavmesh"
type="alertmodal">
<unique/>
An error occurred. There may be a network or server problem, or you may not have build rights. Sometimes logging out and back in will solve this problem.
<usetemplate
name="okbutton"
yestext="OK"
/>
</notification>
<notification
icon="notify.tga"
name="SeeAvatars"
@@ -7095,6 +7164,19 @@ You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME]
- Your CPU speed does not meet the minimum requirements.
</global>
<notification
icon="alertmodal.tga"
name="PathfindingLinksets_ChangeToFlexiblePath"
type="alertmodal">
The selected object affects the navmesh. Changing it to a Flexible Path will remove it from the navmesh.
<tag>confirm</tag>
<usetemplate
ignoretext="The selected object affects the navmesh. Changing it to a Flexible Path will remove it from the navmesh."
name="okcancelignore"
notext="Cancel"
yestext="OK"/>
</notification>
<global name="UnsupportedGLRequirements">
You do not appear to have the proper hardware requirements for [APP_NAME]. The viewer requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
</global>

46
indra/newview/skins/default/xui/en-us/panel_navmesh_rebake.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
height="25"
layout="topleft"
name="panel_navmesh_rebake"
mouse_opaque="false"
visible="true"
follows="none"
width="133">
<button
follows="none"
height="20"
label="Rebake region"
layout="topleft"
left="10"
name="navmesh_btn"
tool_tip="Click to rebake the region&apos;s navmesh."
bottom="-25"
visible="false"
enabled="true"
width="120" />
<button
follows="none"
height="20"
label="Requesting rebake"
layout="topleft"
left="10"
name="navmesh_btn_sending"
tool_tip="Sending rebake request to the server."
bottom="-25"
visible="false"
enabled="false"
width="120" />
<button
follows="left|bottom"
height="20"
label="Region is rebaking"
layout="topleft"
left="10"
name="navmesh_btn_baking"
tool_tip="Region is being rebaked. When completed, this button will disappear."
bottom="-25"
visible="false"
enabled="false"
width="120" />
</panel>

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

@@ -14,8 +14,8 @@
name="padding" use_bounding_rect="true" user_resize="false" width="420" />
<layout_panel auto_resize="false" bottom="0" follows="left|bottom|right|top" height="20"
left="0" min_height="20" min_width="100" mouse_opaque="false"
name="state_buttons" use_bounding_rect="true" user_resize="false"
width="420">
name="state_management_buttons_container" use_bounding_rect="true" user_resize="false"
width="799">
<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="New IM" label_selected="New IM" left="0"
name="New IM" scale_image="true"
@@ -25,7 +25,7 @@
label="Set Not Busy" label_selected="Set Not Busy" left="114"
name="Set Not Busy" scale_image="true"
tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
width="102" />
width="112" />
<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="Flycam" label_selected="Flycam" left="229" name="Flycam" scale_image="true"
tool_tip="Your camera is under joystick control, click here to release it."

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

@@ -1863,6 +1863,13 @@ For AI Character: Navigate to destination.
<string name="LSLTipText_llCreateCharacter">
llCreateCharacter(list options)
Convert linkset to AI Character which can navigate the world.
<!-- Pathfinding -->
<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
<string name="Pathfinding_Object_Attr_None">None</string>
<string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
<string name="Pathfinding_Object_Attr_Character">Character</string>
<string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
</string>
<string name="LSLTipText_llPursue">
llPursue(key target, list options)
@@ -3587,13 +3594,20 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="DefaultMimeType">none/none</string>
<!-- External editor status codes -->
<string name="ExternalEditorNotSet">Select an editor using the ExternalEditor setting.</string>
<string name="ExternalEditorNotFound">Cannot find the external editor you specified.
<!-- External editor status codes -->
<string name="ExternalEditorNotSet">Select an editor using the ExternalEditor setting.</string>
<string name="ExternalEditorNotFound">Cannot find the external editor you specified.
Try enclosing path to the editor with double quotes.
(e.g. "/path to my/editor" "%s")</string>
<string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
<string name="ExternalEditorFailedToRun">External editor failed to run.</string>
<string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
<string name="ExternalEditorFailedToRun">External editor failed to run.</string>
<!-- Pathfinding -->
<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
<string name="Pathfinding_Object_Attr_None">None</string>
<string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
<string name="Pathfinding_Object_Attr_Character">Character</string>
<string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
<string name="Left">Left</string>
<string name="Right">Right</string>

2
indra/newview/skins/default/xui/fr/panel_overlaybar.xml
View File

@@ -4,7 +4,7 @@
<layout_panel min_width="410" name="main_panel" width="410">
<layout_stack name="chatbar_and_buttons" right="410">
<layout_panel name="padding" width="410"/>
<layout_panel name="state_buttons" width="410">
<layout_panel name="state_management_buttons_container" width="410">
<button label="Disponible" label_selected="Disponible" name="Set Not Busy" tool_tip="Le chat et les IM ne s&apos;affichent pas. Cliquez ici pour ne plus être en mode occupé(e)."/>
<button label="Flycam" label_selected="Flycam" name="Flycam" tool_tip="Votre caméra est contrôlée par le joystick, cliquez ici pour la libérer."/>