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
658a30bd
Commit
658a30bd
authored
3 years ago
by
David Parks
Browse files
Options
Downloads
Patches
Plain Diff
SL-16907 Potential fix for crash in updateSkinInfoMatrixPalette
parent
85e48061
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!83
Merge Linden 6.6.7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/lldrawpoolalpha.cpp
+1
-1
1 addition, 1 deletion
indra/newview/lldrawpoolalpha.cpp
indra/newview/llspatialpartition.h
+3
-1
3 additions, 1 deletion
indra/newview/llspatialpartition.h
with
4 additions
and
2 deletions
indra/newview/lldrawpoolalpha.cpp
+
1
−
1
View file @
658a30bd
...
@@ -795,7 +795,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged)
...
@@ -795,7 +795,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged)
bool
LLDrawPoolAlpha
::
uploadMatrixPalette
(
const
LLDrawInfo
&
params
)
bool
LLDrawPoolAlpha
::
uploadMatrixPalette
(
const
LLDrawInfo
&
params
)
{
{
const
LLVOAvatar
::
MatrixPaletteCache
&
mpc
=
params
.
mAvatar
->
updateSkinInfoMatrixPalette
(
params
.
mSkinInfo
);
const
LLVOAvatar
::
MatrixPaletteCache
&
mpc
=
params
.
mAvatar
.
get
()
->
updateSkinInfoMatrixPalette
(
params
.
mSkinInfo
);
U32
count
=
mpc
.
mMatrixPalette
.
size
();
U32
count
=
mpc
.
mMatrixPalette
.
size
();
if
(
count
==
0
)
if
(
count
==
0
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llspatialpartition.h
+
3
−
1
View file @
658a30bd
...
@@ -40,6 +40,8 @@
...
@@ -40,6 +40,8 @@
#include
"llface.h"
#include
"llface.h"
#include
"llviewercamera.h"
#include
"llviewercamera.h"
#include
"llvector4a.h"
#include
"llvector4a.h"
#include
"llvoavatar.h"
#include
<queue>
#include
<queue>
#include
<unordered_map>
#include
<unordered_map>
...
@@ -125,7 +127,7 @@ class LLDrawInfo : public LLRefCount
...
@@ -125,7 +127,7 @@ class LLDrawInfo : public LLRefCount
F32
mAlphaMaskCutoff
;
F32
mAlphaMaskCutoff
;
U8
mDiffuseAlphaMode
;
U8
mDiffuseAlphaMode
;
bool
mSelected
;
bool
mSelected
;
LLVOAvatar
*
mAvatar
=
nullptr
;
LLPointer
<
LLVOAvatar
>
mAvatar
=
nullptr
;
LLMeshSkinInfo
*
mSkinInfo
=
nullptr
;
LLMeshSkinInfo
*
mSkinInfo
=
nullptr
;
...
...
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