diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-08-30 06:38:44 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-08-30 06:38:44 -0400 |
| commit | d84c6625c707b5d61b71749b74f3cc4fb8f02048 (patch) | |
| tree | 7a31d44dfbd4e8244a9ee4f9504fe45ac3280482 /indra/llrender/llrender.cpp | |
| parent | c4acbaf7c4120d4dc6154420c992e3942fd25df3 (diff) | |
| parent | b0bf8b9619ec89a37bfc7d8d9e7f7d49904dfb02 (diff) | |
Automated merge with http://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 3a89b999bd..e26acd53a3 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); + return LLVector3::zero; } 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); + return LLVector3(1.f, 1.f, 1.f); } return mUIScale.back(); } |