Merge branch 'V2Mesh' of git://github.com/Shyotl/SingularityViewer into future

Conflicts:
	indra/newview/lltexturefetch.cpp

indra/newview/app_settings/settings.xml

@@ -475,7 +475,21 @@
       <key>Value</key>
       <integer>0</integer>
   </map>
-  <key>ResetFocusOnSelfClick</key>
+    <key>ShyotlRenderVBOStrideMode</key>
+    <map>
+      <key>Comment</key>
+      <string>0 = Standard behavior
+1 = Force strided VBOs
+2 = Force unstrided(dense) VBOs</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+
+    <key>ResetFocusOnSelfClick</key>
 		<map>
 		<key>Comment</key>
 		<string>Setting this to TRUE resets your camera when you left-click your avatar</string>
@@ -3758,10 +3772,21 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+  <key>CurlUseMultipleThreads</key>
+  <map>
+    <key>Comment</key>
+    <string>Use background threads for executing curl_multi_perform (requires restart)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
     <key>Cursor3D</key>
     <map>
       <key>Comment</key>
-      <string>Tread Joystick values as absolute positions (not deltas).</string>
+      <string>Treat Joystick values as absolute positions (not deltas).</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>