diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-10-11 10:59:17 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-10-11 10:59:17 -0400 |
| commit | 704c53b3c506c1274981b3e1ca5a22c16e4fbbb4 (patch) | |
| tree | 258785e6ebcd41009e6ef160a5d7b8e9ed218f94 /indra/newview/llfloaterwebcontent.h | |
| parent | eb8961235f7dcb03e3fe8ae2d02929d97cc5d7d7 (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
MAINT-5232: Merge up to VLC viewer from viewer-release
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
| -rw-r--r-- | indra/newview/llfloaterwebcontent.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 4291fd9f2c..0bf93504c2 100644 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -58,7 +58,8 @@ public: allow_back_forward_navigation, trusted_content, show_page_title, - clean_browser; + clean_browser, + dev_mode; Optional<LLRect> preferred_media_size; _Params(); @@ -92,6 +93,7 @@ protected: void onClickStop(); void onEnterAddress(); void onPopExternal(); + void onTestURL(std::string url); static void preCreate(Params& p); void open_media(const Params& ); @@ -113,6 +115,7 @@ protected: std::string mUUID; bool mShowPageTitle; bool mAllowNavigation; + bool mDevelopMode; }; #endif // LL_LLFLOATERWEBCONTENT_H |