summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterwebcontent.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-05-15 09:07:21 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-05-15 09:07:21 -0400
commit5d43bc166d011e911e0492579b2f4f8bf015b48f (patch)
treeccc4cda5c2c2c3a5689f4a33dcfda2a896f21b8c /indra/newview/llfloaterwebcontent.h
parenta3f2cacf542e1d770698ef6c7e6ea1c0a5cd3368 (diff)
parente7eced3c87310b15ac20cc3cd470d67686104a14 (diff)
Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
-rw-r--r--indra/newview/llfloaterwebcontent.h124
1 files changed, 62 insertions, 62 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h
index 0bf93504c2..e4f8cf4279 100644
--- a/indra/newview/llfloaterwebcontent.h
+++ b/indra/newview/llfloaterwebcontent.h
@@ -38,84 +38,84 @@ class LLProgressBar;
class LLIconCtrl;
class LLFloaterWebContent :
- public LLFloater,
- public LLViewerMediaObserver,
- public LLInstanceTracker<LLFloaterWebContent, std::string, LLInstanceTrackerReplaceOnCollision>
+ public LLFloater,
+ public LLViewerMediaObserver,
+ public LLInstanceTracker<LLFloaterWebContent, std::string, LLInstanceTrackerReplaceOnCollision>
{
public:
- typedef LLInstanceTracker<LLFloaterWebContent, std::string, LLInstanceTrackerReplaceOnCollision> instance_tracker_t;
+ typedef LLInstanceTracker<LLFloaterWebContent, std::string, LLInstanceTrackerReplaceOnCollision> instance_tracker_t;
LOG_CLASS(LLFloaterWebContent);
- struct _Params : public LLInitParam::Block<_Params>
- {
- Optional<std::string> url,
- target,
- window_class,
- id;
- Optional<bool> show_chrome,
- allow_address_entry,
+ struct _Params : public LLInitParam::Block<_Params>
+ {
+ Optional<std::string> url,
+ target,
+ window_class,
+ id;
+ Optional<bool> show_chrome,
+ allow_address_entry,
allow_back_forward_navigation,
- trusted_content,
- show_page_title,
- clean_browser,
- dev_mode;
- Optional<LLRect> preferred_media_size;
+ trusted_content,
+ show_page_title,
+ clean_browser,
+ dev_mode;
+ Optional<LLRect> preferred_media_size;
- _Params();
- };
+ _Params();
+ };
- typedef LLSDParamAdapter<_Params> Params;
+ typedef LLSDParamAdapter<_Params> Params;
- LLFloaterWebContent(const Params& params);
+ LLFloaterWebContent(const Params& params);
- void initializeURLHistory();
+ void initializeURLHistory();
- static LLFloater* create(Params);
+ static LLFloater* create(Params);
- static void closeRequest(const std::string &uuid);
- static void geometryChanged(const std::string &uuid, S32 x, S32 y, S32 width, S32 height);
- void geometryChanged(S32 x, S32 y, S32 width, S32 height);
+ static void closeRequest(const std::string &uuid);
+ static void geometryChanged(const std::string &uuid, S32 x, S32 y, S32 width, S32 height);
+ void geometryChanged(S32 x, S32 y, S32 width, S32 height);
- /* virtual */ BOOL postBuild();
- /* virtual */ void onOpen(const LLSD& key);
- /* virtual */ bool matchesKey(const LLSD& key);
- /* virtual */ void onClose(bool app_quitting);
- /* virtual */ void draw();
+ /* virtual */ BOOL postBuild();
+ /* virtual */ void onOpen(const LLSD& key);
+ /* virtual */ bool matchesKey(const LLSD& key);
+ /* virtual */ void onClose(bool app_quitting);
+ /* virtual */ void draw();
protected:
- // inherited from LLViewerMediaObserver
- /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
-
- void onClickBack();
- void onClickForward();
- void onClickReload();
- void onClickStop();
- void onEnterAddress();
- void onPopExternal();
- void onTestURL(std::string url);
-
- static void preCreate(Params& p);
- void open_media(const Params& );
- void set_current_url(const std::string& url);
-
- LLMediaCtrl* mWebBrowser;
- LLComboBox* mAddressCombo;
- LLIconCtrl* mSecureLockIcon;
- LLTextBox* mStatusBarText;
- LLProgressBar* mStatusBarProgress;
-
- LLView* mBtnBack;
- LLView* mBtnForward;
- LLView* mBtnReload;
- LLView* mBtnStop;
-
- std::string mCurrentURL; // Current URL
- std::string mDisplayURL; // URL being displayed in the address bar (can differ by trailing / leading space)
- std::string mUUID;
- bool mShowPageTitle;
+ // inherited from LLViewerMediaObserver
+ /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+
+ void onClickBack();
+ void onClickForward();
+ void onClickReload();
+ void onClickStop();
+ void onEnterAddress();
+ void onPopExternal();
+ void onTestURL(std::string url);
+
+ static void preCreate(Params& p);
+ void open_media(const Params& );
+ void set_current_url(const std::string& url);
+
+ LLMediaCtrl* mWebBrowser;
+ LLComboBox* mAddressCombo;
+ LLIconCtrl* mSecureLockIcon;
+ LLTextBox* mStatusBarText;
+ LLProgressBar* mStatusBarProgress;
+
+ LLView* mBtnBack;
+ LLView* mBtnForward;
+ LLView* mBtnReload;
+ LLView* mBtnStop;
+
+ std::string mCurrentURL; // Current URL
+ std::string mDisplayURL; // URL being displayed in the address bar (can differ by trailing / leading space)
+ std::string mUUID;
+ bool mShowPageTitle;
bool mAllowNavigation;
- bool mDevelopMode;
+ bool mDevelopMode;
};
#endif // LL_LLFLOATERWEBCONTENT_H