summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-10-04 10:51:30 -0700
committerBrad Linden <brad@lindenlab.com>2024-10-04 10:52:37 -0700
commit2f07279ccaf5aecc45ed9a78d337e73ab58d89a7 (patch)
treed90b74f4ec320a3bc53a889eb5ba41d18b00ab52 /indra/llui
parent16e4747dcd04c78b438570ee6dea4ccc52e7485c (diff)
parent4339ad9a528c82946ce40ec2bd240b41d104f338 (diff)
Merge remote-tracking branch 'origin/develop' into leviathan/game-control
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llstyle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp
index f1d57a2273..aafcfbc143 100644
--- a/indra/llui/llstyle.cpp
+++ b/indra/llui/llstyle.cpp
@@ -66,9 +66,9 @@ LLStyle* LLStyle::makeCopy() const
copy->mDropShadow = mDropShadow;
copy->mFontName = mFontName;
copy->mLink = mLink;
- copy->mColor = mColor;
- copy->mReadOnlyColor = mReadOnlyColor;
- copy->mSelectedColor = mSelectedColor;
+ copy->mColor.set(mColor.get());
+ copy->mReadOnlyColor.set(mReadOnlyColor.get());
+ copy->mSelectedColor.set(mSelectedColor.get());
copy->mFont = mFont;
copy->mImagep = mImagep;
copy->mAlpha = mAlpha;