From 095aca3eaea4cbc2237d2b3ad3d63fdad54eb2b7 Mon Sep 17 00:00:00 2001
From: Kyle Ambroff <ambroff@lindenlab.com>
Date: Tue, 7 Oct 2008 20:50:30 +0000
Subject: svn merge -r98039:98711
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server -->
 release

Merging various security fixes from Branch_1-24-Server.

Related to RequestXfer exploit:
* DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id.
* DEV-21767: Migrate RequestXfer to TCP-only
* DEV-21765: Fix RequestXfer traversal exploit
* DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities

Various fixes:
* fix for VFS memory corruption in llvfs.
* Bump server version to 1.24.9.

Landstore fixes:
* Passing locale to fulfill-order-item from region reservation fulfillment.
---
 scripts/messages/message_template.msg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts/messages')

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 9c92906e58..e67f540167 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -8852,4 +8852,5 @@ version 2.0
 		{	ObjectLocalID	U32		}
 		{	IncludeInSearch	BOOL	}
 	}
-}
\ No newline at end of file
+}
+
-- 
cgit v1.2.3