Skip to content
Snippets Groups Projects
Commit dcbb6190 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix leak in mesh upload floater

parent 40b6d926
Branches
Tags
No related merge requests found
...@@ -133,7 +133,7 @@ mAvatarTabIndex(0) ...@@ -133,7 +133,7 @@ mAvatarTabIndex(0)
sInstance = this; sInstance = this;
mLastMouseX = 0; mLastMouseX = 0;
mLastMouseY = 0; mLastMouseY = 0;
mStatusLock = new LLMutex(); mStatusLock = std::make_unique<LLMutex>();
mModelPreview = NULL; mModelPreview = NULL;
mLODMode[LLModel::LOD_HIGH] = 0; mLODMode[LLModel::LOD_HIGH] = 0;
...@@ -314,8 +314,7 @@ LLFloaterModelPreview::~LLFloaterModelPreview() ...@@ -314,8 +314,7 @@ LLFloaterModelPreview::~LLFloaterModelPreview()
delete mModelPreview; delete mModelPreview;
} }
delete mStatusLock; mStatusLock.reset();
mStatusLock = NULL;
} }
void LLFloaterModelPreview::initModelPreview() void LLFloaterModelPreview::initModelPreview()
...@@ -1659,7 +1658,7 @@ void LLFloaterModelPreview::setCtrlLoadFromFile(S32 lod) ...@@ -1659,7 +1658,7 @@ void LLFloaterModelPreview::setCtrlLoadFromFile(S32 lod)
void LLFloaterModelPreview::setStatusMessage(const std::string& msg) void LLFloaterModelPreview::setStatusMessage(const std::string& msg)
{ {
LLMutexLock lock(mStatusLock); LLMutexLock lock(mStatusLock.get());
mStatusMessage = msg; mStatusMessage = msg;
} }
......
...@@ -201,7 +201,7 @@ class LLFloaterModelPreview final : public LLFloaterModelUploadBase ...@@ -201,7 +201,7 @@ class LLFloaterModelPreview final : public LLFloaterModelUploadBase
// 2 - use LoD above // 2 - use LoD above
S32 mLODMode[4]; S32 mLODMode[4];
LLMutex* mStatusLock; std::unique_ptr<LLMutex> mStatusLock;
LLSD mModelPhysicsFee; LLSD mModelPhysicsFee;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment