From 3fd18de4502c8713278d7a03229c8b48ca92a4af Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 7 Aug 2008 18:54:13 +0000
Subject: [PATCH] svn merge -r 93444:93885
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server -->
release
Backport fixes from UPCOMING production branch:
* Fixed gdb/simulator statistics bucket index: "bucket[1]" to "bucket[2]"
* Updated eventlet and mulib external revisions
* Various deploy script tweaks
* DEV-17796 Sim performance decreases a lot with rezzing physical objects
* DEV-18900 Turn off the LL_DEBUG_PUMPS code
* DEV-18896 SVC-2738: Mono Beta: Newer LSL functions will not compile under Mono
* DEV-18825 make install_indra.py produce the /local/www/login.GRID.lindenlab.com tree/symlinks
* DEV-18826 make install_indra.py produce the /local/www/xmlrpc.*.com tree/symlinks
* DEV-18188 View:Property Lines and View:Land Owners shows everything as group owned even if it's not under 1.23.2.92647
* DEV-18723 develop.py -t Release build server should build everything needed to succesfully farm stage a server
* DEV-18316 Simulator crashing on exit due to bad use of global pointer caching
---
indra/llcommon/llversionserver.h | 6 +++---
indra/llmessage/lliopipe.cpp | 2 ++
indra/llmessage/lliopipe.h | 5 ++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index b33979a8c5c..fd5f6497c20 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 a0cf5183f10..2bb43d8166c 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 d8b34cbe44b..18a3f45d9f5 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
--
GitLab