diff options
for testing purposes only:
added void osSetParcelMediaTime(double time) command to script engines.
which sets the position of the media that is playing. Time is in seconds.
Doesn't do any security checking (should be checking that the object/script is owned by the parcel owner). So could be abused, if it is then we should remove it, or add the security.
Only tested in dotnet scripting engine, but should work in XEngine too.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 375756d..6a63491 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -757,7 +757,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
757 | UpdateEvents(); | 757 | UpdateEvents(); |
758 | 758 | ||
759 | if (m_frame % m_update_backup == 0) | 759 | if (m_frame % m_update_backup == 0) |
760 | { | ||
760 | UpdateStorageBackup(); | 761 | UpdateStorageBackup(); |
762 | |||
763 | } | ||
761 | 764 | ||
762 | if (m_frame % m_update_terrain == 0) | 765 | if (m_frame % m_update_terrain == 0) |
763 | UpdateTerrain(); | 766 | UpdateTerrain(); |
@@ -3661,7 +3664,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
3661 | 3664 | ||
3662 | #endregion | 3665 | #endregion |
3663 | 3666 | ||
3664 | 3667 | ||
3668 | |||
3669 | public void ParcelMediaSetTime(float time) | ||
3670 | { | ||
3671 | //should be doing this by parcel, but as its only for testing | ||
3672 | ForEachClient(delegate(IClientAPI client) | ||
3673 | { | ||
3674 | client.SendParcelMediaCommand((uint)(2), ParcelMediaCommandEnum.Pause, 0); | ||
3675 | Thread.Sleep(10); | ||
3676 | client.SendParcelMediaCommand((uint)(64), ParcelMediaCommandEnum.Time, time); | ||
3677 | Thread.Sleep(200); | ||
3678 | client.SendParcelMediaCommand((uint)(4), ParcelMediaCommandEnum.Play, 0); | ||
3679 | }); | ||
3680 | } | ||
3665 | } | 3681 | } |
3666 | } | 3682 | } |
3667 | 3683 | ||