summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/llcommon/llstl.h2
-rw-r--r--indra/llcommon/llversionserver.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h
index 988e706091..99fc83274b 100644
--- a/indra/llcommon/llstl.h
+++ b/indra/llcommon/llstl.h
@@ -105,6 +105,7 @@ struct DeletePairedPointer
template<typename T> void operator()(T &ptr) const
{
delete ptr.second;
+ ptr.second = NULL;
}
};
struct DeletePairedPointerArray
@@ -112,6 +113,7 @@ struct DeletePairedPointerArray
template<typename T> void operator()(T &ptr) const
{
delete[] ptr.second;
+ ptr.second = NULL;
}
};
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 5fbf6582da..370689b46b 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 = 2;
-const S32 LL_VERSION_BUILD = 92378;
+const S32 LL_VERSION_PATCH = 3;
+const S32 LL_VERSION_BUILD = 92647;
const char * const LL_CHANNEL = "Second Life Server";