diff options
| author | Homer Horwitz | 2008-10-08 18:52:50 +0000 |
|---|---|---|
| committer | Homer Horwitz | 2008-10-08 18:52:50 +0000 |
| commit | ac89e89da313bff1e6f145eee1c32cf994d820c9 (patch) | |
| tree | 0e243fa64571a45102fbabe347dd771a7c3ed008 /OpenSim/Region/Environment/Modules | |
| parent | - removed some unnecessary conversions (double -> double) (diff) | |
| download | opensim-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/Modules')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 4 |
1 files changed, 2 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 | { |