diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-06-01 01:18:47 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-06-01 01:18:47 +0300 |
| commit | 9437d1511e2c4b73a58abc823b1ca2a29a8a4d04 (patch) | |
| tree | e6b24dafcbf54d6145a44784ed4defdbbd3335c8 /indra/llprimitive/llprimitive.cpp | |
| parent | fadb6c7c65f4d531f513d5d896ca25b9bb22b48f (diff) | |
| parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) | |
merge from viewer-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) { |