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

Conflicts:
	indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings.xml

@@ -9,7 +9,6 @@
 		<string>settings_rlv.xml</string>
 	</array>
 
-
     <key>SpellDownloadURL</key>
     <map>
       <key>Comment</key>
@@ -55,6 +54,17 @@
 		<string>English (United States of America)</string>
 	</map>
 
+  <key>ScriptsCanShowUI</key>
+    <map>
+      <key>Comment</key>
+      <string>Allow LSL calls (such as LLMapDestination) to spawn viewer UI</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+  </map>
     <key>FloaterObjectBackuptRect</key>
     <map>
       <key>Comment</key>