From 0ddf718d9266fa1262d6e1f0f6d1e537048e8388 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 20 Jul 2011 13:48:46 -0400 Subject: still trying to fix channels --- indra/llcommon/llversionviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 indra/llcommon/llversionviewer.h (limited to 'indra/llcommon') diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h old mode 100644 new mode 100755 index 0018b8e844..c6ce1a7a25 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -32,7 +32,7 @@ const S32 LL_VERSION_MINOR = 8; const S32 LL_VERSION_PATCH = 1; 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"; -- cgit v1.2.3 From cfacd12d136a570e8fe353faa7e7818c6ff24b5e Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 1 Aug 2011 09:47:39 -0400 Subject: increment viewer version to 2.8.4 --- indra/llcommon/llversionviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index f98a5398c3..99c5412ae5 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ 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"; -- cgit v1.2.3 From 3369ebc8dd839883e84b279977a2347391ec2ed6 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 4 Aug 2011 10:57:03 -0400 Subject: fix DOS line endings --- indra/llcommon/llfasttimer_class.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/llcommon') 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; } } -- cgit v1.2.3 From 1b46240ed84e2847dbf7da0d67c67940b646448c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 4 Aug 2011 11:14:18 -0400 Subject: correct default channel --- indra/llcommon/llversionviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index f2462ba426..99c5412ae5 100755 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -32,7 +32,7 @@ const S32 LL_VERSION_MINOR = 8; const S32 LL_VERSION_PATCH = 4; const S32 LL_VERSION_BUILD = 0; -const char * const LL_CHANNEL = "Project Viewer - Mesh"; +const char * const LL_CHANNEL = "Second Life Developer"; #if LL_DARWIN const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.indra.viewer"; -- cgit v1.2.3