diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-12 10:45:13 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-12 10:45:13 -0500 |
commit | 642ea00a08d454dfb4eb5278b659260803816fc2 (patch) | |
tree | 7bc0734dcd80a78a597779c70bcf6c3f8324f949 /indra/newview/llfloaterwebcontent.h | |
parent | 8a51346d6f0d9171263124c203b2194db914b47d (diff) | |
parent | dbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
-rw-r--r-- | indra/newview/llfloaterwebcontent.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 0340eedd93..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); |