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
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
Alchemy Archive
Alchemy Viewer
Commits
719923fd
Commit
719923fd
authored
5 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Cache parcel overlay color lookup in statics
parent
c0e035a1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llviewerparceloverlay.cpp
+11
-11
11 additions, 11 deletions
indra/newview/llviewerparceloverlay.cpp
with
11 additions
and
11 deletions
indra/newview/llviewerparceloverlay.cpp
+
11
−
11
View file @
719923fd
...
@@ -340,12 +340,12 @@ void LLViewerParcelOverlay::updateOverlayTexture()
...
@@ -340,12 +340,12 @@ void LLViewerParcelOverlay::updateOverlayTexture()
{
{
return
;
return
;
}
}
const
LLColor4U
avail
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAvail"
).
get
();
static
const
LLColor4U
avail
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAvail"
).
get
();
const
LLColor4U
owned
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorOther"
).
get
();
static
const
LLColor4U
owned
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorOther"
).
get
();
const
LLColor4U
group
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorGroup"
).
get
();
static
const
LLColor4U
group
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorGroup"
).
get
();
const
LLColor4U
self
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorSelf"
).
get
();
static
const
LLColor4U
self
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorSelf"
).
get
();
const
LLColor4U
for_sale
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorForSale"
).
get
();
static
const
LLColor4U
for_sale
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorForSale"
).
get
();
const
LLColor4U
auction
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAuction"
).
get
();
static
const
LLColor4U
auction
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAuction"
).
get
();
// Create the base texture.
// Create the base texture.
U8
*
raw
=
mImageRaw
->
getData
();
U8
*
raw
=
mImageRaw
->
getData
();
...
@@ -454,11 +454,11 @@ void LLViewerParcelOverlay::updatePropertyLines()
...
@@ -454,11 +454,11 @@ void LLViewerParcelOverlay::updatePropertyLines()
S32
row
,
col
;
S32
row
,
col
;
const
LLColor4U
self_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorSelf"
).
get
();
static
const
LLColor4U
self_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorSelf"
).
get
();
const
LLColor4U
other_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorOther"
).
get
();
static
const
LLColor4U
other_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorOther"
).
get
();
const
LLColor4U
group_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorGroup"
).
get
();
static
const
LLColor4U
group_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorGroup"
).
get
();
const
LLColor4U
for_sale_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorForSale"
).
get
();
static
const
LLColor4U
for_sale_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorForSale"
).
get
();
const
LLColor4U
auction_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAuction"
).
get
();
static
const
LLColor4U
auction_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAuction"
).
get
();
// Build into dynamic arrays, then copy into static arrays.
// Build into dynamic arrays, then copy into static arrays.
std
::
vector
<
LLVector3
>
new_vertex_array
;
std
::
vector
<
LLVector3
>
new_vertex_array
;
...
...
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