From 7dada07dbaae3dfb9b1319453e51019bfff2717f Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 20 Feb 2007 22:02:36 +0000
Subject: svn merge -r 57620:58007
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/newview/llviewercontrol.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewercontrol.cpp')

diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 99cae9979c..225d599838 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -86,7 +86,7 @@ BOOL LLFloaterSettingsDebug::postBuild()
 	childSetUserData("boolean_combo", this);
 	childSetCommitCallback("color_swatch", onCommitSettings);
 	childSetUserData("color_swatch", this);
-
+	childSetAction("default_btn", onClickDefault, this);
 	mComment = (LLTextEditor*)getChildByName("comment_text");
 	return TRUE;
 }
-- 
cgit v1.2.3