diff options
| author | Richard Linden <none@none> | 2011-07-05 16:51:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-07-05 16:51:24 -0700 |
| commit | 9fb8b53999c3deb2d3171609215da2cff3403635 (patch) | |
| tree | bfb38c3a87294930638a92c9afb31cc545e684c0 /indra/newview/llfloaterwebcontent.h | |
| parent | e3c4b489fc212273a0e4d4b186638c758aae943c (diff) | |
| parent | aecfaef10c41dce7395c3a02dcd84a39b6ffbeee (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
| -rw-r--r-- | indra/newview/llfloaterwebcontent.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index ecc7e970d8..56b6ef12c8 100644 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -46,7 +46,7 @@ public: void initializeURLHistory(); - static void create(const std::string &url, const std::string& target, const std::string& uuid = LLStringUtil::null); + static void create(const std::string &url, const std::string& target, const std::string& uuid = LLStringUtil::null, bool show_chrome = true, const LLRect& preferred_media_size = LLRect() ); static void closeRequest(const std::string &uuid); static void geometryChanged(const std::string &uuid, S32 x, S32 y, S32 width, S32 height); |