From 391f423cd0633262233d474622b56dd3b151ab32 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 11 Nov 2009 16:34:23 -0800
Subject: Revert global font setting for UI controls because it makes About
 Land crash Apparently moving ui_ctrl to a different registry breaks our
 ability to create dummy ones in code.  Reverting until I have time to
 investigate. Discussed with Richard

---
 indra/llui/lluictrl.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/llui/lluictrl.cpp')

diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index dd807a3f7e..aaadc1b58d 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -38,7 +38,11 @@
 #include "llpanel.h"
 #include "lluictrlfactory.h"
 
-static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl");
+// This breaks the ability to construct dummy LLUICtrls for calls like
+// getChild<LLUICtrl>("not-there")
+//static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl");
+// This doesn't appear to read/apply ui_ctrl.xml
+static LLDefaultChildRegistry::Register<LLUICtrl> r("ui_ctrl");
 
 LLUICtrl::Params::Params()
 :	tab_stop("tab_stop", true),
-- 
cgit v1.2.3