diff options
| author | Dave Kaprielian <sabin@lindenlab.com> | 2008-04-16 00:28:54 +0000 |
|---|---|---|
| committer | Dave Kaprielian <sabin@lindenlab.com> | 2008-04-16 00:28:54 +0000 |
| commit | 68988bddebfaf63314ded09e7ec6bade8b7bb951 (patch) | |
| tree | 0b740ed607c157e9714b4c46c32afa5d9ce6c90d /indra/llcommon | |
| parent | acc8ae40cdb2f57969ab57e1e8e6ec505a50d02b (diff) | |
svn merge -r84476:84911 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server
Includes pullout of migrate-start-location-2, webservice changes made to 1.20, DEV-7229, and other web-ds changes. Reviewed by Josh.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsdutil.h | 12 | ||||
| -rw-r--r-- | indra/llcommon/llversionserver.h | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h index 9f73222bc3..17a881d9cb 100644 --- a/indra/llcommon/llsdutil.h +++ b/indra/llcommon/llsdutil.h @@ -101,16 +101,4 @@ BOOL compare_llsd_with_template( const LLSD& template_llsd, LLSD& resultant_llsd); -// Simple function to copy data out of input & output iterators if -// there is no need for casting. -template<typename Input> LLSD llsd_copy_array(Input iter, Input end) -{ - LLSD dest; - for (; iter != end; ++iter) - { - dest.append(*iter); - } - return dest; -} - #endif // LL_LLSDUTIL_H diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 9d98f945dd..3a53baf188 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -33,9 +33,9 @@ #define LL_LLVERSIONSERVER_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 20; +const S32 LL_VERSION_MINOR = 21; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 84396; +const S32 LL_VERSION_BUILD = 84509; const char * const LL_CHANNEL = "Second Life Server"; |