diff options
| author | Richard Linden <none@none> | 2011-03-23 19:34:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-23 19:34:15 -0700 |
| commit | fdf63ba0753fcfc17aa6939836c7835787293b3c (patch) | |
| tree | cd2bbbad8c1bd8b901a755b81f9cbb78f0bdee43 /indra/llplugin/llpluginclassmedia.h | |
| parent | 501e282ee03e6d53c16c421d8b49f8bed3e74ef3 (diff) | |
| parent | 9c82ea334ab0c1283f28997fe060b24200e3e2be (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 618e928a08..a940633b88 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -199,7 +199,6 @@ public: void browse_reload(bool ignore_cache = false); void browse_forward(); void browse_back(); - void set_status_redirect(int code, const std::string &url); void setBrowserUserAgent(const std::string& user_agent); void proxyWindowOpened(const std::string &target, const std::string &uuid); void proxyWindowClosed(const std::string &uuid); @@ -232,6 +231,9 @@ public: // This is valid during MEDIA_EVENT_CLICK_LINK_HREF and MEDIA_EVENT_GEOMETRY_CHANGE std::string getClickUUID() const { return mClickUUID; }; + + // This is valid after MEDIA_EVENT_NAVIGATE_ERROR_PAGE + S32 getStatusCode() const { return mStatusCode; }; // These are valid during MEDIA_EVENT_GEOMETRY_CHANGE S32 getGeometryX() const { return mGeometryX; }; @@ -384,6 +386,7 @@ protected: S32 mGeometryY; S32 mGeometryWidth; S32 mGeometryHeight; + S32 mStatusCode; std::string mAuthURL; std::string mAuthRealm; std::string mHoverText; |