livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Josh Bell 2008-08-07 18:54:13 +00:00
parent 3b3e122489
commit 3fd18de450
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llcommon/llversionserver.h
View File

@ -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";

2
indra/llmessage/lliopipe.cpp
View File

@ -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

5
indra/llmessage/lliopipe.h
View File

@ -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