diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-06-23 16:20:34 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-06-23 16:20:34 -0600 |
| commit | cb9ce206a9d8d47c32244501f916bb79de753610 (patch) | |
| tree | 34f724b3aaa4dbdefe8fe79fd11370f9242596b3 /indra/llplugin | |
| parent | bad9314c30be88a5021f953a4aa88e68b5b094f3 (diff) | |
| parent | c0087286e78098ee246ea821aefb5686ab8bda78 (diff) | |
Merge branch 'master' 6.4.5 into DRTVWR-510
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; |