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 
Resolved Conflicts:
	indra/newview/llviewermedia.cpp
	indra/plugins/base_media/CMakeLists.txt

Trivial fix for indra/newview/llviewermedia.cpp.
Moved 'prepare' dependency from base_media to
base_basic because media already depends on basic.
This commit is contained in:
Aleric Inglewood
2011-05-10 04:46:58 +02:00
parent e0b0fa4f58 8227efcaf1
commit 133391be90
54 changed files with 427 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
indra/newview/app_settings/mime_types.xml
View File

@@ -120,7 +120,7 @@
none
</widgettype>
<impl>
media_plugin_quicktime
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="none/none">
@@ -130,6 +130,9 @@
<widgettype>
none
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="audio/*">
<label name="audio2_label">
@@ -138,6 +141,9 @@
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/*">
<label name="video2_label">
@@ -146,6 +152,9 @@
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="image/*">
<label name="image2_label">
@@ -154,6 +163,9 @@
<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">
@@ -173,6 +185,9 @@
<widgettype>
web
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/ogg">
<label name="application/ogg_label">
@@ -181,6 +196,9 @@
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="application/pdf">
<label name="application/pdf_label">
@@ -189,6 +207,9 @@
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/postscript">
<label name="application/postscript_label">
@@ -197,6 +218,9 @@
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/rtf">
<label name="application/rtf_label">
@@ -205,6 +229,9 @@
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/smil">
<label name="application/smil_label">
@@ -214,7 +241,7 @@
movie
</widgettype>
<impl>
media_plugin_quicktime
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/xhtml+xml">
@@ -224,6 +251,9 @@
<widgettype>
web
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="application/x-director">
<label name="application/x-director_label">
@@ -232,6 +262,9 @@
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">

11
indra/newview/app_settings/settings.xml
View File

@@ -13718,6 +13718,17 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>WarnFirstPhysicsWearable</key>
<map>
<key>Comment</key>
<string>Enables Physics Wearable warning dialog</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>WatchdogEnabled</key>
<map>
<key>Comment</key>

2
indra/newview/app_settings/settings_sh.xml
View File

@@ -89,7 +89,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>SGBlockCardSpam</key>
<map>