diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 10:49:48 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 10:49:48 -0700 |
| commit | 65bf35cfed4b67d5f27628144f7519c81bd97dac (patch) | |
| tree | 8ca423d53d3105133e40e7bd7d3aaea3f0528023 /indra/newview/llviewermedia.h | |
| parent | 6c1706da69193de3ddbaf69a40e5ba0cad13283e (diff) | |
| parent | fce70328535ec04aba64972f47cface0b2fd3046 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index c9ba5841e9..05c67eda47 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -141,7 +141,10 @@ public: void mouseMove(const LLVector2& texture_coords); void mouseLeftDoubleClick(S32 x,S32 y ); void mouseCapture(); - + + void navigateBack(); + void navigateForward(); + void navigateReload(); void navigateHome(); void navigateTo(const std::string& url, const std::string& mime_type = "", bool rediscover_type = false, bool server_request = false); void navigateStop(); @@ -278,7 +281,9 @@ public: bool mHasFocus; LLPluginClassMedia::EPriority mPriority; bool mDoNavigateOnLoad; + bool mDoNavigateOnLoadRediscoverType; bool mDoNavigateOnLoadServerRequest; + bool mMediaSourceFailedInit; private: |