aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorHomer Horwitz2008-10-08 18:52:50 +0000
committerHomer Horwitz2008-10-08 18:52:50 +0000
commitac89e89da313bff1e6f145eee1c32cf994d820c9 (patch)
tree0e243fa64571a45102fbabe347dd771a7c3ed008 /OpenSim/Region/Environment
parent- removed some unnecessary conversions (double -> double) (diff)
downloadopensim-SC_OLD-ac89e89da313bff1e6f145eee1c32cf994d820c9.zip
opensim-SC_OLD-ac89e89da313bff1e6f145eee1c32cf994d820c9.tar.gz
opensim-SC_OLD-ac89e89da313bff1e6f145eee1c32cf994d820c9.tar.bz2
opensim-SC_OLD-ac89e89da313bff1e6f145eee1c32cf994d820c9.tar.xz
- Fix wrong order of max/min usage for clipping. Uses Util.Clamp now
- Add support for immediate switching of Music/Media URLs. Radio-scripts should work now.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 89d7b69..14f43b4 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -294,8 +294,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
294 try 294 try
295 { 295 {
296 over = 296 over =
297 m_scene.LandChannel.GetLandObject((int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.X))), 297 m_scene.LandChannel.GetLandObject(Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.X), 0, 255),
298 (int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.Y)))); 298 Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.Y), 0, 255));
299 } 299 }
300 catch (Exception) 300 catch (Exception)
301 { 301 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 9328501..27c315c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3625,6 +3625,7 @@ namespace OpenSim.Region.Environment.Scenes
3625 else 3625 else
3626 { 3626 {
3627 land.landData.MusicURL = url; 3627 land.landData.MusicURL = url;
3628 land.sendLandUpdateToAvatarsOverMe();
3628 return; 3629 return;
3629 } 3630 }
3630 } 3631 }
@@ -3641,6 +3642,7 @@ namespace OpenSim.Region.Environment.Scenes
3641 else 3642 else
3642 { 3643 {
3643 land.landData.MediaURL = url; 3644 land.landData.MediaURL = url;
3645 land.sendLandUpdateToAvatarsOverMe();
3644 return; 3646 return;
3645 } 3647 }
3646 } 3648 }