- 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.0.6.0-stable
parent
31107385b6
commit
ac89e89da3
|
@ -294,8 +294,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
over =
|
over =
|
||||||
m_scene.LandChannel.GetLandObject((int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.X))),
|
m_scene.LandChannel.GetLandObject(Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.X), 0, 255),
|
||||||
(int) Math.Max(255, Math.Min(0, Math.Round(avatars[i].AbsolutePosition.Y))));
|
Util.Clamp<int>((int)Math.Round(avatars[i].AbsolutePosition.Y), 0, 255));
|
||||||
}
|
}
|
||||||
catch (Exception)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
|
|
|
@ -3625,6 +3625,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
land.landData.MusicURL = url;
|
land.landData.MusicURL = url;
|
||||||
|
land.sendLandUpdateToAvatarsOverMe();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3641,6 +3642,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
land.landData.MediaURL = url;
|
land.landData.MediaURL = url;
|
||||||
|
land.sendLandUpdateToAvatarsOverMe();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue