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

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

Browse Source
This commit is contained in:
Siana Gearz
2013-01-03 02:17:20 +01:00
parent 6e219f0a4e b0fe12f597
commit 1872337f5f
58 changed files with 3575 additions and 1462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/skins/default/xui/en-us/floater_merchant_outbox.xml
View File

@@ -10,6 +10,7 @@
name="floater_merchant_outbox"
save_rect="true"
save_visibility="false"
rect_control="FloaterOutboxRect"
reuse_instance="true"
title="Merchant Outbox"
width="333">

9
indra/newview/skins/default/xui/en-us/floater_postcard.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="false"
can_resize="true" height="380" min_height="380" min_width="450"
name="Postcard" title="Email Snapshot" width="450">
can_resize="true" height="346" min_height="346" min_width="450"
name="Postcard" title="Email Snapshot" width="450"
rect_control="FloaterSnapshotPostcardRect">
<text bottom="-35" follows="top|left" font="SansSerif" left="12" name="to_label">
Recipient&apos;s Email:
</text>
@@ -34,10 +35,6 @@
max_length="700" name="msg_form" width="420" spell_check="true">
Type your message here.
</text_editor>
<text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
name="fine_print">
If your recipient joins our universe, you&apos;ll get a referral bonus.
</text>
<button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel"
name="cancel_btn" right="-10" width="100" />
<button bottom_delta="0" follows="right|bottom" height="20" label="Send"

293
indra/newview/skins/default/xui/en-us/floater_snapshot.xml
View File

@@ -1,58 +1,97 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
can_resize="false" follows="left|top" height="566" name="Snapshot"
rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
<text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
width="195">
Snapshot destination
</text>
<radio_group bottom_delta="-65" follows="left|top" height="60" label="Snapshot type"
left="10" name="snapshot_type_radio" width="195">
<radio_item bottom="-19" height="16" name="postcard">
Send via email
</radio_item>
<radio_item bottom="-38" height="16" name="texture">
Save to your inventory ([UPLOADFEE])
</radio_item>
<radio_item bottom="-57" height="16" name="local">
Save to your hard drive
</radio_item>
</radio_group>
<text bottom="-236" follows="left|top" height="25" left="10" name="file_size_label"
width="195">
can_resize="false" follows="left|top" height="629" name="Snapshot"
rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="219">
<text bottom="-201" right="-6" height="25" name="file_size_label" halign="right" width="120">
File size: [SIZE] KB
</text>
<button bottom="-246" follows="left|top" height="20" label="Refresh Snapshot" left="10"
name="new_snapshot_btn" width="195" />
<button bottom_delta="-22" follows="left|top" height="20" label="Send" left="10"
<text bottom="-195" height="15" left="10" name="type_label" halign="left">
Target
</text>
<radio_group bottom_delta="-79" follows="left|top" height="79" label="Snapshot type"
left="10" name="snapshot_type_radio" width="200">
<radio_item bottom="-19" height="16" name="feed">
Post to my.secondlife.com feed
</radio_item>
<radio_item bottom="-38" height="16" name="postcard">
Send via email
</radio_item>
<radio_item bottom="-57" height="16" name="texture">
Save to my inventory ([UPLOADFEE])
</radio_item>
<radio_item bottom="-76" height="16" name="local">
Save to my hard drive
</radio_item>
</radio_group>
<button bottom_delta="-28" follows="left|top" height="20" label="Refresh snapshot" left="10"
name="new_snapshot_btn" width="115" tool_tip="Make a snapshot of the current view. Use the save and/or upload button to actually save it. The latest snapshot is shown in the thumbnail. In Freeze Time mode a preview of the new snapshot is also shown full screen (note that this has NOT the same quality as the real thing that will be saved: it is downscaled from the actual formatted image to a power of two with a max. resolution of 1024x1024, in order to be displayed in openGL and then probably stretched again to fill your screen). Press ESC to go back to Freeze Time." />
<button bottom_delta="0" follows="left|top" height="20" label="Freeze time" left="129"
name="freeze_time_btn" width="80" tool_tip="Freeze time and show a fullscreen preview. Allows to cam around as if time is frozen and make multiple snapshots of the same scene. Press ESC to undo!" />
<button bottom_delta="-22" follows="left|top" height="20" label="Upload" left="10"
name="feed_btn" width="105" />
<button bottom_delta="0" follows="left|top" height="20" label="Send" left="10"
name="send_btn" width="105" />
<button bottom_delta="0" follows="left|top" height="20" label="Save ([UPLOADFEE])" left="10"
<button bottom_delta="0" follows="left|top" height="20" label="Upload ([UPLOADFEE])" left="10"
name="upload_btn" width="105" />
<flyout_button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file"
width="105">
<flyout_button bottom_delta="-2" follows="left|top" height="20" label="Save" left="10"
list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file" width="105">
<flyout_button_item value="save" name="save_item">Save</flyout_button_item>
<flyout_button_item value="saveas" name="saveas_item">Save As...</flyout_button_item>
</flyout_button>
<button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
name="discard_btn" width="85" />
<button bottom="-290" follows="left|top" font="SansSerifSmall" halign="center"
height="20" label="More &gt;&gt;" left="10"
</flyout_button>
<combo_box bottom_delta="-4" follows="left|top" height="20" label="Format" left="139"
name="local_format_combo" width="70">
<combo_item name="PNG">
PNG
</combo_item>
<combo_item name="JPEG">
JPEG
</combo_item>
<combo_item name="BMP">
BMP
</combo_item>
</combo_box>
<button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
height="20" label="Advanced&gt;&gt;" left="10"
mouse_opaque="true" name="more_btn" scale_image="TRUE"
tool_tip="Advanced Options" width="80" />
tool_tip="Advanced Options. Default uses current window size (500x375 for profile feed)." width="72" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
height="20" label="&lt;&lt; Less" left_delta="0"
height="20" label="&lt;&lt;Default" left_delta="0"
mouse_opaque="true" name="less_btn" scale_image="TRUE"
tool_tip="Advanced Options" width="80" />
<text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2"
width="115">
Size
</text>
<text bottom_delta="0" follows="top|left" height="15" left="130" name="format_label"
width="70">
Format
</text>
tool_tip="Advanced Options. Default uses current window size (500x375 for profile feed)." width="72" />
<slider bottom_delta="0" decimal_digits="0" follows="left|top" height="15"
increment="1" initial_val="75" left="80"
max_val="100" min_val="0" name="image_quality_slider" width="150" />
<text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2" width="115">
Target size
</text>
<combo_box bottom_delta="-22" follows="left|top" height="20" label="Resolution" left="10"
name="feed_size_combo" width="125">
<combo_item name="CurrentWindow" value="[i0,i0]">
Current Window
</combo_item>
<combo_item name="500x500" value="[i500,i500]">
500x500 (1:1)
</combo_item>
<combo_item name="500x375" value="[i500,i375]">
500x375 (4:3)
</combo_item>
<combo_item name="500x350" value="[i500,i350]">
500x350 (10:7)
</combo_item>
<combo_item name="500x313" value="[i500,i313]">
500x313 (16:10)
</combo_item>
<combo_item name="500x281" value="[i500,i281]">
500x281 (16:9)
</combo_item>
<combo_item name="500x250" value="[i500,i250]">
500x250 (2:1)
</combo_item>
<combo_item name="Custom" value="[i-1,i-1]">
Custom
</combo_item>
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
name="postcard_size_combo" width="115">
<combo_item name="CurrentWindow" value="[i0,i0]">
Current Window
@@ -60,6 +99,9 @@
<combo_item name="640x480" value="[i640,i480]">
640x480
</combo_item>
<combo_item name="700x525" value="[i700,i525]">
700x525
</combo_item>
<combo_item name="800x600" value="[i800,i600]">
800x600
</combo_item>
@@ -72,20 +114,32 @@
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
name="texture_size_combo" width="115">
<combo_item name="CurrentWindow" value="[i0,i0]">
Current Window
<combo_item name="512x512" value="[i512,i512]">
512x512 (1:1)
</combo_item>
<combo_item name="Small(128x128)" value="[i128,i128]">
Small (128x128)
<combo_item name="256x256" value="[i256,i256]">
256x256 (1:1)
</combo_item>
<combo_item name="Medium(256x256)" value="[i256,i256]">
Medium (256x256)
<combo_item name="128x128" value="[i128,i128]">
128x128 (1:1)
</combo_item>
<combo_item name="Large(512x512)" value="[i512,i512]">
Large (512x512)
<combo_item name="512x256" value="[i512,i256]">
512x256 (2:1)
</combo_item>
<combo_item name="Custom" value="[i-1,i-1]">
Custom
<combo_item name="256x128" value="[i256,i128]">
256x128 (2:1)
</combo_item>
<combo_item name="256x512" value="[i256,i512]">
256x512 (1:2)
</combo_item>
<combo_item name="128x256" value="[i128,i256]">
128x256 (1:2)
</combo_item>
<combo_item name="512x128" value="[i512,i128]">
512x128 (4:1)
</combo_item>
<combo_item name="128x512" value="[i128,i512]">
128x512 (1:4)
</combo_item>
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
@@ -105,45 +159,122 @@
<combo_item name="1024x768" value="[i1024,i768]">
1024x768
</combo_item>
<combo_item name="1280x960" value="[i1280,i960]">
1280x960
</combo_item>
<combo_item name="1280x1024" value="[i1280,i1024]">
1280x1024
</combo_item>
<combo_item name="1600x1200" value="[i1600,i1200]">
1600x1200
</combo_item>
<combo_item name="1680x1050" value="[i1680,i1050]">
1680x1050
</combo_item>
<combo_item name="Custom" value="[i-1,i-1]">
Custom
</combo_item>
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Format" left="130"
name="local_format_combo" width="70">
<combo_item name="PNG">
PNG
</combo_item>
<combo_item name="JPEG">
JPEG
</combo_item>
<combo_item name="BMP">
BMP
</combo_item>
</combo_box>
<spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
increment="32" label="Width" label_width="30" left="10" max_val="6016"
min_val="32" name="snapshot_width" width="95" allow_text_entry="false"/>
<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
increment="32" label="Height" label_width="35" left="110" max_val="6016"
min_val="32" name="snapshot_height" width="95" allow_text_entry="false"/>
<check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
name="keep_aspect_check" />
<slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
increment="1" initial_val="75" label="Image Quality" left="10"
max_val="100" min_val="0" name="image_quality_slider" width="210" />
<text bottom_delta="-28" follows="left|top" height="20" left="10"
<text bottom_delta="-18" follows="top|left" height="15" left="10" name="type_label3"
width="115">
Target aspect ratio
</text>
<combo_box bottom_delta="-22" follows="left|top" height="20" label="Aspect" left="10"
name="feed_aspect_combo" width="115">
<combo_item name="Default" value="-2">
Default
</combo_item>
<combo_item name="Custom" value="-1">
Custom
</combo_item>
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Aspect" left="10"
name="postcard_aspect_combo" width="115">
<combo_item name="Default" value="-2">
Default
</combo_item>
<combo_item name="Custom" value="-1">
Custom
</combo_item>
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Aspect" left="10"
name="texture_aspect_combo" width="115">
<combo_item name="CurrentWindow" value="0">
Current Window
</combo_item>
<combo_item name="1:1" value="1">
1:1
</combo_item>
<combo_item name="4:3" value="1.33333">
4:3 (profile)
</combo_item>
<combo_item name="10:7" value="1.42857">
10:7
</combo_item>
<combo_item name="3:2" value="1.5">
3:2
</combo_item>
<combo_item name="16:10" value="1.6">
16:10
</combo_item>
<combo_item name="16:9" value="1.77778">
16:9
</combo_item>
<combo_item name="2:1" value="2">
2:1
</combo_item>
<combo_item name="Custom" value="-1">
Custom
</combo_item>
</combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Aspect" left="10"
name="local_aspect_combo" width="115">
<combo_item name="Default" value="-2">
Default
</combo_item>
<combo_item name="CurrentWindow" value="0">
Current Window
</combo_item>
<combo_item name="1:1" value="1">
1:1
</combo_item>
<combo_item name="4:3" value="1.33333">
4:3 (profile)
</combo_item>
<combo_item name="10:7" value="1.42857">
10:7
</combo_item>
<combo_item name="3:2" value="1.5">
3:2
</combo_item>
<combo_item name="16:10" value="1.6">
16:10
</combo_item>
<combo_item name="16:9" value="1.77778">
16:9
</combo_item>
<combo_item name="2:1" value="2">
2:1
</combo_item>
<combo_item name="Custom" value="-1">
Custom
</combo_item>
</combo_box>
<spinner bottom_delta="0" decimal_digits="5" follows="left|top" height="20"
increment="0.01" label="" left="130" max_val="32"
min_val="0.03125" name="aspect_ratio" width="64" allow_text_entry="false"/>
<text bottom_delta="-10" height="20" left="196" name="aspect_one_label">:1</text>
<text bottom_delta="-20" follows="left|top" height="20" left="15"
name="layer_type_label" width="50">
Capture:
</text>
<combo_box bottom_delta="3" follows="left|top" height="20" label="Image Layers" left="60"
<combo_box bottom_delta="3" follows="left|top" height="20" label="Image Layers" left="61"
name="layer_types" width="145">
<combo_item name="Colors" value="colors">
Colors
@@ -152,19 +283,19 @@
Depth
</combo_item>
</combo_box>
<check_box bottom_delta="-20" follows="left|top" label="Show interface in snapshot"
left="10" name="ui_check" />
<check_box bottom_delta="-18" follows="left|top" label="Show interface in snapshot"
left="10" name="ui_check" tool_tip="Show the UI in the snapshot. This enforces the resolution of the snapshot to that of your current window." />
<check_box bottom_delta="-20" follows="left|top" label="Show HUD objects in snapshot"
left="10" name="hud_check" />
left="10" name="hud_check" tool_tip="Show your HUD objects in the snapshot. This enforces the resolution of the snapshot to that of your current window." />
<check_box bottom_delta="-20" follows="left|top" label="Keep open after saving" left="10"
name="keep_open_check" />
<check_box bottom_delta="-20" follows="left|top" label="Freeze frame (fullscreen preview)"
left="10" name="freeze_frame_check" />
name="keep_open_check" tool_tip="Do not close the snapshot floater after saving or uploading. This allows you to save, upload or send the SAME snapshot again with different formats and/or to a different destination." />
<check_box bottom_delta="-20" follows="left|top" label="Open floater in Freeze Time mode"
left="10" name="freeze_time_check" tool_tip="This allows one to quickly press cntrl-shift-S and then take your time to choose the camera position and even make multiple shots of the frozen scene." />
<check_box bottom_delta="-20" follows="left|top" label="Auto-refresh" left="10"
name="auto_snapshot_check" />
name="auto_snapshot_check" tool_tip="Handy in conjunction with Freeze Time: creates a new fullscreen preview whenever you stop camming." />
<check_box bottom_delta="-20" follows="left|top" control_name="TemporaryUpload" enabled="true"
initial_value="false" label="Temporary Image (Free)" left="10"
name="temp_check" tooltip="Sets the asset to be temporary, meaning it's free, but in return, only good for a short time before it ceases to exist." />
name="temp_check" tool_tip="Uploads the texture to the sim instead of the asset server, meaning it's free but only visible in the current sim and deleted when you leave the sim." />
<string name="unknown">
unknown
</string>

49
indra/newview/skins/default/xui/en-us/floater_snapshot_feed.xml Normal file
View File

@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_minimize="false"
title="Post to My Profile Feed"
height="380"
width="370"
layout="topleft"
name="floater_snapshot_profile"
rect_control="FloaterSnapshotFeedRect">
<text_editor
follows="bottom|left"
bottom="40"
hide_scrollbar="true"
length="1"
max_length="700"
name="caption"
top="-180"
left="10"
right="-10"
type="string"
word_wrap="true"/>
<check_box
follows="left|bottom"
initial_value="true"
label="Include location"
layout="topleft"
left_delta="0"
name="add_location_cb"
control_name="SnapshotFeedAddLocation"
bottom_delta="-25" />
<button
follows="right|bottom"
height="23"
label="Cancel"
layout="topleft"
name="cancel_btn"
right="-10"
bottom="10"
width="100"/>
<button
follows="right|bottom"
height="23"
label="Post"
layout="topleft"
left_delta="-106"
name="post_btn"
bottom_delta="0"
width="100"/>
</floater>

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

@@ -264,6 +264,22 @@ An error occurred while updating [APP_NAME]. Please download the latest version
yestext="Ok"/>
</notification>
<notification
icon="alertmodal.tga"
name="EmptyFirstNameMessage"
type="alertmodal">
[GRIDNAME] requires a non-empty first name to login.
Please try again.
</notification>
<notification
icon="alertmodal.tga"
name="EmptyLastNameMessage"
type="alertmodal">
[GRIDNAME] requires a non-empty last name to login.
Please try again.
</notification>
<notification
icon="alertmodal.tga"
name="LoginFailedNoNetwork"
@@ -309,9 +325,9 @@ You don't have permission to copy one or more of these items to the Merchant Out
</notification>
<notification
icon="OutboxStatus_Success"
icon="alert.tga"
name="OutboxFolderCreated"
type="outbox">
type="alert">
<unique/>
A new folder has been created for each item you have transferred into the top level of your Merchant Outbox.
@@ -322,9 +338,9 @@ A new folder has been created for each item you have transferred into the top le
</notification>
<notification
icon="OutboxStatus_Success"
icon="alert.tga"
name="OutboxImportComplete"
type="outbox">
type="alert">
Success
All folders were successfully sent to the Marketplace.
@@ -336,9 +352,9 @@ All folders were successfully sent to the Marketplace.
</notification>
<notification
icon="OutboxStatus_Warning"
icon="alert.tga"
name="OutboxImportHadErrors"
type="outbox">
type="alert">
Some folders did not transfer
Errors occurred when some folders were sent to the Marketplace. Those folders are still in your Merchant Outbox.
@@ -351,9 +367,9 @@ See the [[MARKETPLACE_IMPORTS_URL] error log] for more information.
</notification>
<notification
icon="OutboxStatus_Error"
icon="alertmodal.tga"
name="OutboxImportFailed"
type="outbox">
type="alertmodal">
Transfer failed
No folders were sent to the Marketplace because of a system or network error. Try again later.
@@ -364,9 +380,9 @@ No folders were sent to the Marketplace because of a system or network error. T
</notification>
<notification
icon="OutboxStatus_Error"
icon="alertmodal.tga"
name="OutboxInitFailed"
type="outbox">
type="alertmodal">
Marketplace initialization failed
Initialization with the Marketplace failed because of a system or network error. Try again later.
@@ -405,6 +421,13 @@ There was a problem writing animation data. Please try again later.
There was a problem uploading the auction snapshot due to the following reason: [REASON]
</notification>
<notification
icon="alertmodal.tga"
name="UploadSnapshotFail"
type="alertmodal">
There was a problem uploading the snapshot due to the following reason: [REASON]
</notification>
<notification
icon="alertmodal.tga"
name="UnableToViewContentsMoreThanOne"
@@ -937,6 +960,14 @@ Error processing snapshot data
Error encoding snapshot.
</notification>
<notification
icon="alertmodal.tga"
name="ErrorSizeAspectSnapshot"
type="alertmodal">
It is not possible to make a snapshot with this size and aspect.
Try a smaller size or a less stretched aspect.
</notification>
<notification
icon="alertmodal.tga"
name="ErrorUploadingPostcard"

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

@@ -196,6 +196,7 @@
<string name="AvatarAway">Away</string>
<string name="AvatarBusy">Busy</string>
<string name="AvatarMuted">Muted</string>
<string name="AvatarLangolier">Langolier</string>
<!-- animations -->
<string name="anim_express_afraid">Afraid</string>

10
indra/newview/skins/default/xui/es/notifications.xml
View File

@@ -163,14 +163,14 @@ Asegurate que tu conexión a internet funciona correctamente.
<usetemplate name="okcancelbuttons" notext="No mover ítem(s)" yestext="Mover ítem(s)"/>
</notification>
<notification name="OutboxFolderCreated" type="outbox">
<notification name="OutboxFolderCreated" type="alert">
<unique/>
Una nueva carpeta ha sido creada por cada ítem que has transferido en el nivel superior de tu Merchant Outbox.
<usetemplate ignoretext="Una nueva carpeta ha sido creada en el Merchant Outbox" name="okignore" yestext="OK"/>
</notification>
<notification name="OutboxImportComplete" type="outbox">
<notification name="OutboxImportComplete" type="alert">
Completado
Todas las carpetas ha sido enviadas satisfactoriamente al Marketplace.
@@ -178,7 +178,7 @@ Todas las carpetas ha sido enviadas satisfactoriamente al Marketplace.
<usetemplate ignoretext="Todas las carpetas se han enviado al Marketplace" name="okignore" yestext="OK"/>
</notification>
<notification name="OutboxImportHadErrors" type="outbox">
<notification name="OutboxImportHadErrors" type="alert">
Algunas carpetas no fueron transferidas
Ha habido errores al enviar algunas carpetas al Markeplace. Estas carpetas aún están en tu Merchant Outbox.
@@ -188,7 +188,7 @@ Mira en el [log de errores [[MARKETPLACE_IMPORTS_URL]] para mayor información.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="OutboxImportFailed" type="outbox">
<notification name="OutboxImportFailed" type="alertmodal">
La transferencia ha fallado
No se han enviado carpetas al Marketplace debido a un error de sistema o de red. Inténtalo nuevamente más tarde.
@@ -196,7 +196,7 @@ No se han enviado carpetas al Marketplace debido a un error de sistema o de red.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="OutboxInitFailed" type="outbox">
<notification name="OutboxInitFailed" type="alertmodal">
Ha fallado la inicialización del Marketplace
La inicialización con el Marketplace ha fallado debido a un error de sistema o de red. Inténtalo nuevamente más tarde.