diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:35:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:35:29 -0400 |
commit | 96adfcfaedb2304661df15223a3df7f701b73493 (patch) | |
tree | 484b3b99cc411a394694721f5b309f07839f1a2a /indra/newview/llviewerobject.cpp | |
parent | 40e14802e3f5bc78546c8ed38fb1a28e46b0dd7c (diff) | |
parent | f41cbc0ac85ae328f2701aab23e94c0ef7ab5758 (diff) |
merge changes for vwr-25269
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; |