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

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.

indra/newview/app_settings/settings.xml

@@ -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>