diff options
| author | David Seikel | 2011-02-20 17:43:37 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 17:43:37 +1000 |
| commit | 30cac27887ad0497168efb7d8dbc4209ee8b6a2f (patch) | |
| tree | e722eeffe993a85552ca31e83c24cff8c1d9e339 /linden/etc | |
| parent | Work around the endless bitching about webkit failing when you open the searc... (diff) | |
| parent | Fixed compile error in llmediaplugintest: lingering ll_init_apr (diff) | |
| download | meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.zip meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.gz meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.bz2 meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.xz | |
Merge remote-tracking branch 'mccabe/weekly' into weekly
Diffstat (limited to 'linden/etc')
| -rw-r--r-- | linden/etc/message.xml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/linden/etc/message.xml b/linden/etc/message.xml index 0fdf364..8d34dd8 100644 --- a/linden/etc/message.xml +++ b/linden/etc/message.xml | |||
| @@ -386,7 +386,17 @@ | |||
| 386 | <boolean>true</boolean> | 386 | <boolean>true</boolean> |
| 387 | </map> | 387 | </map> |
| 388 | 388 | ||
| 389 | <key>ParcelVoiceInfo</key> | 389 | <!-- Server to client --> |
| 390 | <key>DisplayNameUpdate</key> | ||
| 391 | <map> | ||
| 392 | <key>flavor</key> | ||
| 393 | <string>llsd</string> | ||
| 394 | <key>trusted-sender</key> | ||
| 395 | <boolean>true</boolean> | ||
| 396 | </map> | ||
| 397 | |||
| 398 | |||
| 399 | <key>ParcelVoiceInfo</key> | ||
| 390 | <map> | 400 | <map> |
| 391 | <key>flavor</key> | 401 | <key>flavor</key> |
| 392 | <string>llsd</string> | 402 | <string>llsd</string> |
| @@ -442,6 +452,14 @@ | |||
| 442 | <boolean>true</boolean> | 452 | <boolean>true</boolean> |
| 443 | </map> | 453 | </map> |
| 444 | 454 | ||
| 455 | <key>SetDisplayNameReply</key> | ||
| 456 | <map> | ||
| 457 | <key>flavor</key> | ||
| 458 | <string>llsd</string> | ||
| 459 | <key>trusted-sender</key> | ||
| 460 | <boolean>true</boolean> | ||
| 461 | </map> | ||
| 462 | |||
| 445 | <key>DirLandReply</key> | 463 | <key>DirLandReply</key> |
| 446 | <map> | 464 | <map> |
| 447 | <key>flavor</key> | 465 | <key>flavor</key> |