diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/llversionviewer.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index 675eda2fc5..0737f954e8 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -229,12 +229,12 @@ void LLFastTimer::DeclareTimer::updateCachedPointers() it->mFrameState = &it->mTimer.getFrameState(); } - // also update frame states of timers on stack
- LLFastTimer* cur_timerp = LLFastTimer::sCurTimerData.mCurTimer;
- while(cur_timerp->mLastTimerData.mCurTimer != cur_timerp)
- {
- cur_timerp->mFrameState = &cur_timerp->mFrameState->mTimer->getFrameState();
- cur_timerp = cur_timerp->mLastTimerData.mCurTimer;
+ // also update frame states of timers on stack + LLFastTimer* cur_timerp = LLFastTimer::sCurTimerData.mCurTimer; + while(cur_timerp->mLastTimerData.mCurTimer != cur_timerp) + { + cur_timerp->mFrameState = &cur_timerp->mFrameState->mTimer->getFrameState(); + cur_timerp = cur_timerp->mLastTimerData.mCurTimer; } } diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index f98a5398c3..f2462ba426 100644..100755 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,10 +29,10 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 8; -const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_PATCH = 4; const S32 LL_VERSION_BUILD = 0; -const char * const LL_CHANNEL = "Second Life Developer"; +const char * const LL_CHANNEL = "Project Viewer - Mesh"; #if LL_DARWIN const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.indra.viewer"; |