From 11a3589665aae1a2423e258e40eba45c117627d5 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 25 Mar 2008 19:10:33 +0000
Subject: svn merge -r 82869:83166
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server -->
 release

Includes:
DEV-12492 "new" regAPI fails on php-framework-2
DEV-11540 Show browser HUD for A/B test users coming from SL.com.
DEV-11730 LLSD parser changes
PHP logs to syslog
DEV-12146 php llsd_UUID does not pass the IsUUID() validation function
DEV-12356 oldstyle FetchInventoryDescendents should be TEMPLATE not LLSD
steve's fix to setting the proxy option in curl
---
 etc/message.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/message.xml b/etc/message.xml
index c6875cdcc9..331e6bb251 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -445,7 +445,7 @@
 				<key>FetchInventoryDescendents</key>
 				<map>
 					<key>flavor</key>
-					<string>llsd</string>
+					<string>template</string>
 					<key>trusted-sender</key>
 					<boolean>false</boolean>
 				</map>
-- 
cgit v1.2.3