summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-27 13:47:59 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-27 13:47:59 +0100
commit91288422b1ac3033050c665c9bc33161478e32f2 (patch)
treef4a3c47daa5e6dc899e28b061696c05a115db6f2 /indra
parent838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff)
parenta5c80966e72a9968e4588001c1d742ae13df8992 (diff)
merge
Diffstat (limited to 'indra')
-rw-r--r--indra/llrender/llrender.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 3a89b999bd..e1f6964f83 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -895,9 +895,7 @@ LLVector3 LLRender::getUITranslation()
{
if (mUIOffset.empty())
{
- //llassert(!mUIOffset.empty());
- llwarns << "UI offset stack empty." << llendl;
- return LLVector3(0,0,0);
+ llerrs << "UI offset stack empty." << llendl;
}
return mUIOffset.back();
}
@@ -906,9 +904,7 @@ LLVector3 LLRender::getUIScale()
{
if (mUIScale.empty())
{
- //llassert(!mUIScale.empty());
- llwarns << "UI scale stack empty." << llendl;
- return LLVector3(1,1,1);
+ llerrs << "UI scale stack empty." << llendl;
}
return mUIScale.back();
}