From b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 13 Sep 2007 18:17:52 +0000 Subject: svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Merge patches made in the 1-18-3 RC iterations into the trunk. NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp) --- indra/llcommon/lllslconstants.h | 2 +- indra/llcommon/llversionviewer.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/lllslconstants.h b/indra/llcommon/lllslconstants.h index 9f6ac1c521..8ca7260753 100644 --- a/indra/llcommon/lllslconstants.h +++ b/indra/llcommon/lllslconstants.h @@ -147,7 +147,7 @@ const S32 STRING_TRIM_TAIL = 0x02; const S32 STRING_TRIM = STRING_TRIM_HEAD | STRING_TRIM_TAIL; // llGetObjectDetails -const S32 OBJECT_UNKOWN_DETAIL = -1; +const S32 OBJECT_UNKNOWN_DETAIL = -1; const S32 OBJECT_NAME = 1; const S32 OBJECT_DESC = 2; const S32 OBJECT_POS = 3; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 7edef268bd..c6405a1b01 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -11,8 +11,8 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 18; -const S32 LL_VERSION_PATCH = 2; -const S32 LL_VERSION_BUILD = 46464; +const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_BUILD = 3; const char * const LL_CHANNEL = "Second Life Release"; -- cgit v1.2.3