Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
dcbb6190
Commit
dcbb6190
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix leak in mesh upload floater
parent
40b6d926
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llfloatermodelpreview.cpp
+3
-4
3 additions, 4 deletions
indra/newview/llfloatermodelpreview.cpp
indra/newview/llfloatermodelpreview.h
+1
-1
1 addition, 1 deletion
indra/newview/llfloatermodelpreview.h
with
4 additions
and
5 deletions
indra/newview/llfloatermodelpreview.cpp
+
3
−
4
View file @
dcbb6190
...
@@ -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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfloatermodelpreview.h
+
1
−
1
View file @
dcbb6190
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment