ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fix wrong order of max/min usage for clipping. Uses Util.Clamp now

Browse Source 
- Add support for immediate switching of Music/Media URLs. Radio-scripts should work now.
This commit is contained in:
Homer Horwitz
2008-10-08 18:52:50 +00:00
parent 31107385b6
commit ac89e89da3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
View File

@@ -294,8 +294,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
try
{
over =
m_scene.LandChannel.GetLandObject((int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.X))),
(int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.Y))));
m_scene.LandChannel.GetLandObject(Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.X), 0, 255),
Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.Y), 0, 255));
}
catch (Exception)
{

2
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -3625,6 +3625,7 @@ namespace OpenSim.Region.Environment.Scenes
else
{
land.landData.MusicURL = url;
land.sendLandUpdateToAvatarsOverMe();
return;
}
}
@@ -3641,6 +3642,7 @@ namespace OpenSim.Region.Environment.Scenes
else
{
land.landData.MediaURL = url;
land.sendLandUpdateToAvatarsOverMe();
return;
}
}