summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-10-15 14:05:05 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-10-15 14:05:05 -0600
commit4755ccf2693e2e5f5f69ec3106256a0e1081dd95 (patch)
tree5a39a08a4b283a3b9e2f46580c95e7a330339353
parent45f93f5fbbd30cef52e61f6681e8af4795e64260 (diff)
parent6a06619777d1e19bae9618c0015ef954203e2fc2 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
-rwxr-xr-xindra/newview/llvovolume.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 818232a5c6..ae18410ed1 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1298,10 +1298,16 @@ BOOL LLVOVolume::calcLOD()
mLOD = cur_detail;
return TRUE;
}
- else
+ else if(cur_detail > MIN_LOD)
{
- return FALSE;
+ LLFace* facep = mDrawable->getFace(0);
+ if(facep && !facep->getVertexBuffer())
+ {
+ return TRUE; //force geometry update if visible object does not have vertex buffer.
+ }
}
+
+ return FALSE;
}
BOOL LLVOVolume::updateLOD()