diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-08-29 08:41:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-08-29 08:41:50 -0400 |
| commit | f2353797e22120a2de2c64c3084ed3a7381eefe1 (patch) | |
| tree | 6570b495d57f0d3f815a889213197489f33c9eae /indra/llrender/llrender.cpp | |
| parent | 05913a83a5f0f7f076ad915f3de4c23330f6d32b (diff) | |
| parent | bef304c0a34bfcd7997bd7799995229ddcc1de31 (diff) | |
merge up to latest viewer-development
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(); } |