Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

2013-10-03 06:37:57 +02:00
parent a5928f4dbf 9f50b6942e
commit 7e02a5825e
1 changed files with 6 additions and 1 deletions
--- a/indra/newview/aihttpview.cpp
+++ b/indra/newview/aihttpview.cpp
@@ -293,7 +293,12 @@ AIHTTPView::~AIHTTPView()

 U32 AIHTTPView::updateColumn(int col, U32 start)
 {
-  llassert(col <= mStartColumn.size());
+  if (col > mStartColumn.size())
+  {
+	// This happens when AIGLHTTPHeaderBar::draw is called before AIServiceBar::draw, which
+	// happens when there are no services (visible) at the moment the HTTP console is opened.
+	return start;
+  }
  if (col == mStartColumn.size())
  {
 	mStartColumn.push_back(start);