diff options
| author | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:14:34 -0500 |
| commit | a1041a6fa17368e13d610df9d5eb23e307654815 (patch) | |
| tree | 5f8c22e1bbdeb727600c31ff60f908b785c2faae /linden/indra/newview/app_settings/settings.xml | |
| parent | Moved "Show HUD Attachments" back to View, restored shortcut. (diff) | |
| parent | Fixed region names not showing up on regions with zero avatars (diff) | |
| download | meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.zip meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.gz meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.bz2 meta-impy-a1041a6fa17368e13d610df9d5eb23e307654815.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Diffstat (limited to 'linden/indra/newview/app_settings/settings.xml')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 194e95e..087c92f 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -5559,6 +5559,17 @@ | |||
| 5559 | <key>Value</key> | 5559 | <key>Value</key> |
| 5560 | <integer>0</integer> | 5560 | <integer>0</integer> |
| 5561 | </map> | 5561 | </map> |
| 5562 | <key>ParticleChat</key> | ||
| 5563 | <map> | ||
| 5564 | <key>Comment</key> | ||
| 5565 | <string>Chat target of effect beam to channel 9000</string> | ||
| 5566 | <key>Persist</key> | ||
| 5567 | <integer>1</integer> | ||
| 5568 | <key>Type</key> | ||
| 5569 | <string>Boolean</string> | ||
| 5570 | <key>Value</key> | ||
| 5571 | <integer>1</integer> | ||
| 5572 | </map> | ||
| 5562 | <key>PerAccountSettingsFile</key> | 5573 | <key>PerAccountSettingsFile</key> |
| 5563 | <map> | 5574 | <map> |
| 5564 | <key>Comment</key> | 5575 | <key>Comment</key> |