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

Merge branch 'meshupload' of git://github.com/AlericInglewood/SingularityViewer into meshup

Browse Source
This commit is contained in:
Siana Gearz
2013-01-13 20:10:25 +01:00
parent 5b0597ea47 f606477ae5
commit 188e42ee4a
75 changed files with 1218 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,22 +69,22 @@
<combo_item name="CurrentWindow" value="[i0,i0]">
Current Window
</combo_item>
<combo_item name="500x500" value="[i500,i500]">
<combo_item name="500x500" value="[i630,i-2]">
500x500 (1:1)
</combo_item>
<combo_item name="500x375" value="[i500,i375]">
<combo_item name="500x375" value="[i840,i-2]">
500x375 (4:3)
</combo_item>
<combo_item name="500x350" value="[i500,i350]">
<combo_item name="500x350" value="[i900,i-2]">
500x350 (10:7)
</combo_item>
<combo_item name="500x313" value="[i500,i313]">
<combo_item name="500x313" value="[i1008,i-2]">
500x313 (16:10)
</combo_item>
<combo_item name="500x281" value="[i500,i281]">
<combo_item name="500x281" value="[i1120,i-2]">
500x281 (16:9)
</combo_item>
<combo_item name="500x250" value="[i500,i250]">
<combo_item name="500x250" value="[i1260,i-2]">
500x250 (2:1)
</combo_item>
<combo_item name="Custom" value="[i-1,i-1]">

7
indra/newview/skins/default/xui/en-us/floater_snapshot_feed.xml
View File

@@ -18,7 +18,9 @@
left="10"
right="-10"
type="string"
word_wrap="true"/>
word_wrap="true">
Type your message here.
</text_editor>
<check_box
follows="left|bottom"
initial_value="true"
@@ -46,6 +48,9 @@
name="post_btn"
bottom_delta="0"
width="100"/>
<string name="default_message">
Click on the 'snapshot' link above to see the larger original.
</string>
<string name="upload_message">
"Uploading..."
</string>