diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsdutil.h | 12 | ||||
| -rw-r--r-- | indra/llcommon/llversionserver.h | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h index 17a881d9cb..9f73222bc3 100644 --- a/indra/llcommon/llsdutil.h +++ b/indra/llcommon/llsdutil.h @@ -101,4 +101,16 @@ 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 3a53baf188..aeab793c9a 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 = 21; -const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 84509; +const S32 LL_VERSION_PATCH = 1; +const S32 LL_VERSION_BUILD = 85989; const char * const LL_CHANNEL = "Second Life Server"; |