aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-11 14:51:02 +0000
committerJustin Clarke Casey2008-07-11 14:51:02 +0000
commitaad55e5034c0b8024d963fe8a1aef9172e83bac8 (patch)
tree93185569fcebfac0011f06c9cadad39fad6aee83
parenttrying to fix mantis #1711. (diff)
downloadopensim-SC_OLD-aad55e5034c0b8024d963fe8a1aef9172e83bac8.zip
opensim-SC_OLD-aad55e5034c0b8024d963fe8a1aef9172e83bac8.tar.gz
opensim-SC_OLD-aad55e5034c0b8024d963fe8a1aef9172e83bac8.tar.bz2
opensim-SC_OLD-aad55e5034c0b8024d963fe8a1aef9172e83bac8.tar.xz
* Comment out body of experimental ParcelMediaSetTime() since MW says it causes a mono 1.2.4 compile to fail
and MW says it will soon be replaced anyway.
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs27
1 files changed, 14 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 6a63491..3c8df33 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3664,21 +3664,22 @@ namespace OpenSim.Region.Environment.Scenes
3664 3664
3665 #endregion 3665 #endregion
3666 3666
3667
3668
3669 public void ParcelMediaSetTime(float time) 3667 public void ParcelMediaSetTime(float time)
3670 { 3668 {
3671 //should be doing this by parcel, but as its only for testing 3669 //should be doing this by parcel, but as its only for testing
3672 ForEachClient(delegate(IClientAPI client) 3670 // The use of Thread.Sleep here causes the following compiler error under mono 1.2.4
3673 { 3671 // OpenSim/Region/Environment/Scenes/Scene.cs(3675,17): error CS0103: The name `Thread' does not exist
3674 client.SendParcelMediaCommand((uint)(2), ParcelMediaCommandEnum.Pause, 0); 3672 // in the context of `<>c__CompilerGenerated17'
3675 Thread.Sleep(10); 3673 // MW said it was okay to comment the body of this method out for now since the code is experimental
3676 client.SendParcelMediaCommand((uint)(64), ParcelMediaCommandEnum.Time, time); 3674 // and will be replaced anyway
3677 Thread.Sleep(200); 3675// ForEachClient(delegate(IClientAPI client)
3678 client.SendParcelMediaCommand((uint)(4), ParcelMediaCommandEnum.Play, 0); 3676// {
3679 }); 3677// client.SendParcelMediaCommand((uint)(2), ParcelMediaCommandEnum.Pause, 0);
3678// Thread.Sleep(10);
3679// client.SendParcelMediaCommand((uint)(64), ParcelMediaCommandEnum.Time, time);
3680// Thread.Sleep(200);
3681// client.SendParcelMediaCommand((uint)(4), ParcelMediaCommandEnum.Play, 0);
3682// });
3680 } 3683 }
3681 } 3684 }
3682} 3685}
3683
3684