diff options
| author | Jacek Antonelli | 2011-06-14 03:17:47 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-06-14 03:17:47 -0500 |
| commit | a07c8523db805a244b5e530e1133577359ba01f9 (patch) | |
| tree | c1df3e53e3746716c4031357a3fe56c22d8849e7 /linden/indra | |
| parent | Rearranged the login panel to put the grid selector on the left. (diff) | |
| parent | Fix #924: default RunMultipleThreads to TRUE. (diff) | |
| download | meta-impy-a07c8523db805a244b5e530e1133577359ba01f9.zip meta-impy-a07c8523db805a244b5e530e1133577359ba01f9.tar.gz meta-impy-a07c8523db805a244b5e530e1133577359ba01f9.tar.bz2 meta-impy-a07c8523db805a244b5e530e1133577359ba01f9.tar.xz | |
Merge remote-tracking branch 'thickbrick/misc' into next
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 2c5d858..166c35a 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -10569,7 +10569,7 @@ | |||
| 10569 | <key>Type</key> | 10569 | <key>Type</key> |
| 10570 | <string>Boolean</string> | 10570 | <string>Boolean</string> |
| 10571 | <key>Value</key> | 10571 | <key>Value</key> |
| 10572 | <integer>0</integer> | 10572 | <integer>1</integer> |
| 10573 | </map> | 10573 | </map> |
| 10574 | <key>SafeMode</key> | 10574 | <key>SafeMode</key> |
| 10575 | <map> | 10575 | <map> |