diff options
| author | McCabe Maxsted | 2009-09-17 00:52:17 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-17 00:52:17 -0700 |
| commit | f4c717d32135460f0fe07a77643f974dcc4f143d (patch) | |
| tree | c49d4d68be0fa815589a0e2ed4c07466c638cce4 /linden/indra/newview/app_settings | |
| parent | Applied patch by Aleric Inglewood for VWR-13996 - avatars using 1.22 complete... (diff) | |
| parent | Fixed stream info not updating (diff) | |
| download | meta-impy-f4c717d32135460f0fe07a77643f974dcc4f143d.zip meta-impy-f4c717d32135460f0fe07a77643f974dcc4f143d.tar.gz meta-impy-f4c717d32135460f0fe07a77643f974dcc4f143d.tar.bz2 meta-impy-f4c717d32135460f0fe07a77643f974dcc4f143d.tar.xz | |
Merge branch '1.2.0-streaminfo' into 1.2.0-next
Diffstat (limited to 'linden/indra/newview/app_settings')
| -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 6d2f0c5..f92b47f 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -7524,6 +7524,17 @@ | |||
| 7524 | <key>Value</key> | 7524 | <key>Value</key> |
| 7525 | <integer>0</integer> | 7525 | <integer>0</integer> |
| 7526 | </map> | 7526 | </map> |
| 7527 | <key>ShowStreamTitle</key> | ||
| 7528 | <map> | ||
| 7529 | <key>Comment</key> | ||
| 7530 | <string>Show the title of the song playing on the parcel's stream</string> | ||
| 7531 | <key>Persist</key> | ||
| 7532 | <integer>1</integer> | ||
| 7533 | <key>Type</key> | ||
| 7534 | <string>Boolean</string> | ||
| 7535 | <key>Value</key> | ||
| 7536 | <integer>1</integer> | ||
| 7537 | </map> | ||
| 7527 | <key>ShowTangentBasis</key> | 7538 | <key>ShowTangentBasis</key> |
| 7528 | <map> | 7539 | <map> |
| 7529 | <key>Comment</key> | 7540 | <key>Comment</key> |