diff options
| author | McCabe Maxsted | 2010-11-05 13:47:32 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-05 13:49:50 -0700 |
| commit | e99e8b57520974fef73646343afaa7bbfa8b800e (patch) | |
| tree | b19d8fbfa60ceeb036487d1d3b40a2be3aeee4b6 /linden/indra | |
| parent | Merged webkit_plugins into weekly. Huzzah! The weekly branch now has browser/... (diff) | |
| download | meta-impy-e99e8b57520974fef73646343afaa7bbfa8b800e.zip meta-impy-e99e8b57520974fef73646343afaa7bbfa8b800e.tar.gz meta-impy-e99e8b57520974fef73646343afaa7bbfa8b800e.tar.bz2 meta-impy-e99e8b57520974fef73646343afaa7bbfa8b800e.tar.xz | |
Fixed missing UseLocalChatWithBubbles control introduced in af6877fb (#685), patch by Nicky Perian
Diffstat (limited to 'linden/indra')
| -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 91ed5c2..ccee513 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -1183,6 +1183,17 @@ | |||
| 1183 | <key>Value</key> | 1183 | <key>Value</key> |
| 1184 | <integer>0</integer> | 1184 | <integer>0</integer> |
| 1185 | </map> | 1185 | </map> |
| 1186 | <key>UseLocalChatWithBubbles</key> | ||
| 1187 | <map> | ||
| 1188 | <key>Comment</key> | ||
| 1189 | <string>Should local chat still appear even when using chat bubbles?</string> | ||
| 1190 | <key>Persist</key> | ||
| 1191 | <integer>1</integer> | ||
| 1192 | <key>Type</key> | ||
| 1193 | <string>Boolean</string> | ||
| 1194 | <key>Value</key> | ||
| 1195 | <integer>1</integer> | ||
| 1196 | </map> | ||
| 1186 | <key>UseUTCTime</key> | 1197 | <key>UseUTCTime</key> |
| 1187 | <map> | 1198 | <map> |
| 1188 | <key>Comment</key> | 1199 | <key>Comment</key> |