summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-07-28 20:35:24 +0000
committerJosh Bell <josh@lindenlab.com>2008-07-28 20:35:24 +0000
commitf0f2a416911ba8de9ac1e08cd90720c0d789bb2e (patch)
tree0c5442c50f0b2b84a9d59484216955de9145f1e3 /indra/llcommon
parentb4ed6bb95c28ea805c756373df0bd0cde7505eb8 (diff)
svn merge -r 93027:93128 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server --> release
Backport fixes from production branch * DEV-8282 integrated alt check with durls white list code * Fix for memory stomping due to deleting vector as scalars * DEV-16904 Email message shows incorrect owner when inventory item is sent to offline resident from scripted object inworld
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llversionserver.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 370689b46b..b33979a8c5 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 = 23;
-const S32 LL_VERSION_PATCH = 3;
-const S32 LL_VERSION_BUILD = 92647;
+const S32 LL_VERSION_PATCH = 4;
+const S32 LL_VERSION_BUILD = 93096;
const char * const LL_CHANNEL = "Second Life Server";