From fce70328535ec04aba64972f47cface0b2fd3046 Mon Sep 17 00:00:00 2001
From: "angela@angelas-macbook-pro.local" <angela@angelas-macbook-pro.local>
Date: Mon, 19 Oct 2009 19:00:59 +0800
Subject: [PATCH] make callbacks for media hud control data driven, add
whitelist indicator , add secure browsing indicator
---
indra/newview/llviewermedia.cpp | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index b8cf3e667ef..1a183d61f35 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1024,7 +1024,14 @@ void LLViewerMediaImpl::navigateBack()
{
if(mMediaSource->pluginSupportsMediaTime())
{
- mMediaSource->start(-2.0);
+ F64 step_scale = 0.02; // temp , can be changed
+ F64 back_step = mMediaSource->getCurrentTime() - (mMediaSource->getDuration()*step_scale);
+ if(back_step < 0.0)
+ {
+ back_step = 0.0;
+ }
+ mMediaSource->seek(back_step);
+ //mMediaSource->start(-2.0);
}
else
{
@@ -1040,7 +1047,14 @@ void LLViewerMediaImpl::navigateForward()
{
if(mMediaSource->pluginSupportsMediaTime())
{
- mMediaSource->start(2.0);
+ F64 step_scale = 0.02; // temp , can be changed
+ F64 forward_step = mMediaSource->getCurrentTime() + (mMediaSource->getDuration()*step_scale);
+ if(forward_step > mMediaSource->getDuration())
+ {
+ forward_step = mMediaSource->getDuration();
+ }
+ mMediaSource->seek(forward_step);
+ //mMediaSource->start(2.0);
}
else
{
--
GitLab