summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-08-31 19:55:19 -0400
committerLoren Shih <seraph@lindenlab.com>2010-08-31 19:55:19 -0400
commit704405903f8d1606ef98df76d37c83931e5368ab (patch)
tree7a970bcfad80962c4d0e96e9351ed718da687dff /indra/llrender
parent85d659f44d2badfd42ee9b1ae7cd0971806672d4 (diff)
parent3cabca8df62ae8ee815dd7d885f14f5a7d0ea98d (diff)
pull from viewer-development
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llrender.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index e1f6964f83..e26acd53a3 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -895,7 +895,7 @@ LLVector3 LLRender::getUITranslation()
{
if (mUIOffset.empty())
{
- llerrs << "UI offset stack empty." << llendl;
+ return LLVector3::zero;
}
return mUIOffset.back();
}
@@ -904,7 +904,7 @@ LLVector3 LLRender::getUIScale()
{
if (mUIScale.empty())
{
- llerrs << "UI scale stack empty." << llendl;
+ return LLVector3(1.f, 1.f, 1.f);
}
return mUIScale.back();
}