merge changes for storm-1273

doc/contributions.txt

@@ -442,6 +442,7 @@ Jonathan Yap
 	STORM-1095
 	STORM-1236
 	STORM-1259
+	STORM-1273
 Kage Pixel
 	VWR-11
 Ken March

indra/newview/app_settings/settings.xml

@@ -3256,17 +3256,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>FirstLoginThisInstall</key>
-    <map>
-      <key>Comment</key>
-      <string>Specifies that you have not successfully logged in since you installed the latest update</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>FirstName</key>
     <map>
       <key>Comment</key>
@@ -8868,17 +8857,6 @@
       <integer>0</integer>
     </map>
   <key>RenderUseTriStrips</key>
-  <map>
-    <key>Comment</key>
-    <string>Use triangle strips for rendering prims.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <key>RenderUseTriStrips</key>
   <map>
     <key>Comment</key>
     <string>Use triangle strips for rendering prims.</string>