merge

1 files changed, 0 insertions, 23 deletions

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 7ad5f9608f..db1f019a81 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -761,29 +761,6 @@ U8 LLFontGL::getStyleFromString(const std::string &style)
 }
 
 // static
-std::string LLFontGL::getStringFromStyle(U8 style)
-{
-	std::string style_string;
-	if (style & NORMAL)
-	{
-		style_string += "|NORMAL";
-	}
-	if (style & BOLD)
-	{
-		style_string += "|BOLD";
-	}
-	if (style & ITALIC)
-	{
-		style_string += "|ITALIC";
-	}
-	if (style & UNDERLINE)
-	{
-		style_string += "|UNDERLINE";
-	}
-	return style_string;
-}
-
-// static
 std::string LLFontGL::nameFromFont(const LLFontGL* fontp)
 {
 	return fontp->mFontDescriptor.getName();