diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-02 14:56:46 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-02 14:56:46 -0800 |
| commit | 63b9bd43ff41da01d549f630bd838caff0dffd97 (patch) | |
| tree | cd5ac298ec0c2a4dc49c23ba38a084916bbcdfd9 | |
| parent | b81feb6ae7fd9d01b63999e53c5c231551d53200 (diff) | |
Repairing things that didn't quite merge properly.
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index c30ef0350f..da1cfc2074 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -743,6 +743,8 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai setNumTEs(mVolumep->getNumFaces()); return TRUE; } + + U32 old_face_mask = mVolumep->mFaceMask; S32 face_bit = 0; S32 cur_mask = 0; |