summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-26 13:09:55 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-26 13:09:55 +0100
commit1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (patch)
tree83f6029843aeed8fc3dada79af115165ac3c3967 /indra
parenta1d010293d5a72fe31c927cd8fcc5e306cd964b0 (diff)
lame-but-effective workaround for self-editing UI bug, until the right fix is ready.
Diffstat (limited to 'indra')
-rw-r--r--indra/llrender/llrender.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index e1f6964f83..3a89b999bd 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -895,7 +895,9 @@ LLVector3 LLRender::getUITranslation()
{
if (mUIOffset.empty())
{
- llerrs << "UI offset stack empty." << llendl;
+ //llassert(!mUIOffset.empty());
+ llwarns << "UI offset stack empty." << llendl;
+ return LLVector3(0,0,0);
}
return mUIOffset.back();
}
@@ -904,7 +906,9 @@ LLVector3 LLRender::getUIScale()
{
if (mUIScale.empty())
{
- llerrs << "UI scale stack empty." << llendl;
+ //llassert(!mUIScale.empty());
+ llwarns << "UI scale stack empty." << llendl;
+ return LLVector3(1,1,1);
}
return mUIScale.back();
}