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

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

Browse Source
This commit is contained in:
TighMacFanatic
2011-05-14 14:21:17 -04:00
parent 3a60326ad5 32594cd651
commit 9f3c4c1021
225 changed files with 2518 additions and 2572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/skins/default/textures/textures.xml
View File

@@ -389,5 +389,6 @@
<texture name="media_btn_scrollup.png"/>
<texture name="media_btn_stoploading.png"/>
<texture name="media_panel_divider.png"/>
<texture name="media_panel_scrollbg.png"/>
</textures>

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

@@ -69,6 +69,19 @@
mouse_opaque="true" name="vbo_stream" radio_style="false"
tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."
width="315" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12"
left="10" mouse_opaque="true" name="Enable FBO:" v_pad="0"
width="140">
Enable Framebuffer Objects:
</text>
<check_box bottom_delta="-5" control_name="RenderUseFBO" enabled="false" follows="left|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Enable OpenGL Frame Buffer Objects" left="148"
mouse_opaque="true" name="fbo" radio_style="false"
tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."
width="315" />
<slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory"
decimal_digits="0" enabled="true"
follows="left|top" height="16" increment="16"

478
indra/newview/skins/default/xui/en-us/mime_types.xml
View File

@@ -1,478 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<mimetypes name="default">
<defaultlabel>
(Unknown)
</defaultlabel>
<defaultwidget>
none
</defaultwidget>
<defaultimpl>
media_plugin_webkit
</defaultimpl>
<widgetset name="web">
<label name="web_label">
Web Content
</label>
<icon>
icn_media_web.tga
</icon>
<default_type>
text/html
</default_type>
<tooltip name="web_tooltip">
This location has Web content
</tooltip>
<playtip name="web_playtip">
Show Web content
</playtip>
<allow_resize>
true
</allow_resize>
<allow_looping>
false
</allow_looping>
</widgetset>
<widgetset name="movie">
<label name="movie_label">
Movie
</label>
<default_type>
video/*
</default_type>
<icon>
icn_media_movie.tga
</icon>
<tooltip name="movie_tooltip">
There is a movie to play here
</tooltip>
<playtip name="movie_playtip">
Play movie
</playtip>
<allow_resize>
false
</allow_resize>
<allow_looping>
true
</allow_looping>
</widgetset>
<widgetset name="image">
<label name="image_label">
Image
</label>
<icon>
icn_media_web.tga
</icon>
<default_type>
image/*
</default_type>
<tooltip name="image_tooltip">
There is an image at this location
</tooltip>
<playtip name="image_playtip">
View this location&apos;s image
</playtip>
<allow_resize>
false
</allow_resize>
<allow_looping>
false
</allow_looping>
</widgetset>
<widgetset name="audio">
<label name="audio_label">
Audio
</label>
<icon>
icn_media_web.tga
</icon>
<default_type>
audio/*
</default_type>
<tooltip name="audio_tooltip">
There is audio at this location
</tooltip>
<playtip name="audio_playtip">
Play this location&apos;s audio
</playtip>
<allow_resize>
false
</allow_resize>
<allow_looping>
true
</allow_looping>
</widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Real Time Streaming
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</scheme>
<mimetype name="blank">
<label name="blank_label">
- None -
</label>
<widgettype>
none
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="none/none">
<label name="none/none_label">
- None -
</label>
<widgettype>
none
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="audio/*">
<label name="audio2_label">
Audio
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/*">
<label name="video2_label">
Video
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="image/*">
<label name="image2_label">
Image
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
<label name="vnd.secondlife.qt.legacy_label">
Movie (QuickTime)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="application/javascript">
<label name="application/javascript_label">
Javascript
</label>
<widgettype>
web
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/ogg">
<label name="application/ogg_label">
Ogg Audio/Video
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="application/pdf">
<label name="application/pdf_label">
PDF Document
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/postscript">
<label name="application/postscript_label">
Postscript Document
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/rtf">
<label name="application/rtf_label">
Rich Text (RTF)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/smil">
<label name="application/smil_label">
Synchronized Multimedia Integration Language (SMIL)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/xhtml+xml">
<label name="application/xhtml+xml_label">
Web Page (XHTML)
</label>
<widgettype>
web
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/x-director">
<label name="application/x-director_label">
Macromedia Director
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="audio/mpeg">
<label name="audio/mpeg_label">
Audio (MP3)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="audio/x-aiff">
<label name="audio/x-aiff_label">
Audio (AIFF)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="audio/x-wav">
<label name="audio/x-wav_label">
Audio (WAV)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="image/bmp">
<label name="image/bmp_label">
Image (BMP)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/gif">
<label name="image/gif_label">
Image (GIF)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/jpeg">
<label name="image/jpeg_label">
Image (JPEG)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/png">
<label name="image/png_label">
Image (PNG)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="image/svg+xml">
<label name="image/svg+xml_label">
Image (SVG)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/tiff">
<label name="image/tiff_label">
Image (TIFF)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="text/html">
<label name="text/html_label">
Web Page
</label>
<widgettype>
web
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="text/plain">
<label name="text/plain_label">
Text
</label>
<widgettype>
text
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="text/xml">
<label name="text/xml_label">
XML
</label>
<widgettype>
text
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="video/mpeg">
<label name="video/mpeg_label">
Movie (MPEG)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/mp4">
<label name="video/mp4_label">
Movie (MP4)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="video/quicktime">
<label name="video/quicktime_label">
Movie (QuickTime)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/x-ms-asf">
<label name="video/x-ms-asf_label">
Movie (Windows Media ASF)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/x-ms-wmv">
<label name="video/x-ms-wmv_label">
Movie (Windows Media WMV)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="video/x-msvideo">
<label name="video/x-msvideo_label">
Movie (AVI)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
</mimetypes>

34
indra/newview/skins/default/xui/en-us/mime_types_linux.xml
View File

@@ -175,8 +175,8 @@
movie
</widgettype>
<impl>
media_plugin_gstreamer
</impl>
media_plugin_gstreamer
</impl>
</mimetype>
<mimetype name="application/javascript">
<label name="application/javascript_label">
@@ -235,7 +235,7 @@
</mimetype>
<mimetype name="application/smil">
<label name="application/smil_label">
Synchronized Multimedia Integration Language (SMIL)
Synchronized Multimedia Integration Language (SMIL)
</label>
<widgettype>
movie
@@ -384,8 +384,8 @@
web
</widgettype>
<impl>
media_plugin_webkit
</impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="text/plain">
<label name="text/plain_label">
@@ -417,8 +417,8 @@
movie
</widgettype>
<impl>
media_plugin_gstreamer
</impl>
media_plugin_gstreamer
</impl>
</mimetype>
<mimetype name="video/mp4">
<label name="video/mp4_label">
@@ -428,8 +428,8 @@
movie
</widgettype>
<impl>
media_plugin_gstreamer
</impl>
media_plugin_gstreamer
</impl>
</mimetype>
<mimetype menu="1" name="video/quicktime">
<label name="video/quicktime_label">
@@ -439,8 +439,8 @@
movie
</widgettype>
<impl>
media_plugin_gstreamer
</impl>
media_plugin_gstreamer
</impl>
</mimetype>
<mimetype name="video/x-ms-asf">
<label name="video/x-ms-asf_label">
@@ -450,8 +450,8 @@
movie
</widgettype>
<impl>
media_plugin_gstreamer
</impl>
media_plugin_gstreamer
</impl>
</mimetype>
<mimetype name="video/x-ms-wmv">
<label name="video/x-ms-wmv_label">
@@ -461,8 +461,8 @@
movie
</widgettype>
<impl>
media_plugin_gstreamer
</impl>
media_plugin_gstreamer
</impl>
</mimetype>
<mimetype menu="1" name="video/x-msvideo">
<label name="video/x-msvideo_label">
@@ -472,7 +472,7 @@
movie
</widgettype>
<impl>
media_plugin_gstreamer
</impl>
media_plugin_gstreamer
</impl>
</mimetype>
</mimetypes>

34
indra/newview/skins/default/xui/en-us/mime_types_mac.xml
View File

@@ -175,8 +175,8 @@
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="application/javascript">
<label name="application/javascript_label">
@@ -235,7 +235,7 @@
</mimetype>
<mimetype name="application/smil">
<label name="application/smil_label">
Synchronized Multimedia Integration Language (SMIL)
Synchronized Multimedia Integration Language (SMIL)
</label>
<widgettype>
movie
@@ -384,8 +384,8 @@
web
</widgettype>
<impl>
media_plugin_webkit
</impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="text/plain">
<label name="text/plain_label">
@@ -417,8 +417,8 @@
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/mp4">
<label name="video/mp4_label">
@@ -428,8 +428,8 @@
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="video/quicktime">
<label name="video/quicktime_label">
@@ -439,8 +439,8 @@
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/x-ms-asf">
<label name="video/x-ms-asf_label">
@@ -450,8 +450,8 @@
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/x-ms-wmv">
<label name="video/x-ms-wmv_label">
@@ -461,8 +461,8 @@
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="video/x-msvideo">
<label name="video/x-msvideo_label">
@@ -472,7 +472,7 @@
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
media_plugin_quicktime
</impl>
</mimetype>
</mimetypes>

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
height="408" label="Graphics" left="102" mouse_opaque="true"
<panel border="true" bottom="-439" enabled="true" follows="left|top|right|bottom"
height="438" label="Graphics" left="102" mouse_opaque="true"
name="Display panel" width="517">
<button bottom="-22" follows="left|top" font="SansSerif" height="18" label="?"
left="470" name="GraphicsPreferencesHelpButton" width="22" />
@@ -24,11 +24,8 @@
<combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
height="18" left="185" max_chars="20" mouse_opaque="true"
name="windowsize combo" width="150">
<combo_item type="string" length="1" enabled="true" name="640x480" value="640 x 480">
640x480
</combo_item>
<combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
800x600
800x600
</combo_item>
<combo_item type="string" length="1" enabled="true" name="720x480" value="720 x 480">
720x480 (NTSC)
@@ -39,7 +36,16 @@
<combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
1024x768
</combo_item>
<combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720">
1280x720 (HDV720)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080">
1440x1080 (HDV1080)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080">
1920x1080 (HD1080)
</combo_item>
</combo_box>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -67,10 +73,10 @@
5:4 (1280x1024 LCD)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="8:5(Widescreen)" value="1.6">
8:5 (Widescreen)
16:10 (Widescreen PC)
</combo_item>
<combo_item type="string" length="1" enabled="true" name="16:9(Widescreen)" value="1.7777777">
16:9 (Widescreen)
16:9 (Widescreen TV)
</combo_item>
</combo_box>
<check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
@@ -157,8 +163,8 @@
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Custom" left="385" mouse_opaque="true"
name="CustomSettings" radio_style="false" width="256" />
<view_border bevel_style="none" border_thickness="1" bottom="-375" follows="top|left"
height="260" left="5" name="GraphicsBorder" width="485" />
<view_border bevel_style="none" border_thickness="1" bottom="-405" follows="top|left"
height="290" left="5" name="GraphicsBorder" width="485" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12"
@@ -180,18 +186,45 @@
initial_value="true" label="Atmospheric Shaders" left_delta="0"
mouse_opaque="true" name="WindLightUseAtmosShaders" radio_style="false"
width="256" />
<check_box bottom_delta="-17" control_name="RenderDeferred" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Deferred Shading" left_delta="0"
mouse_opaque="true" name="RenderDeferred" radio_style="false"
width="256" />
<check_box bottom_delta="-17" control_name="RenderDeferredSunShadow" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Primary Shadows" left_delta="0"
mouse_opaque="true" name="RenderDeferredSunShadow" radio_style="false"
width="256" />
<check_box bottom_delta="-17" control_name="RenderWaterReflections" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Water Reflections" left_delta="0"
mouse_opaque="true" name="Reflections" radio_style="false" width="256" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-223" drop_shadow_visible="true" enabled="true" follows="left|top"
bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12"
left="10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
width="128">
Reflection Detail:
</text>
<radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
<combo_box bottom_delta="-20" control_name="RenderReflectionDetail" enabled = "true" follows="left|top" label="Reflection Detail"
left_delta="-2" mouse_opaque="true" name="ReflectionDetailCombo" width="160" height="16">
<combo_item type="string" length="1" name="0" value="0">
Terrain and Trees
</combo_item>
<combo_item type="string" length="1" name="1" value="1">
All Static Objects
</combo_item>
<combo_item type="string" length="1" name="2" value="2">
All Avatars and Objects
</combo_item>
<combo_item type="string" length="1" name="3" value="3">
Everything
</combo_item>
</combo_box>
<!--radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
enabled="true" follows="left|top" height="70"
left_delta="-2" mouse_opaque="true" name="ReflectionDetailRadio"
width="321">
@@ -211,7 +244,7 @@
left="3" mouse_opaque="true" name="3" width="315">
Everything
</radio_item>
</radio_group>
</radio_group-->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-313" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
@@ -382,10 +415,10 @@
High
</radio_item>
</radio_group>
<button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
<button bottom="-430" enabled="true" font="SansSerif" halign="center" height="20"
label="Recommended Settings" left="130" mouse_opaque="true"
name="Defaults" scale_image="true" width="170" />
<button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
<button bottom="-430" enabled="true" font="SansSerif" halign="center" height="20"
label="Hardware Options" label_selected="Hardware Options"
left="310" mouse_opaque="true" name="GraphicsHardwareButton"
scale_image="true" width="170" />