diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-09-15 14:39:42 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-09-15 14:39:42 -0700 |
| commit | 531b77a9485db77df31a25a766e66ec1443a49f6 (patch) | |
| tree | ca204491eff61be4da4c744696fdb0cf195aa75c /indra/newview/llmediactrl.h | |
| parent | 238cbcd7900615a22db629ed0032acab06220b68 (diff) | |
Enable web popups to specify size and position of the Media Browser window from javascript.
This includes a Mac build of llqtwebkit from the following sources:
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 81ab5ae326f0 of http://hg.secondlife.com/llqtwebkit (currently head of the default branch)
Reviewed by Callum.
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 755d1e1b04..6fefd8f6d7 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -107,6 +107,8 @@ public: void setHomePageUrl( const std::string& urlIn, const std::string& mime_type = LLStringUtil::null ); std::string getHomePageUrl(); + + void setTarget(const std::string& target); // set/clear URL to visit when a 404 page is reached void set404RedirectUrl( std::string redirect_url ); @@ -171,6 +173,7 @@ public: std::string mHomePageUrl; std::string mHomePageMimeType; std::string mCurrentNavUrl; + std::string mTarget; bool mIgnoreUIScale; bool mAlwaysRefresh; viewer_media_t mMediaSource; |