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

Merge branch 'master' into llwebprofile

Browse Source
This commit is contained in:
Aleric Inglewood
2012-12-14 20:43:17 +01:00
parent 15b6593143 c34f2941aa
commit cfa8df0575
329 changed files with 10206 additions and 6883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -773,7 +773,7 @@ Only large parcels can be listed in search.
mouse_opaque="true" name="Snapshot:" v_pad="0" width="278">
Snapshot:
</text>
<texture_picker allow_no_texture="false" bottom="-349" can_apply_immediately="false"
<texture_picker allow_no_texture="true" bottom="-349" can_apply_immediately="false"
default_image_name="" enabled="true" follows="left|top" height="135"
label="" left="10" mouse_opaque="true" name="snapshot_ctrl"
tool_tip="Click to choose a picture" width="180" />

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

@@ -30,6 +30,9 @@
<button bottom="-252" enabled="false" follows="left|bottom" font="SansSerifSmall"
halign="center" height="20" label="Invisible" label_selected="Invisible" left="72"
mouse_opaque="true" name="Invisible" scale_image="true" width="64" />
<button bottom="-276" enabled="true" follows="left|bottom" font="SansSerifSmall"
halign="center" height="20" label="None" label_selected="None" left="4"
mouse_opaque="true" name="None" scale_image="true" width="64" />
<check_box bottom="-305" enabled="true" follows="left|bottom" font="SansSerifSmall"
height="20" initial_value="true" label="Show Folders" left="4"
mouse_opaque="true" name="show_folders_check" radio_style="false"

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

@@ -1261,7 +1261,7 @@
<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
<texture_picker allow_no_texture="false" allow_invisible_texture="true" bottom="-90" can_apply_immediately="true"
<texture_picker allow_no_texture="true" allow_invisible_texture="true" bottom="-90" can_apply_immediately="true"
default_image_name="Default" follows="left|top" height="80" label="Texture"
left="10" mouse_opaque="true" name="texture control"
tool_tip="Click to choose a picture" width="64" />

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

@@ -172,7 +172,7 @@
tool_tip="Copies current location as SLURL to be used on the web."
width="222" />
<slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom"
height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230"
height="16" increment="0.2" initial_val="-2" label="Zoom" left="-230"
max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider"
show_text="false" value="48.5029" width="222" />
</floater>

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

@@ -186,6 +186,10 @@
<on_click filter="" function="Inventory.DoToSelected" userdata="acquire_asset_id" />
</menu_item_call>
<menu_item_separator name="Copy Separator" />
<menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
name="Cut" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
name="Copy" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="copy" />

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

@@ -46,6 +46,9 @@
<menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
<on_click function="Object.DERENDER" />
</menu_item_call>
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Avatar.ReloadTextures" />
</menu_item_call>
</pie_menu>
<menu_item_call enabled="false" label="Eject..." mouse_opaque="true" name="Eject...">
<on_click function="Avatar.Eject" />

5
indra/newview/skins/default/xui/en-us/menu_pie_object.xml
View File

@@ -72,7 +72,10 @@
<menu_item_call enabled="false" hidden="false" label="Export" mouse_opaque="true" name="Export">
<on_click function="Object.Export" />
<on_enable function="Object.EnableExport" />
</menu_item_call>
</menu_item_call>
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Object.ReloadTextures" />
</menu_item_call>
</pie_menu>
<menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
<on_click function="Object.Mute" />

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

@@ -86,6 +86,9 @@
</menu_item_call>
</pie_menu>
<pie_menu label="Tools &gt;" name="Tools &gt;">
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Avatar.ReloadTextures" />
</menu_item_call>
<menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true"
name="Anims...">
<on_click function="Avatar.Anims" />

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

@@ -32,6 +32,12 @@ Resident Chooser&apos; to start.
<string name="confirm_invite_owner_str">
Are you sure you want to invite new owner(s)? This action is permanent!
</string>
<string name="already_in_group">
Some Residents you chose are already in the group, and so were not sent an invitation.
<string>
<string name="invite_selection_too_large">
Group Invitations not sent: too many Residents selected. Group Invitations are limited to 100 per request.
<string>
<!--button bottom="25" font="SansSerifSmall" halign="center" height="20"
label="Send Invitations" left="65" name="ok_button" width="140" />
<button bottom_delta="-22" font="SansSerifSmall" halign="center" height="20"

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

@@ -11,7 +11,7 @@
label="Offset TP target by half agent height" tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for." name="offset_teleport_check"/>
<check_box left="10" bottom_delta="-20" control_name="PreviewAnimInWorld" follows="top" initial_value="false"
label="Preview animations on the avatar instead on a dummy before uploading" tool_tip="The Animation upload window will play animations on your avatar when previewing them." name="preview_anim_in_world_check"/>
<check_box bottom_delta="-20" control_name="SaveScriptsAsMono" follows="left|top" initial_value="true"
<check_box bottom_delta="-20" control_name="SaveInventoryScriptsAsMono" follows="left|top" initial_value="true"
label="Save scripts in inventory as Mono scripts instead of LSL2" tool_tip="Scripts will automatically be compiled in Mono when saving - Usually only possible when placed in an object." name="save_scripts_as_mono_check"/>
<check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" follows="left|top" initial_value="true"
label="Always rez objects as land group when available" tool_tip="Rez objects with the same group that the object is being rezzed on has, regardless of your active tag." name="always_rez_in_group_check"/>

4
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
View File

@@ -13,10 +13,10 @@
<combo_item name="1280x800" value="1280 x 800">1280x800</combo_item>
<combo_item name="1440x900" value="1440 x 900">1440x900</combo_item>
<combo_item name="1600x900" value="1600 x 900">1600x900 (HD+)</combo_item>
<combo_item name="1680×1050" value="1680 × 1050">1680×1050</combo_item>
<combo_item name="1680x1050" value="1680 x 1050">1680x1050</combo_item>
<combo_item name="1440x1080" value="1440 x 1080">1440x1080 (HDV1080)</combo_item>
<combo_item name="1920x1080" value="1920 x 1080">1920x1080 (Full-HD)</combo_item>
<combo_item name="2560×1440" value="2560 × 1440">2560×1440</combo_item>
<combo_item name="2560x1440" value="2560 x 1440">2560x1440</combo_item>
</combo_box>
<text bottom="-62" height="12" left="10" name="DisplayResLabel">Display Resolution:</text>
<combo_box bottom="-67" height="18" left="165" name="fullscreen combo" width="150"/>

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

@@ -123,6 +123,7 @@
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<string name="LoadingData">Loading...</string>
<string name="InvalidLocation">Invalid Location</string>
<!-- namecache -->
@@ -1920,14 +1921,14 @@ 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>
<!-- 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="LSLTipText_llPursue">
llPursue(key target, list options)
For AI Character: Chase after a target.
@@ -2676,7 +2677,7 @@ aaSayTo(key userID, string text)
Where userID = avatar key, text = string msg. Similar to llOwnerSay but can be directly targeted to an avatar.
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaGetWalkDisabled ">
<string name="LSLTipText_aaGetWalkDisabled">
aaGetWalkDisabled(key ID)
Returns integer of TRUE or FALSE for specifid ID. Where ID = avatar uuid.
(Aurora-Sim only)
@@ -2686,7 +2687,7 @@ aaSetWalkDisabled(key ID, integer Value)
Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables walk, forcing avatar to fly.
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaGetFlyDisabled ">
<string name="LSLTipText_aaGetFlyDisabled">
aaGetFlyDisabled(key ID)
Returns integer of TRUE or FALSE for specifid ID. Where ID = avatar uuid.
(Aurora-Sim only)
@@ -2696,7 +2697,7 @@ aaSetFlyDisabled(key ID, integer Value)
Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables flying, forcing avatar to walk.
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaAvatarFullName2Key ">
<string name="LSLTipText_aaAvatarFullName2Key">
aaAvatarFullName2Key(string FullName)
Returns the avatar uuid from their fullname. Where FullName = "Firstname Lastname”.
(Aurora-Sim only)
@@ -2706,17 +2707,17 @@ aaRaiseError(string message)
Allows you to have errors that end the execution of the event and fire another event in the script.
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaGetText ">
<string name="LSLTipText_aaGetText">
aaGetText()
Returns a string of the hover text of an object.
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaGetTextColor ">
<string name="LSLTipText_aaGetTextColor">
aaGetTextColor()
Returns the hovertext color in rotation. Use Ex: rotation color = aaGetTextColor() to separate color.x, color.y, color.z, color.s Where s = value of alpha in llSetText.
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaSetEnv ">
<string name="LSLTipText_aaSetEnv">
aaSetEnv(string EnvName, list Value)
Sets environment values. Where EnvName = ENABLE_GRAVITY, GRAVITY_FORCE_X, GRAVITY_FORCE_Y, GRAVITY_FORCE_Z, ADD_GRAVITY_POINT, ADD_GRAVITY_FORCE, START_TIME_REVERSAL_SAVING,
STOP_TIME_REVERSAL_SAVING, START_TIME_REVERSAL, STOP_TIME_REVERSAL.

12
indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
View File

@@ -31,10 +31,10 @@
1440x900
</combo_item>
<combo_item name="1600x900">
1600x900 (HD+)
</combo_item>
<combo_item name="1680×1050">
1680×1050
1600x900 (HD+)
</combo_item>
<combo_item name="1680x1050">
1680x1050
</combo_item>
<combo_item name="1440x1080">
1440x1080 (HDV1080)
@@ -42,8 +42,8 @@
<combo_item name="1920x1080">
1920x1080 (Full-HD)
</combo_item>
<combo_item name="2560×1440">
2560×1440
<combo_item name="2560x1440">
2560x1440
</combo_item>
</combo_box>
<text name="DisplayResLabel">

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

@@ -30,7 +30,7 @@
tool_tip="L&#x27;animation est jou&#xE9;e avec votre avatar avant d&#x27;&#xEA;tre t&#xE9;l&#xE9;charg&#xE9;e."
mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="false"
<check_box bottom_delta="-20" control_name="SaveInventoryScriptsAsMono" enabled="false"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Enregistrer les scripts syst&#xE9;matiquement en Mono" left="10"
tool_tip="Compile les scripts en Mono quand cela est possible."