Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fix for Release

Browse Source
This commit is contained in:
Aleric Inglewood
2013-12-28 00:00:30 +01:00
parent 1c8876cead
commit b4848f308f
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcharacter/llmotion.cpp
View File

@@ -151,7 +151,9 @@ F32 LLMotion::syncActivationTime(F32 time)
void AISyncClientMotion::deregistered(void) void AISyncClientMotion::deregistered(void)
{ {
#ifdef SHOW_ASSERT
mReadyEvents = 0; mReadyEvents = 0;
#endif
} }
//</singu> //</singu>

4
indra/llcharacter/llmotioncontroller.cpp
View File

@@ -1197,7 +1197,7 @@ void LLMotionController::toggle_hidden(void)
{ {
LLMotion* motionp = *iter; LLMotion* motionp = *iter;
AISyncServer* server = motionp->server(); 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; 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. 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; LLMotion* motionp = *iter;
AISyncServer* server = motionp->server(); 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; bool visible_after = server->events_with_at_least_one_client_ready() & 4;
if (visible_after) // Are there any synchronized motions (left) that ARE visible? if (visible_after) // Are there any synchronized motions (left) that ARE visible?

4
indra/newview/llvoavatar.cpp
View File

@@ -3834,7 +3834,11 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
} }
if (motionp->server()) if (motionp->server())
{ {
#ifdef SHOW_ASSERT
output += llformat(" rt=%.1f r=%d s=0x%xl", motionp->getRuntime(), motionp->mReadyEvents, motionp->server()); 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); addDebugText(output);
} }