diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:05:53 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:05:53 -0700 |
| commit | 011c3686a6e10edfe40adb67105298033188c1d6 (patch) | |
| tree | 8e45584e245d4f31429703a52da2bf0124d93d04 /indra/llrender/llrender.cpp | |
| parent | bd708f82bd3b87051e03a2794ce417ae6f432c08 (diff) | |
| parent | a11a8c4027eb949c8a33951b9e8c7475e59a2eeb (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 64238b2008..eb2c54198d 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -901,7 +901,7 @@ LLVector3 LLRender::getUITranslation() { if (mUIOffset.empty()) { - llerrs << "UI offset stack empty." << llendl; + return LLVector3::zero; } return mUIOffset.back(); } @@ -910,7 +910,7 @@ LLVector3 LLRender::getUIScale() { if (mUIScale.empty()) { - llerrs << "UI scale stack empty." << llendl; + return LLVector3(1.f, 1.f, 1.f); } return mUIScale.back(); } |