Skip to content

Commit f96fc21

Browse files
committed
Fix LLMediaEntry unit tests and copy constructor for transparent_background.
Add transparent_background field to DEFAULT_MEDIA_ENTRY, EMPTY_MEDIA_ENTRY, and PARTIAL_MEDIA_ENTRY tests. Fix copy constructor missing mTransparentBackground.
1 parent 19dcd0a commit f96fc21

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

indra/llprimitive/llmediaentry.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ LLMediaEntry::LLMediaEntry(const LLMediaEntry &rhs) :
127127
// "permissions" fields
128128
mPermsInteract = rhs.mPermsInteract;
129129
mPermsControl = rhs.mPermsControl;
130+
131+
// "display" fields
132+
mTransparentBackground = rhs.mTransparentBackground;
130133
}
131134

132135
LLMediaEntry::~LLMediaEntry()

indra/llprimitive/tests/llmediaentry_test.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
<integer>7</integer>\n\
6363
<key>perms_interact</key>\n\
6464
<integer>7</integer>\n\
65+
<key>transparent_background</key>\n\
66+
<boolean>0</boolean>\n\
6567
<key>whitelist_enable</key>\n\
6668
<boolean>0</boolean>\n\
6769
<key>width_pixels</key>\n\
@@ -95,6 +97,8 @@
9597
<integer>0</integer>\n\
9698
<key>perms_interact</key>\n\
9799
<integer>0</integer>\n\
100+
<key>transparent_background</key>\n\
101+
<boolean>0</boolean>\n\
98102
<key>whitelist_enable</key>\n\
99103
<boolean>0</boolean>\n\
100104
<key>width_pixels</key>\n\
@@ -128,6 +132,8 @@
128132
<integer>0</integer>\n\
129133
<key>perms_interact</key>\n\
130134
<integer>0</integer>\n\
135+
<key>transparent_background</key>\n\
136+
<boolean>0</boolean>\n\
131137
<key>whitelist_enable</key>\n\
132138
<boolean>0</boolean>\n\
133139
<key>width_pixels</key>\n\

0 commit comments

Comments
 (0)