Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Testicular Slingshot
Alchemy Viewer
Commits
719923fd
Commit
719923fd
authored
Feb 19, 2020
by
Rye Mutt
🍞
Browse files
Cache parcel overlay color lookup in statics
parent
c0e035a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
indra/newview/llviewerparceloverlay.cpp
View file @
719923fd
...
...
@@ -340,12 +340,12 @@ void LLViewerParcelOverlay::updateOverlayTexture()
{
return
;
}
const
LLColor4U
avail
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAvail"
).
get
();
const
LLColor4U
owned
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorOther"
).
get
();
const
LLColor4U
group
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorGroup"
).
get
();
const
LLColor4U
self
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorSelf"
).
get
();
const
LLColor4U
for_sale
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorForSale"
).
get
();
const
LLColor4U
auction
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAuction"
).
get
();
static
const
LLColor4U
avail
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAvail"
).
get
();
static
const
LLColor4U
owned
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorOther"
).
get
();
static
const
LLColor4U
group
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorGroup"
).
get
();
static
const
LLColor4U
self
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorSelf"
).
get
();
static
const
LLColor4U
for_sale
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorForSale"
).
get
();
static
const
LLColor4U
auction
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAuction"
).
get
();
// Create the base texture.
U8
*
raw
=
mImageRaw
->
getData
();
...
...
@@ -454,11 +454,11 @@ void LLViewerParcelOverlay::updatePropertyLines()
S32
row
,
col
;
const
LLColor4U
self_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorSelf"
).
get
();
const
LLColor4U
other_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorOther"
).
get
();
const
LLColor4U
group_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorGroup"
).
get
();
const
LLColor4U
for_sale_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorForSale"
).
get
();
const
LLColor4U
auction_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAuction"
).
get
();
static
const
LLColor4U
self_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorSelf"
).
get
();
static
const
LLColor4U
other_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorOther"
).
get
();
static
const
LLColor4U
group_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorGroup"
).
get
();
static
const
LLColor4U
for_sale_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorForSale"
).
get
();
static
const
LLColor4U
auction_coloru
=
LLUIColorTable
::
instance
().
getColor
(
"PropertyColorAuction"
).
get
();
// Build into dynamic arrays, then copy into static arrays.
std
::
vector
<
LLVector3
>
new_vertex_array
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment