diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-06-23 22:03:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-06-23 22:03:43 -0400 |
| commit | 77cf4588dfa0213b8166b5575868df75b411a824 (patch) | |
| tree | 101bf94283b5e1967b0458e16ca21e62e80c1361 /indra/llplugin | |
| parent | f627140cf11232bab11fdfaf66c78544cf44f3e8 (diff) | |
| parent | c0087286e78098ee246ea821aefb5686ab8bda78 (diff) | |
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
following release of D512.
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 85197d1272..58069afdf9 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -1138,6 +1138,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) mDebugMessageLevel = message.getValue("message_level"); mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_DEBUG_MESSAGE); } + else if (message_name == "tooltip_text") + { + mHoverText = message.getValue("tooltip"); + } else { LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; |