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

indra/newview/app_settings/high_graphics.xml

@@ -36,4 +36,5 @@
 	<VertexShaderEnable value="TRUE"/>
 	<!--NO SHADERS-->
 	<WindLightUseAtmosShaders value="TRUE"/>
+  <RenderAvatarVP value="TRUE"/>
 </settings>

indra/newview/app_settings/low_graphics.xml

@@ -36,4 +36,5 @@
 	<VertexShaderEnable value="FALSE"/>
 	<!--NO SHADERS-->
 	<WindLightUseAtmosShaders value="FALSE"/>
+  <RenderAvatarVP value="FALSE"/>
 </settings>

indra/newview/app_settings/mid_graphics.xml

@@ -36,4 +36,5 @@
 	<VertexShaderEnable value="TRUE"/>
 	<!--NO SHADERS-->
 	<WindLightUseAtmosShaders value="FALSE"/>
+  <RenderAvatarVP value="TRUE"/>
 </settings>

indra/newview/app_settings/settings.xml

@@ -8145,6 +8145,17 @@
       <key>Value</key>
       <integer>512</integer>
     </map>
+    <key>MemProfiling</key>
+    <map>
+      <key>Comment</key>
+      <string>You want to use tcmalloc's memory profiling options.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>  
     <key>MenuAccessKeyTime</key>
     <map>
       <key>Comment</key>
@@ -11470,17 +11481,6 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>1</integer>
-    </map>
-  <key>RenderUseStreamVBO</key>
-  <map>
-    <key>Comment</key>
-    <string>Use VBO's for stream buffers</string>
-    <key>Persist</key>
-    <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
     </map>
 	<key>RenderPreferStreamDraw</key>
 	<map>

indra/newview/app_settings/ultra_graphics.xml

@@ -36,4 +36,5 @@
 	<VertexShaderEnable value="TRUE"/>
 	<!--NO SHADERS-->
 	<WindLightUseAtmosShaders value="TRUE"/>
+  <RenderAvatarVP value="TRUE"/>
 </settings>