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

Merge remote-tracking branch 'singu/master' into curlthreading2

Browse Source 
Conflicts:
	indra/newview/statemachine/aistatemachine.cpp

Huh - you re-INDENTED a file that you didn't merge yet?
How about merging curlthreading2 and curlthreading3
before doing THAT? :/

Obviously I did an "use ours" here.
This commit is contained in:
Aleric Inglewood
2012-09-11 15:15:46 +02:00
parent d57a3b101b 4ade726a07
commit d23835a6c2
35 changed files with 406 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@
#define AISTATEMACHINE_H
#include "aithreadsafe.h"
#include "llfasttimer.h"
#include "lltimer.h"
#include <boost/signals2.hpp>
//!
@@ -261,7 +261,7 @@ class AIStateMachine {
void yield_frame(unsigned int frames) { mSleep = -(S64)frames; }
//! Temporarily halt the state machine.
void yield_ms(unsigned int ms) { mSleep = LLFastTimer::getCPUClockCount64() + LLFastTimer::countsPerSecond() * ms / 1000; }
void yield_ms(unsigned int ms) { mSleep = get_clock_count() + calc_clock_frequency() * ms / 1000; }
//! Continue running after calling idle.
void cont(void)