From b069bb9e71d31495f3f1312529d19fdb83c1779e Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Wed, 1 Oct 2008 00:42:47 +0000 Subject: svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release --- indra/llcommon/lltimer.h | 4 +++- indra/llcommon/llversionserver.h | 4 ++-- indra/llcommon/llversionviewer.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h index d3a83339f0..ea84f8ea2c 100644 --- a/indra/llcommon/lltimer.h +++ b/indra/llcommon/lltimer.h @@ -39,6 +39,8 @@ #include "stdtypes.h" +#include +#include // units conversions #ifndef USEC_PER_SEC const U32 USEC_PER_SEC = 1000000; @@ -184,7 +186,7 @@ protected: private: //list of active timers - static std::list sActiveList; + static std::list sActiveList; // TODO should this be a vector }; #endif diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index b79c729184..de2cbde0e1 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -34,8 +34,8 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 24; -const S32 LL_VERSION_PATCH = 6; -const S32 LL_VERSION_BUILD = 94536; +const S32 LL_VERSION_PATCH = 7; +const S32 LL_VERSION_BUILD = 97877; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 9e3ad076fc..ac568798cf 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 21; const S32 LL_VERSION_PATCH = 3; -const S32 LL_VERSION_BUILD = 0; +const S32 LL_VERSION_BUILD = 97417; const char * const LL_CHANNEL = "Second Life Release"; -- cgit v1.2.3