diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-12-07 17:00:17 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-07 17:00:17 -0800 |
commit | bba8f747d1ef32e98d309269b3978c5a278133ea (patch) | |
tree | 328d62671332289d66341e1f024f78dcdaa7f7e3 /indra/newview/llfloaterwebcontent.h | |
parent | 35020db3a9310742c9759673e3aa1bbb1d7aa02f (diff) | |
parent | 1df76279212aef112356570356e4c195490fec3b (diff) |
Merge with latest viewer-experience
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
-rw-r--r-- | indra/newview/llfloaterwebcontent.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 9d90306a9c..2a2a9e110b 100644 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -90,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); |