diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
| commit | 98fd90ddd6595f2ee7e626c14117f51def621ec5 (patch) | |
| tree | 9a9caf8bffa53b753fe850f445bd133195e9bb03 /etc | |
| parent | 89d938efe371645756240da72f4c359c36985060 (diff) | |
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/message.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/etc/message.xml b/etc/message.xml index ddbfa58ddb..c9b9220ba2 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -357,6 +357,14 @@ <key>trusted-sender</key> <boolean>true</boolean> </map> + + <key>ParcelProperties</key> + <map> + <key>flavor</key> + <string>llsd</string> + <key>trusted-sender</key> + <boolean>true</boolean> + </map> <key>avatarnotesrequest</key> <map> @@ -514,7 +522,10 @@ <key>SearchStatTracking</key> <boolean>false</boolean> - + + <key>ParcelPropertiesUpdate</key> + <boolean>false</boolean> + </map> <key>messageBans</key> |