aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llfontgl.cpp
diff options
context:
space:
mode:
authorRobin Cornelius2010-10-10 22:10:33 +0100
committerRobin Cornelius2010-10-10 22:10:33 +0100
commitb3b30285126289f54b57bd42569bb0721e40e088 (patch)
treef4aaccb98d1a835c4ea376ec2803fc410a704052 /linden/indra/llrender/llfontgl.cpp
parentMerge branch 'mccabe-plugins' into plugins_merge (diff)
downloadmeta-impy-b3b30285126289f54b57bd42569bb0721e40e088.zip
meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.gz
meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.bz2
meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.xz
Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system"
This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d. Conflicts: linden/indra/newview/llsurface.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h
Diffstat (limited to '')
-rw-r--r--linden/indra/llrender/llfontgl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 9d1f1d4..5d3d6a7 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -121,7 +121,7 @@ LLFontGL::LLFontGL()
121 121
122LLFontGL::LLFontGL(const LLFontGL &source) 122LLFontGL::LLFontGL(const LLFontGL &source)
123{ 123{
124 llwarns << "Not implemented!" << llendl; 124 llerrs << "Not implemented!" << llendl;
125} 125}
126 126
127LLFontGL::~LLFontGL() 127LLFontGL::~LLFontGL()
@@ -278,7 +278,7 @@ void LLFontGL::destroyGL()
278 278
279LLFontGL &LLFontGL::operator=(const LLFontGL &source) 279LLFontGL &LLFontGL::operator=(const LLFontGL &source)
280{ 280{
281 llwarns << "Not implemented" << llendl; 281 llerrs << "Not implemented" << llendl;
282 return *this; 282 return *this;
283} 283}
284 284
@@ -584,7 +584,7 @@ S32 LLFontGL::render(const LLWString &wstr,
584 const LLFontGlyphInfo* fgi= getGlyphInfo(wch); 584 const LLFontGlyphInfo* fgi= getGlyphInfo(wch);
585 if (!fgi) 585 if (!fgi)
586 { 586 {
587 llwarns << "Missing Glyph Info" << llendl; 587 llerrs << "Missing Glyph Info" << llendl;
588 break; 588 break;
589 } 589 }
590 // Per-glyph bitmap texture. 590 // Per-glyph bitmap texture.