diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
| commit | fd46865a502036b9e4414e7ec4950faf551b1f14 (patch) | |
| tree | 634dbca07e829d3906ed555341118c361aa1bb14 /indra/newview/app_settings/settings.xml | |
| parent | de7d6cf4dfa1db2945e3ed4a3e8257d72674a496 (diff) | |
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 62bc827bb1..e6943869db 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2611,9 +2611,9 @@ <string>Rect</string> <key>Value</key> <array> - <integer>50</integer> + <integer>0</integer> <integer>220</integer> - <integer>450</integer> + <integer>700</integer> <integer>0</integer> </array> </map> @@ -2627,9 +2627,9 @@ <string>Rect</string> <key>Value</key> <array> - <integer>50</integer> - <integer>220</integer> - <integer>450</integer> + <integer>0</integer> + <integer>240</integer> + <integer>700</integer> <integer>0</integer> </array> </map> @@ -2819,9 +2819,9 @@ <string>Rect</string> <key>Value</key> <array> - <integer>50</integer> - <integer>450</integer> - <integer>300</integer> + <integer>0</integer> + <integer>646</integer> + <integer>275</integer> <integer>0</integer> </array> </map> @@ -2835,9 +2835,9 @@ <string>Rect</string> <key>Value</key> <array> - <integer>50</integer> + <integer>0</integer> <integer>150</integer> - <integer>650</integer> + <integer>600</integer> <integer>0</integer> </array> </map> @@ -4769,6 +4769,17 @@ <key>Value</key> <integer>410</integer> </map> + <key>MigrateCacheDirectory</key> + <map> + <key>Comment</key> + <string>Check for old version of disk cache to migrate to current location</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>MiniMapRotate</key> <map> <key>Comment</key> |