diff options
| author | Jacek Antonelli | 2011-05-08 15:13:37 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-05-08 15:50:49 -0500 |
| commit | 7278f0254a3944bd2bcbf1e855fb0d90c3086a27 (patch) | |
| tree | 5d7ecb81ebf1a07482f0a7d3d13acd7f18360c0b /linden/etc | |
| parent | Imprudence 1.3.1 released. (diff) | |
| parent | Changed version to Experimental 2011.04.19 (diff) | |
| download | meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.zip meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.gz meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.bz2 meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.xz | |
Merged Experimental branch (exp) back into main line (next).
Git thought many files (almost 100) had merge conflicts. But, after
resolving the conflicts (which were mostly trivial), almost all the
files turned out to be the same as in the exp branch. So, the
conflicts are not listed here. Check the diff between commit 244ffe8
and this commit to see what really changed.
Diffstat (limited to 'linden/etc')
| -rw-r--r-- | linden/etc/message.xml | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/linden/etc/message.xml b/linden/etc/message.xml index dd149dd..8d34dd8 100644 --- a/linden/etc/message.xml +++ b/linden/etc/message.xml | |||
| @@ -370,6 +370,32 @@ | |||
| 370 | </map> | 370 | </map> |
| 371 | 371 | ||
| 372 | <!-- Server to client --> | 372 | <!-- Server to client --> |
| 373 | <key>OpenRegionInfo</key> | ||
| 374 | <map> | ||
| 375 | <key>flavor</key> | ||
| 376 | <string>llsd</string> | ||
| 377 | <key>trusted-sender</key> | ||
| 378 | <boolean>true</boolean> | ||
| 379 | </map> | ||
| 380 | |||
| 381 | <key>WindLightSettingsUpdate</key> | ||
| 382 | <map> | ||
| 383 | <key>flavor</key> | ||
| 384 | <string>llsd</string> | ||
| 385 | <key>trusted-sender</key> | ||
| 386 | <boolean>true</boolean> | ||
| 387 | </map> | ||
| 388 | |||
| 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 | |||
| 373 | <key>ParcelVoiceInfo</key> | 399 | <key>ParcelVoiceInfo</key> |
| 374 | <map> | 400 | <map> |
| 375 | <key>flavor</key> | 401 | <key>flavor</key> |
| @@ -377,7 +403,23 @@ | |||
| 377 | <key>trusted-sender</key> | 403 | <key>trusted-sender</key> |
| 378 | <boolean>true</boolean> | 404 | <boolean>true</boolean> |
| 379 | </map> | 405 | </map> |
| 406 | |||
| 407 | <key>ParcelMediaURLFilter</key> | ||
| 408 | <map> | ||
| 409 | <key>flavor</key> | ||
| 410 | <string>llsd</string> | ||
| 411 | <key>trusted-sender</key> | ||
| 412 | <boolean>false</boolean> | ||
| 413 | </map> | ||
| 380 | 414 | ||
| 415 | <key>ParcelNavigateMedia</key> | ||
| 416 | <map> | ||
| 417 | <key>flavor</key> | ||
| 418 | <string>llsd</string> | ||
| 419 | <key>trusted-sender</key> | ||
| 420 | <boolean>false</boolean> | ||
| 421 | </map> | ||
| 422 | |||
| 381 | <key>ParcelObjectOwnersReply</key> | 423 | <key>ParcelObjectOwnersReply</key> |
| 382 | <map> | 424 | <map> |
| 383 | <key>flavor</key> | 425 | <key>flavor</key> |
| @@ -410,6 +452,14 @@ | |||
| 410 | <boolean>true</boolean> | 452 | <boolean>true</boolean> |
| 411 | </map> | 453 | </map> |
| 412 | 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 | |||
| 413 | <key>DirLandReply</key> | 463 | <key>DirLandReply</key> |
| 414 | <map> | 464 | <map> |
| 415 | <key>flavor</key> | 465 | <key>flavor</key> |