Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp

indra/newview/app_settings/settings.xml

@@ -682,6 +682,18 @@
       <key>Value</key>
       <integer>0</integer>
 	</map>
+    <key>LiruSensibleARC</key>
+    <map>
+      <key>Comment</key>
+	  <string>Use the old-style way to calculate Avatar Render Cost.
+Found in Advanced->Rendering->Info Displays</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+	</map>
     <key>ResetFocusOnSelfClick</key>
 		<map>
 		<key>Comment</key>