diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:33:19 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:33:19 -0500 |
| commit | cd64ae7fb8ee781a5bf9ac47dd2428e659b939c9 (patch) | |
| tree | 9638dfe3ce3a7d5399d6f52552c9e1e3f308fd46 /indra/newview/llfloaterwebcontent.h | |
| parent | e4f1f611a4736e4b0b78c0d61c3c5f576fec93d0 (diff) | |
| parent | 2abb1a81c56a27eab02157851cb9e67730231bb6 (diff) | |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
| -rw-r--r-- | indra/newview/llfloaterwebcontent.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 6fc66d1ad8..cfc87e9015 100644 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -43,6 +43,7 @@ class LLFloaterWebContent : public LLInstanceTracker<LLFloaterWebContent, std::string> { public: + typedef LLInstanceTracker<LLFloaterWebContent, std::string> instance_tracker_t; LOG_CLASS(LLFloaterWebContent); struct _Params : public LLInitParam::Block<_Params> @@ -89,6 +90,7 @@ protected: void onEnterAddress(); void onPopExternal(); + static void preCreate(Params& p); void open_media(const Params& ); void set_current_url(const std::string& url); @@ -97,6 +99,12 @@ protected: LLIconCtrl* mSecureLockIcon; LLTextBox* mStatusBarText; LLProgressBar* mStatusBarProgress; + + LLView* mBtnBack; + LLView* mBtnForward; + LLView* mBtnReload; + LLView* mBtnStop; + std::string mCurrentURL; std::string mUUID; bool mShowPageTitle; |