diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:36:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:36:30 -0400 |
| commit | 176b8861742e3f80eddbf4d15b9cb21390b21088 (patch) | |
| tree | 783fad5e2fdb9737652b791ec4b97ed1eeec35ca /indra/llprimitive/llprimitive.cpp | |
| parent | d2fa5a53e8b91bd0aba10ab3917c722dc360b610 (diff) | |
| parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) | |
merge changes for 5.1.5-release
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index bfa65666b5..edf7c41e40 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -732,6 +732,16 @@ S32 face_index_from_id(LLFaceID face_ID, const std::vector<LLProfile::Face>& fac BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume) { + if (NO_LOD == detail) + { + // build the new object + setChanged(GEOMETRY); + sVolumeManager->unrefVolume(mVolumep); + mVolumep = new LLVolume(volume_params, 1, TRUE, TRUE); + setNumTEs(mVolumep->getNumFaces()); + return FALSE; + } + LLVolume *volumep; if (unique_volume) { |