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

Compile fix.

Browse Source 
This belongs to the latest merge with singu/master.
This commit is contained in:
Aleric Inglewood
2012-09-11 17:03:57 +02:00
parent e3460bea09
commit 834a524a67
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/statemachine/aistatemachine.cpp
View File

@@ -529,12 +529,12 @@ void AIStateMachine::mainloop(void*)
AIStateMachine& statemachine(iter->statemachine()); AIStateMachine& statemachine(iter->statemachine());
if (!statemachine.mIdle) if (!statemachine.mIdle)
{ {
U64 start = LLFastTimer::getCPUClockCount64(); U64 start = get_clock_count();
// This might call idle() and then pass the statemachine to another thread who then may call cont(). // This might call idle() and then pass the statemachine to another thread who then may call cont().
// Hence, after this isn't not sure what mIdle is, and it can change from true to false at any moment, // Hence, after this isn't not sure what mIdle is, and it can change from true to false at any moment,
// if it is true after this function returns. // if it is true after this function returns.
statemachine.multiplex(start); statemachine.multiplex(start);
U64 delta = LLFastTimer::getCPUClockCount64() - start; U64 delta = get_clock_count() - start;
iter->add(delta); iter->add(delta);
total_clocks += delta; total_clocks += delta;
if (total_clocks >= max_count) if (total_clocks >= max_count)