diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
| commit | cc0a4bf6acafe759baaccea65022c963373ea012 (patch) | |
| tree | d4fe1f1e34b1ab0d140a37c1f80d09034824d3e8 /indra/llmath/llvolumemgr.cpp | |
| parent | 11e506f2eb979a5ddfc3ca6f9c626771ab012a78 (diff) | |
| parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) | |
Merge. Pull viewer-development in prior to filing DRTVWR merge request.
Diffstat (limited to 'indra/llmath/llvolumemgr.cpp')
| -rw-r--r-- | indra/llmath/llvolumemgr.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llmath/llvolumemgr.cpp b/indra/llmath/llvolumemgr.cpp index c60b750088..9083273ee5 100644 --- a/indra/llmath/llvolumemgr.cpp +++ b/indra/llmath/llvolumemgr.cpp @@ -26,7 +26,6 @@ #include "linden_common.h" #include "llvolumemgr.h" -#include "llmemtype.h" #include "llvolume.h" @@ -182,7 +181,6 @@ void LLVolumeMgr::insertGroup(LLVolumeLODGroup* volgroup) // protected LLVolumeLODGroup* LLVolumeMgr::createNewGroup(const LLVolumeParams& volume_params) { - LLMemType m1(LLMemType::MTYPE_VOLUME); LLVolumeLODGroup* volgroup = new LLVolumeLODGroup(volume_params); insertGroup(volgroup); return volgroup; @@ -297,7 +295,6 @@ LLVolume* LLVolumeLODGroup::refLOD(const S32 detail) mRefs++; if (mVolumeLODs[detail].isNull()) { - LLMemType m1(LLMemType::MTYPE_VOLUME); mVolumeLODs[detail] = new LLVolume(mVolumeParams, mDetailScales[detail]); } mLODRefs[detail]++; |