diff options
| author | Richard Linden <none@none> | 2012-11-19 19:06:36 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-19 19:06:36 -0800 |
| commit | c0224cc47a2994956f20e8f65177b60cc709e434 (patch) | |
| tree | 01d305fff69ca9cec713631d04aa76a4a33c79ca /indra/llmath/llvolumemgr.cpp | |
| parent | 2d1a903d39a971775436ba4e1dfb7f630226c15c (diff) | |
| parent | 6db6cb39f41e921e75970d1570a74cf35d353a35 (diff) | |
merge with viewer-development
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]++; |