From 16baf6c9d43fc29e697b5a460439ca664897450c Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 28 Apr 2008 23:29:46 +0000 Subject: merge release-QAR-499 Viewer 1.20 RC 3 merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release --- indra/llcommon/llmemtype.h | 3 +++ indra/llcommon/llversionviewer.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llmemtype.h b/indra/llcommon/llmemtype.h index 9bf6cad9f7..2e275bd523 100644 --- a/indra/llcommon/llmemtype.h +++ b/indra/llcommon/llmemtype.h @@ -84,6 +84,9 @@ public: MTYPE_REGIONS, MTYPE_INVENTORY, MTYPE_ANIMATION, + MTYPE_VOLUME, + MTYPE_PRIMITIVE, + MTYPE_NETWORK, MTYPE_PHYSICS, MTYPE_INTERESTLIST, diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index a1fd0ff509..dbf1d3154b 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -34,7 +34,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 20; -const S32 LL_VERSION_PATCH = 2; +const S32 LL_VERSION_PATCH = 4; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Release"; -- cgit v1.2.3