From b4848f308ff35668309ce7d36a10e0b6dbfe1266 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sat, 28 Dec 2013 00:00:30 +0100 Subject: [PATCH] Compile fix for Release --- indra/llcharacter/llmotion.cpp | 2 ++ indra/llcharacter/llmotioncontroller.cpp | 4 ++-- indra/newview/llvoavatar.cpp | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp index 94d12c7e4..efd1ad158 100644 --- a/indra/llcharacter/llmotion.cpp +++ b/indra/llcharacter/llmotion.cpp @@ -151,7 +151,9 @@ F32 LLMotion::syncActivationTime(F32 time) void AISyncClientMotion::deregistered(void) { +#ifdef SHOW_ASSERT mReadyEvents = 0; +#endif } // diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index 8f8475576..7c7192be0 100644 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -1197,7 +1197,7 @@ void LLMotionController::toggle_hidden(void) { LLMotion* motionp = *iter; AISyncServer* server = motionp->server(); - if (server && !server->never_synced() && (motionp->mReadyEvents & 2)) // Skip motions that aren't synchronized at all or that are not active. + if (server && !server->never_synced() && motionp->isActive()) // Skip motions that aren't synchronized at all or that are not active. { bool visible_before = server->events_with_at_least_one_client_ready() & 4; server->ready(4, visible, motionp); // Mark that now we are visible or no longer visible. @@ -1247,7 +1247,7 @@ void LLMotionController::refresh_hidden(void) { LLMotion* motionp = *iter; AISyncServer* server = motionp->server(); - if (server && !server->never_synced() && (motionp->mReadyEvents & 2)) // Skip motions that aren't synchronized at all or that are not active. + if (server && !server->never_synced() && motionp->isActive()) // Skip motions that aren't synchronized at all or that are not active. { bool visible_after = server->events_with_at_least_one_client_ready() & 4; if (visible_after) // Are there any synchronized motions (left) that ARE visible? diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 8562edb7a..901340a57 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3834,7 +3834,11 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) } if (motionp->server()) { +#ifdef SHOW_ASSERT output += llformat(" rt=%.1f r=%d s=0x%xl", motionp->getRuntime(), motionp->mReadyEvents, motionp->server()); +#else + output += llformat(" rt=%.1f s=0x%xl", motionp->getRuntime(), motionp->server()); +#endif } addDebugText(output); }