From 1aa0416aef379bb3ad1012441588b6d7fab81b40 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Fri, 13 Mar 2009 21:28:40 +0000
Subject: svn merge -r114093:114412
 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
 Melinda (coco): 5th and final batch of featurettes. My work here is done.

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

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

diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
index 7640972d42..88fddd9336 100644
--- a/indra/newview/lltoolplacer.cpp
+++ b/indra/newview/lltoolplacer.cpp
@@ -608,7 +608,7 @@ void LLToolPlacerPanel::addButton( const std::string& up_state, const std::strin
 		down_state,
 		LLStringUtil::null, &LLToolPlacerPanel::setObjectType,
 		pcode,
-		LLFontGL::sSansSerif);
+		LLFontGL::getFontSansSerif());
 	btn->setFollowsBottom();
 	btn->setFollowsLeft();
 	addChild(btn);
-- 
cgit v1.3