Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer

2014-08-30 14:29:32 -04:00
parent 29195e8460 52a80f98ed
commit 5059d5e2da
24 changed files with 71 additions and 149 deletions
--- a/indra/newview/aihttpview.cpp
+++ b/indra/newview/aihttpview.cpp
@@ -149,7 +149,7 @@ void AIServiceBar::draw()
 	start += LLFontGL::getFontMonospace()->getWidth(text);
  }
  start = mHTTPView->updateColumn(mc_col, start);
-#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
+#ifdef CWDEBUG
  text = llformat(" | %d,%d,%d/%d", total_added, event_polls, established_connections, concurrent_connections);
 #else
  text = llformat(" | %d/%d", total_added, concurrent_connections);