summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorcallum <none@none>2010-12-02 14:50:57 -0800
committercallum <none@none>2010-12-02 14:50:57 -0800
commita991bd7f90157a9cc661ef17a6f96e8473e3bd58 (patch)
tree9b17a955d93398cc6e499fbbb531a6104ffa3453 /indra/llplugin
parentadb62e958ff3a4be2eb43fbb1754358ec60a118c (diff)
SOCIAL-311 FIX Media browser has too many oddities to be useful for viewer web apps
Completes MVP
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/llpluginclassmedia.cpp4
-rw-r--r--indra/llplugin/llpluginclassmedia.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index de4456aa4e..e6c901dd5c 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -1049,8 +1049,8 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
}
else if(message_name == "link_hovered")
{
- // Link and text are not currently used -- the tooltip hover text is taken from the "title".
- // message.getValue("link");
+ // text is not currently used -- the tooltip hover text is taken from the "title".
+ mHoverLink = message.getValue("link");
mHoverText = message.getValue("title");
// message.getValue("text");
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index fa4dc2b43f..abc472f501 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -242,8 +242,9 @@ public:
std::string getAuthURL() const { return mAuthURL; };
std::string getAuthRealm() const { return mAuthRealm; };
- // This is valid during MEDIA_EVENT_LINK_HOVERED
+ // These are valid during MEDIA_EVENT_LINK_HOVERED
std::string getHoverText() const { return mHoverText; };
+ std::string getHoverLink() const { return mHoverLink; };
std::string getMediaName() const { return mMediaName; };
std::string getMediaDescription() const { return mMediaDescription; };
@@ -385,6 +386,7 @@ protected:
std::string mAuthURL;
std::string mAuthRealm;
std::string mHoverText;
+ std::string mHoverLink;
/////////////////////////////////////////
// media_time class