aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcommon')
-rw-r--r--linden/indra/llcommon/lltimer.h2
-rw-r--r--linden/indra/llcommon/llversionviewer.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h
index bd4c274..8a4bc76 100644
--- a/linden/indra/llcommon/lltimer.h
+++ b/linden/indra/llcommon/lltimer.h
@@ -36,6 +36,8 @@
36#include <sys/time.h> 36#include <sys/time.h>
37#endif 37#endif
38 38
39#include "stdtypes.h"
40
39// units conversions 41// units conversions
40#ifndef USEC_PER_SEC 42#ifndef USEC_PER_SEC
41 const U32 USEC_PER_SEC = 1000000; 43 const U32 USEC_PER_SEC = 1000000;
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 998ea9e..c0296db 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
35const S32 LL_VERSION_MAJOR = 1; 35const S32 LL_VERSION_MAJOR = 1;
36const S32 LL_VERSION_MINOR = 19; 36const S32 LL_VERSION_MINOR = 19;
37const S32 LL_VERSION_PATCH = 1; 37const S32 LL_VERSION_PATCH = 1;
38const S32 LL_VERSION_BUILD = 1; 38const S32 LL_VERSION_BUILD = 2;
39 39
40const char * const LL_CHANNEL = "Second Life Release"; 40const char * const LL_CHANNEL = "Second Life Release";
41 41