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

Merge remote-tracking branch 'singu/master'

Browse Source 
Conflicts:
	indra/newview/llviewerwindow.cpp

c_str() dropped out (50f03d83c0).
Added it back.
This commit is contained in:
Aleric Inglewood
2013-04-20 05:18:27 +02:00
parent e12aaa3f5f 3bdeb8e8a8
commit 0b86c9eec1
63 changed files with 1111 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/aistatemachine/aistatemachine.cpp
View File

@@ -373,7 +373,7 @@ void AIEngine::setMaxCount(F32 StateMachineMaxTime)
sMaxCount = calc_clock_frequency() * StateMachineMaxTime / 1000;
}
#ifdef CWDEBUG
#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
char const* AIStateMachine::event_str(event_type event)
{
switch(event)

2
indra/aistatemachine/aistatemachine.h
View File

@@ -271,7 +271,7 @@ class AIStateMachine : public LLThreadSafeRefCount
// Return stringified state, for debugging purposes.
char const* state_str(base_state_type state);
#ifdef CWDEBUG
#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
char const* event_str(event_type event);
#endif