Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Frosting

Conflicts:
	indra/newview/llviewerwindow.cpp

indra/newview/app_settings/settings_per_account.xml

@@ -314,6 +314,17 @@
 			<key>Value</key>
 			<integer>0</integer>
 		</map>
+    <key>EveryoneExport</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether content you upload has exportability permission by default</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>RLVaLoginLastLocation</key>
     <map>
       <key>Comment</key>

indra/newview/app_settings/settings_sh.xml

@@ -218,7 +218,7 @@
       <key>Value</key>
       <real>1</real>
     </map>
-	<key>SHAlphaMaskMaxRMSE</key>
+	<key>SHAutoMaskMaxRMSE</key>
     <map>
       <key>Comment</key>
       <string>Sets the maximum random mean square error cutoff used when detecting suitable textures for alphamasking. (SHUseRMSEAutoMask must be TRUE for this to have any effect)</string>