From e03bb0606a10f29c8b94909a713a5bb5c69e88b7 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 21 Jun 2007 22:40:22 +0000
Subject: merge -r62831:64079 branches/maintenance to release

---
 indra/llmessage/lliosocket.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llmessage/lliosocket.cpp')

diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp
index 6ccaa7fb1a..e96b23f134 100644
--- a/indra/llmessage/lliosocket.cpp
+++ b/indra/llmessage/lliosocket.cpp
@@ -421,6 +421,8 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl(
 #if LL_WINDOWS
 			if (status == 730035)
 				break;
+#else
+			(void) status;
 #endif 
 			mLastWritten = segment.data() + len - 1;
 
-- 
cgit v1.2.3