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

Merge branch 'master' of https://github.com/LightDrake/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2013-07-16 09:50:58 -04:00
parent 824bec5d69 a9d23a049c
commit f9304faaec
50 changed files with 2413 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1435,10 +1435,12 @@ one from scratch and wear it.
</text>
<button name="Import" label="Import"
bottom="-486" left="10" height="20" width="70"
follows="left|bottom" font="SansSerif" halign="center" />
follows="left|bottom" font="SansSerif" halign="center"
tool_tip="Import to currently selected wearable; current wearable must be modifiable" />
<button name="Export" label="Export"
bottom="-506" left="10" height="20" width="70"
follows="left|bottom" font="SansSerif" halign="center" />
follows="left|bottom" font="SansSerif" halign="center"
tool_tip="Export currently selected wearable; asset must be copy/mod/trans and you need to be the creator" />
<button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="Cancel" label_selected="Cancel" mouse_opaque="true"
name="Cancel" right="-10" scale_image="true" width="100" />

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

@@ -107,6 +107,9 @@
<menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
<on_click function="Avatar.CopyUUID" />
</menu_item_call>
<menu_item_call label="Save OBJ..." mouse_opaque="true" name="Save OBJ...">
<on_click function="Avatar.SaveAsOBJ" />
</menu_item_call>
</pie_menu>
<menu_item_call enabled="true" label="Stand Up" name="Stand Up Self">
<on_click function="Self.SitOrStand"/>
@@ -119,7 +122,4 @@
<on_click function="ShowFloater" userdata="appearance" />
<on_enable function="Edit.EnableCustomizeAvatar" />
</menu_item_call>
<menu_item_call label="Save OBJ..." mouse_opaque="true" name="Save OBJ...">
<on_click function="Avatar.SaveAsOBJ" />
</menu_item_call>
</pie_menu>

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

@@ -9638,10 +9638,16 @@ Would you like to enable announcing keys to objects in the sim?
</notification>
<notification
icon="notify.tga"
icon="alertmodal.tga"
name="WavefrontExportPartial"
type="notify">
Unable to include [OBJECT] in export, insufficient permissions.
type="alertmodal">
Unable to include [FAILED] out of [TOTAL] objects in export due to insufficient permissions.
Do you wish to export anyway?
<usetemplate
name="okcancelbuttons"
yestext="Proceed"
notext="Cancel" />
</notification>
<notification

13
indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
View File

@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" height="408" label="Audio &amp; Video" left="102" name="Media panel" width="517">
<text bottom="-22" height="12" left="10" name="muting_text">Volume:</text>
<text bottom="-215" name="streaming_prefs_text">Streaming Preferences:</text>
<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
<panel border="true" bottom="-200" filename="panel_audio.xml" height="165" label="Volume" left="142" name="Volume Panel" width="260"/>
<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
<text bottom="-190" name="streaming_prefs_text">Streaming Preferences:</text>
<text bottom="-295" height="12" name="audio_prefs_text">Audio Preferences:</text>
<panel border="true" bottom="-172" filename="panel_audio.xml" height="165" label="Volume" left="142" name="Volume Panel" width="260"/>
<check_box bottom="-195" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" left="142" name="media_filter_enable"/>
<check_box bottom_delta="-20" control_name="AudioStreamingMusic" follows="top" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" name="streaming_music"/>
<check_box bottom_delta="-20" control_name="AudioStreamingMedia" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>
<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" name="streaming_video"/>
<check_box bottom_delta="-20" control_name="PrimMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play prim media" left="162" name="auto_prim_streaming_video"/>
<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play parcel media" left="162" name="auto_streaming_video"/>
<check_box bottom_delta="-25" control_name="MuteWhenMinimized" follows="top" height="16" initial_value="true" label="Mute Audio When Window Minimized" left="142" name="mute_when_minimized"/>
<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="130" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="300" />
<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor (Default)" label_width="130" max_val="2" min_val="0" name="Rolloff Factor" width="300"/>