diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/etc/message.xml | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/etc/message.xml')
| -rw-r--r-- | linden/etc/message.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/etc/message.xml b/linden/etc/message.xml index 8d34dd8..f86ca8b 100644 --- a/linden/etc/message.xml +++ b/linden/etc/message.xml | |||
| @@ -702,6 +702,12 @@ | |||
| 702 | 702 | ||
| 703 | <key>FetchLib</key> | 703 | <key>FetchLib</key> |
| 704 | <boolean>true</boolean> | 704 | <boolean>true</boolean> |
| 705 | |||
| 706 | <key>ObjectMedia</key> | ||
| 707 | <boolean>false</boolean> | ||
| 708 | |||
| 709 | <key>ObjectMediaNavigate</key> | ||
| 710 | <boolean>false</boolean> | ||
| 705 | </map> | 711 | </map> |
| 706 | 712 | ||
| 707 | <key>messageBans</key> | 713 | <key>messageBans</key> |