Index: branches/unlabeled/unlabeled-1.9.18/core/kernel/utility/debugger/debugger.js
===================================================================
diff -u -r7029 -r7577
--- branches/unlabeled/unlabeled-1.9.18/core/kernel/utility/debugger/debugger.js	(.../debugger.js)	(revision 7029)
+++ branches/unlabeled/unlabeled-1.9.18/core/kernel/utility/debugger/debugger.js	(.../debugger.js)	(revision 7577)
@@ -57,7 +57,11 @@
 }
 
 // Debugger
-function Debugger() {
+function Debugger($row_separator, $errors_count, $fatal_error, $sql_count) {
+	this.RowSeparator = $row_separator;
+	this.IsFatalError = $fatal_error;
+	this.ErrorsCount = parseInt($errors_count);
+	this.SQLCount = parseInt($sql_count);
 	this.IsQueried = false;
 	this.IsVisible = false;
 	this.DebuggerDIV = document.getElementById('debug_layer');
@@ -75,16 +79,29 @@
 Debugger.prototype.SetOpacity = function(opacity)
 {
 	this.DebuggerToolbar.style.opacity = (opacity / 100);
-  this.DebuggerToolbar.style.MozOpacity = (opacity / 100);
-  this.DebuggerToolbar.style.KhtmlOpacity = (opacity / 100);
-  this.DebuggerToolbar.style.filter = "alpha(opacity=" + opacity + ")";
+	this.DebuggerToolbar.style.MozOpacity = (opacity / 100);
+	this.DebuggerToolbar.style.KhtmlOpacity = (opacity / 100);
+	this.DebuggerToolbar.style.filter = "alpha(opacity=" + opacity + ")";
 }
 
 Debugger.prototype.AddToolbar = function($var_name) {
 	var $span = document.createElement('SPAN');
 	$span.style.position = 'absolute';
 
-	$span.innerHTML = '<table cellspacing="3" cellpadding="0" class="dbg-toolbar"><tr><td><input type="button" class="dbg-button" value="Reload Frame" onclick="self.location.reload();" /><input type="button" class="dbg-button" value="Show Debugger" onclick="' + $var_name + '.Toggle();" /><br /></td></tr></table>';
+	var $toolbar_content = '<input type="button" class="dbg-button" value="Reload Frame" onclick="self.location.reload();" />';
+	
+	if (this.ErrorsCount > 0) {
+		$toolbar_content += '|<input type="button" class="dbg-button debug_error" style="font-weight: bold;" value="Show Debugger (' + this.ErrorsCount + ' errors)" onclick="' + $var_name + '.Toggle();"/>';
+	}
+	else {
+		$toolbar_content += '<input type="button" class="dbg-button" value="Show Debugger" onclick="' + $var_name + '.Toggle();" />';
+	}
+	
+	if (this.SQLCount > 0) {
+		$toolbar_content += '|<input type="button" class="dbg-button" value="' + this.SQLCount + ' sqls" />';
+	}
+	
+	$span.innerHTML = '<table cellspacing="3" cellpadding="0" class="dbg-toolbar"><tr><td>' + $toolbar_content + '<br /></td></tr></table>';
 
 	this.DebuggerToolbar = $span;
 	this.SetOpacity(20);