Put in some changes along sg1.4 dev history.

2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions
--- a/indra/llvfs/llpidlock.h
+++ b/indra/llvfs/llpidlock.h
@@ -41,8 +41,6 @@ class LLFrameTimer;

 #include <windows.h>

-#define getpid GetCurrentProcessId
-
 #else	//Everyone Else

 #include <signal.h>