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

Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer

Browse Source
This commit is contained in:
Aleric Inglewood
2011-06-03 22:48:23 +02:00
parent e41fd0d978 fef7ce9f76
commit fed8951e00
92 changed files with 3849 additions and 4484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/statemachine/aistatemachine.h
View File

@@ -226,7 +226,7 @@ class AIStateMachine {
void yield_frame(unsigned int frames) { mSleep = -(S64)frames; }
//! Temporarily halt the state machine.
void yield_ms(unsigned int ms) { mSleep = get_cpu_clock_count() + LLFastTimer::countsPerSecond() * ms / 1000; }
void yield_ms(unsigned int ms) { mSleep = LLFastTimer::getCPUClockCount64() + LLFastTimer::countsPerSecond() * ms / 1000; }
//! Continue running after calling idle.
void cont(void);