summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2009-11-05 19:58:10 -0600
committerDave Parks <davep@lindenlab.com>2009-11-05 19:58:10 -0600
commit10069e0e13e3214ba9320fdce915440b2e12f938 (patch)
tree86a8845155728fb847efbeb3b9b03ffd3cf68763 /indra/llprimitive
parent1c495c56c1011f4514d96b75cbcfb5a8256de78f (diff)
Fix for prims all being 0 lod.
Fix for dangling prim references.
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/llprimitive.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 52265e7ad5..340f60ed1a 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -744,7 +744,10 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
return TRUE;
}
-#if 0
+#if 0
+ // #if 0'd out by davep
+ // this is a lot of cruft to set texture entry values that just stay the same for LOD switch
+ // or immediately get overridden by an object update message, also crashes occasionally
U32 old_face_mask = mVolumep->mFaceMask;
S32 face_bit = 0;
@@ -943,6 +946,9 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
}
}
#else
+ // build the new object
+ sVolumeManager->unrefVolume(mVolumep);
+ mVolumep = volumep;
setNumTEs(mVolumep->getNumFaces());
#endif
return TRUE;