summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llmemtype.h3
-rw-r--r--indra/llcommon/llversionviewer.h2
2 files changed, 4 insertions, 1 deletions
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";