diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-08-07 18:54:13 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-08-07 18:54:13 +0000 |
| commit | 3fd18de4502c8713278d7a03229c8b48ca92a4af (patch) | |
| tree | ee371bf238d3b9aed0ebd493173d0876c365aa36 /indra/llmessage/lliopipe.cpp | |
| parent | 3b3e122489162309d71334461a9b2875bcf33181 (diff) | |
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
Diffstat (limited to 'indra/llmessage/lliopipe.cpp')
| -rw-r--r-- | indra/llmessage/lliopipe.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmessage/lliopipe.cpp b/indra/llmessage/lliopipe.cpp index a0cf5183f1..2bb43d8166 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 |