diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
commit | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (patch) | |
tree | 73ffbc468a65c2d4ed4c0dede4e24ad9e7cd69fd /indra/newview/llviewerobject.cpp | |
parent | a248ed2a2ccb89c9716f8657ef3c52269518c909 (diff) | |
parent | 60bceb759b592348b403689ffa8ed9c768126f8b (diff) |
merge changes for storm-1057
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r-- | indra/newview/llviewerobject.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 32cd8dbb39..e8828e63a9 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -469,11 +469,6 @@ void LLViewerObject::initVOClasses() // Initialized shared class stuff first. LLVOAvatar::initClass(); LLVOTree::initClass(); - if (gNoRender) - { - // Don't init anything else in drone mode - return; - } llinfos << "Viewer Object size: " << sizeof(LLViewerObject) << llendl; LLVOGrass::initClass(); LLVOWater::initClass(); @@ -2150,12 +2145,6 @@ BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) } } - if (gNoRender) - { - // Skip drawable stuff if not rendering. - return TRUE; - } - updateDrawable(FALSE); return TRUE; |