Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
JennaHuntsman
XDG Integration
Commits
f55f974b
Commit
f55f974b
authored
2 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Warning fixes
parent
1288d593
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/newview/llvograss.h
+2
-2
2 additions, 2 deletions
indra/newview/llvograss.h
indra/newview/llvosurfacepatch.h
+2
-2
2 additions, 2 deletions
indra/newview/llvosurfacepatch.h
indra/newview/llvowater.h
+1
-1
1 addition, 1 deletion
indra/newview/llvowater.h
with
5 additions
and
5 deletions
indra/newview/llvograss.h
+
2
−
2
View file @
f55f974b
...
@@ -43,7 +43,7 @@ class LLVOGrass final : public LLAlphaObject
...
@@ -43,7 +43,7 @@ class LLVOGrass final : public LLAlphaObject
static
void
initClass
();
static
void
initClass
();
static
void
cleanupClass
();
static
void
cleanupClass
();
virtual
U32
getPartitionType
()
const
;
U32
getPartitionType
()
const
override
;
/*virtual*/
U32
processUpdateMessage
(
LLMessageSystem
*
mesgsys
,
/*virtual*/
U32
processUpdateMessage
(
LLMessageSystem
*
mesgsys
,
void
**
user_data
,
void
**
user_data
,
...
@@ -65,7 +65,7 @@ class LLVOGrass final : public LLAlphaObject
...
@@ -65,7 +65,7 @@ class LLVOGrass final : public LLAlphaObject
LLStrider
<
LLColor4U
>&
emissivep
,
LLStrider
<
LLColor4U
>&
emissivep
,
LLStrider
<
U16
>&
indicesp
);
LLStrider
<
U16
>&
indicesp
);
void
updateFaceSize
(
S32
idx
)
{
}
void
updateFaceSize
(
S32
idx
)
override
{
}
/*virtual*/
void
updateTextures
();
/*virtual*/
void
updateTextures
();
/*virtual*/
BOOL
updateLOD
();
/*virtual*/
BOOL
updateLOD
();
/*virtual*/
void
setPixelAreaAndAngle
(
LLAgent
&
agent
);
// generate accurate apparent angle and area
/*virtual*/
void
setPixelAreaAndAngle
(
LLAgent
&
agent
);
// generate accurate apparent angle and area
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llvosurfacepatch.h
+
2
−
2
View file @
f55f974b
...
@@ -53,13 +53,13 @@ class LLVOSurfacePatch final : public LLStaticViewerObject
...
@@ -53,13 +53,13 @@ class LLVOSurfacePatch final : public LLStaticViewerObject
/*virtual*/
void
markDead
()
override
;
/*virtual*/
void
markDead
()
override
;
virtual
U32
getPartitionType
()
const
;
virtual
U32
getPartitionType
()
const
override
;
/*virtual*/
LLDrawable
*
createDrawable
(
LLPipeline
*
pipeline
)
override
;
/*virtual*/
LLDrawable
*
createDrawable
(
LLPipeline
*
pipeline
)
override
;
/*virtual*/
void
updateGL
()
override
;
/*virtual*/
void
updateGL
()
override
;
/*virtual*/
BOOL
updateGeometry
(
LLDrawable
*
drawable
)
override
;
/*virtual*/
BOOL
updateGeometry
(
LLDrawable
*
drawable
)
override
;
/*virtual*/
BOOL
updateLOD
()
override
;
/*virtual*/
BOOL
updateLOD
()
override
;
/*virtual*/
void
updateFaceSize
(
S32
idx
);
/*virtual*/
void
updateFaceSize
(
S32
idx
)
override
;
void
getGeometry
(
LLStrider
<
LLVector3
>
&
verticesp
,
void
getGeometry
(
LLStrider
<
LLVector3
>
&
verticesp
,
LLStrider
<
LLVector3
>
&
normalsp
,
LLStrider
<
LLVector3
>
&
normalsp
,
LLStrider
<
LLVector2
>
&
texCoords0p
,
LLStrider
<
LLVector2
>
&
texCoords0p
,
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llvowater.h
+
1
−
1
View file @
f55f974b
...
@@ -89,7 +89,7 @@ class LLVOVoidWater final : public LLVOWater
...
@@ -89,7 +89,7 @@ class LLVOVoidWater final : public LLVOWater
mRenderType
=
LLPipeline
::
RENDER_TYPE_VOIDWATER
;
mRenderType
=
LLPipeline
::
RENDER_TYPE_VOIDWATER
;
}
}
/*virtual*/
U32
getPartitionType
()
const
;
/*virtual*/
U32
getPartitionType
()
const
override
;
};
};
...
...
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