diff options
| author | callum <none@none> | 2011-03-25 13:56:14 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-03-25 13:56:14 -0700 |
| commit | b286a9091b66c816f12e9a98e5ae092549261904 (patch) | |
| tree | d532928a63ce6e4eafb68b7df1fd0a61790e0220 /indra/llplugin | |
| parent | 5394f5bf6024caf08cdaf228e9df5612f87aca67 (diff) | |
SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking links in web profile
Also fixes SOCIAL-521 and SOCIAL-428
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 2 | ||||
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 57f91a57ca..2103216536 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -144,6 +144,7 @@ void LLPluginClassMedia::reset() mStatusText.clear(); mProgressPercent = 0; mClickURL.clear(); + mClickNavType.clear(); mClickTarget.clear(); mClickUUID.clear(); mStatusCode = 0; @@ -1025,6 +1026,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) else if(message_name == "click_nofollow") { mClickURL = message.getValue("uri"); + mClickNavType = message.getValue("nav_type"); mClickTarget.clear(); mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_NOFOLLOW); } diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index a940633b88..cf8d8b26b9 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -226,6 +226,9 @@ public: // This is valid after MEDIA_EVENT_CLICK_LINK_HREF or MEDIA_EVENT_CLICK_LINK_NOFOLLOW std::string getClickURL() const { return mClickURL; }; + // This is valid after MEDIA_EVENT_CLICK_LINK_NOFOLLOW + std::string getClickNavType() const { return mClickNavType; }; + // This is valid after MEDIA_EVENT_CLICK_LINK_HREF std::string getClickTarget() const { return mClickTarget; }; @@ -380,6 +383,7 @@ protected: int mProgressPercent; std::string mLocation; std::string mClickURL; + std::string mClickNavType; std::string mClickTarget; std::string mClickUUID; S32 mGeometryX; |