diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-11-29 11:31:08 -0800 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-11-29 11:31:08 -0800 |
| commit | a12e282cd473d5b7fc3e23fdd8fdfed11cc88864 (patch) | |
| tree | cf07df2ae2219009bdc8337f4f9b4f1247fbd65d /indra/llmath/llvolume.cpp | |
| parent | 28f3b032076929bf595c34ab10666930c7ea1464 (diff) | |
| parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
merge changes for 5.0.9-release
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 b0ac3c9436..5068c9c685 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2032,13 +2032,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 ; - } } @@ -2103,9 +2098,7 @@ LLVolume::~LLVolume() sNumMeshPoints -= mMesh.size(); delete mPathp; - profile_delete_lock = 0 ; delete mProfilep; - profile_delete_lock = 1 ; mPathp = NULL; mProfilep = NULL; |