From 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 26 Aug 2010 13:09:55 +0100
Subject: [PATCH] lame-but-effective workaround for self-editing UI bug, until
the right fix is ready.
---
indra/llrender/llrender.cpp | 8 ++++++--
1 file 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();
}
--
GitLab