diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 1 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index e92f04441c..3538ad88ed 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -165,6 +165,7 @@ public: FTM_FILTER, FTM_REFRESH, FTM_SORT, + FTM_PICK, // Temp FTM_TEMP1, diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 092eadd303..27d69c453d 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -33,8 +33,8 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 21; -const S32 LL_VERSION_PATCH = 6; +const S32 LL_VERSION_MINOR = 22; +const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = 100000; const char * const LL_CHANNEL = "Second Life Release"; |