diff options
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
-rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 754ea5c88b..1f548f8cc0 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -41,16 +41,16 @@ class LLPluginClassMedia : public LLPluginProcessParentOwner LOG_CLASS(LLPluginClassMedia); public: LLPluginClassMedia(LLPluginClassMediaOwner *owner); - virtual ~LLPluginClassMedia(); + ~LLPluginClassMedia(); // local initialization, called by the media manager when creating a source - virtual bool init(const std::string &launcher_filename, + bool init(const std::string &launcher_filename, const std::string &plugin_dir, const std::string &plugin_filename, bool debug); // undoes everything init() didm called by the media manager when destroying a source - virtual void reset(); + void reset(); void idle(void); @@ -212,7 +212,7 @@ public: void browse_forward(); void browse_back(); void setBrowserUserAgent(const std::string& user_agent); - void showWebInspector( bool show );
+ void showWebInspector( bool show ); void proxyWindowOpened(const std::string &target, const std::string &uuid); void proxyWindowClosed(const std::string &uuid); void ignore_ssl_cert_errors(bool ignore); @@ -247,9 +247,9 @@ public: // This is valid during MEDIA_EVENT_CLICK_LINK_HREF and MEDIA_EVENT_GEOMETRY_CHANGE std::string getClickUUID() const { return mClickUUID; }; -
- // These are valid during MEDIA_EVENT_DEBUG_MESSAGE
- std::string getDebugMessageText() const { return mDebugMessageText; };
+ + // These are valid during MEDIA_EVENT_DEBUG_MESSAGE + std::string getDebugMessageText() const { return mDebugMessageText; }; std::string getDebugMessageLevel() const { return mDebugMessageLevel; }; // This is valid after MEDIA_EVENT_NAVIGATE_ERROR_PAGE @@ -403,7 +403,7 @@ protected: std::string mClickNavType; std::string mClickTarget; std::string mClickUUID; - std::string mDebugMessageText;
+ std::string mDebugMessageText; std::string mDebugMessageLevel; S32 mGeometryX; S32 mGeometryY; |