Merge remote-tracking branch 'Aleric/master' into Cupcake

2013-03-11 19:55:38 -04:00
parent 8c09a3c6af 7de15e7acd
commit d345630b2c
47 changed files with 1925 additions and 1178 deletions
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -261,10 +261,6 @@ extern S32 gStartImageHeight;
 // local globals
 //

-#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
-static bool gCurlIo;
-#endif
-
 static LLHost gAgentSimHost;
 static BOOL gSkipOptionalUpdate = FALSE;