diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2009-10-01 02:35:53 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2009-10-01 02:35:53 +0000 |
| commit | cf9239cabcf7999a2d2393bd4bdb6fc08e27c09c (patch) | |
| tree | b366355f955b7bf55197ef6caa105881da88df32 /etc | |
| parent | 8135ddac021d3ea1aba2100f862bdb58eff33d07 (diff) | |
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/message.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/etc/message.xml b/etc/message.xml index dd1fda059e..d2ba9843e4 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -668,7 +668,14 @@ <key>FetchLib</key> <boolean>true</boolean> - </map> + + <key>ObjectMedia</key> + <boolean>false</boolean> + + <key>ObjectMediaNavigate</key> + <boolean>false</boolean> + + </map> <key>messageBans</key> <map> |