diff options
author | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
---|---|---|
committer | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
commit | 80585d56fd6ccb0875c6353c7620a8ada749d66d (patch) | |
tree | 139699b14e49609532ca717f9086f2039795801e /indra/newview/llviewermedia.h | |
parent | b0d69a20c262441125261c4949e59a8a1b9e9628 (diff) | |
parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) |
Merge master into DRTVWR-568 (and fix conflicts)
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index b95cfd4c68..f1f42afd81 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -411,6 +411,8 @@ public: void cancelMimeTypeProbe(); + bool isAttachedToHUD() const; + // Is this media attached to an avatar *not* self bool isAttachedToAnotherAvatar() const; |