diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-11-29 23:40:12 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-11-29 23:40:12 +0000 |
| commit | 5c7f27562dc1ef449f23be5ab747a19c23eec361 (patch) | |
| tree | 658416eb1f85eaa96dbc9a4a9762b0029e520476 /indra/llmath/llvolume.cpp | |
| parent | 84b6bce4ee9299454aca75d8f876b6582b756ff6 (diff) | |
| parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
merge
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index bc584a2188..f9d24be055 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2031,13 +2031,8 @@ void LLPathParams::copyParams(const LLPathParams ¶ms) setSkew(params.getSkew()); } -S32 profile_delete_lock = 1 ; LLProfile::~LLProfile() { - if(profile_delete_lock) - { - LL_ERRS() << "LLProfile should not be deleted here!" << LL_ENDL ; - } } @@ -2102,9 +2097,7 @@ LLVolume::~LLVolume() sNumMeshPoints -= mMesh.size(); delete mPathp; - profile_delete_lock = 0 ; delete mProfilep; - profile_delete_lock = 1 ; mPathp = NULL; mProfilep = NULL; |