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.
---
 indra/llvfs/llvfs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llvfs')

diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp
index ef9abd99e9..ea2ff67c0e 100644
--- a/indra/llvfs/llvfs.cpp
+++ b/indra/llvfs/llvfs.cpp
@@ -1266,7 +1266,7 @@ void LLVFS::eraseBlockLength(LLVFSBlock *block)
 	}
 	if(!found_block)
 	{
-		llwarns << "eraseBlock could not find block" << llendl;
+		llerrs << "eraseBlock could not find block" << llendl;
 	}
 }
 
-- 
cgit v1.2.3