diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index b33979a8c5cfc701ebf79309ae6119ffa38df057..fd5f6497c20465f28a059bb41983a36ce331cc03 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -33,9 +33,9 @@
 #define LL_LLVERSIONSERVER_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 23;
-const S32 LL_VERSION_PATCH = 4;
-const S32 LL_VERSION_BUILD = 93096;
+const S32 LL_VERSION_MINOR = 24;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 93453;
 
 const char * const LL_CHANNEL = "Second Life Server";
 
diff --git a/indra/llmessage/lliopipe.cpp b/indra/llmessage/lliopipe.cpp
index a0cf5183f10ed5ffbc7f2b1adfd6a8e1ff0fafe3..2bb43d8166c163354bc8535d4d0484ac28ccf3a0 100644
--- a/indra/llmessage/lliopipe.cpp
+++ b/indra/llmessage/lliopipe.cpp
@@ -55,6 +55,7 @@ static const std::string STATUS_ERROR_NAMES[LLIOPipe::STATUS_ERROR_COUNT] =
 	std::string("STATUS_EXPIRED"),
 };
 
+#ifdef LL_DEBUG_PUMPS
 // Debugging schmutz for deadlock
 const char	*gPumpFile = "";
 S32			gPumpLine = 0;
@@ -64,6 +65,7 @@ void pump_debug(const char *file, S32 line)
 	gPumpFile = file;
 	gPumpLine = line;
 }
+#endif /* LL_DEBUG_PUMPS */
 
 /**
  * LLIOPipe
diff --git a/indra/llmessage/lliopipe.h b/indra/llmessage/lliopipe.h
index d8b34cbe44b35f18c4295916dffef242ccfec230..18a3f45d9f5f393df8c1c0fbc4d6c7857fd3e7d4 100644
--- a/indra/llmessage/lliopipe.h
+++ b/indra/llmessage/lliopipe.h
@@ -46,11 +46,14 @@ class LLBufferArray;
 class LLChannelDescriptors;
 
 // Debugging schmutz for deadlocks
-#define LL_DEBUG_PUMPS
+//#define LL_DEBUG_PUMPS
 #ifdef LL_DEBUG_PUMPS
 void pump_debug(const char *file, S32 line);
 #define PUMP_DEBUG pump_debug(__FILE__, __LINE__);
 #define END_PUMP_DEBUG pump_debug("none", 0);
+#else /* LL_DEBUG_PUMPS */
+#define PUMP_DEBUG
+#define END_PUMP_DEBUG
 #endif