diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-15 11:55:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-15 11:55:12 -0400 |
| commit | b6e69570dc69b6e4f2a6e9362510d5ff3cd169e5 (patch) | |
| tree | 2f138fffb3daae7969eaf81768c4a42399c25a92 | |
| parent | ee904d38ff3c9494d47602d523a501097caca3c9 (diff) | |
| parent | 9ecc872b731b5863f320446089bc5679832b0890 (diff) | |
merge changes for storm-1273
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
2 files changed, 1 insertions, 22 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index daaffe2dee..b3ec6413ba 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -442,6 +442,7 @@ Jonathan Yap STORM-1095 STORM-1236 STORM-1259 + STORM-1273 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9161519a10..6074a86d88 100644 --- a/indra/newview/app_settings/settings.xml +++ b/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> @@ -8878,17 +8867,6 @@ <key>Value</key> <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>RenderUseFarClip</key> <map> <key>Comment</key> |