From 5876a4d392f4f1742325c65e52e7201e0f43108b Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 7 Jun 2012 00:24:07 +0200 Subject: Prevent a null ref when getting the velocity of an avatar during login or logout. --- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index d83b05d..a51c625 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -2536,12 +2536,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); - Vector3 vel; + Vector3 vel = Vector3.Zero; if (m_host.ParentGroup.IsAttachment) { ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar); - vel = avatar.Velocity; + if (avatar != null) + vel = avatar.Velocity; } else { -- cgit v1.1 From a94510500357848f2dee26e599abad5256d2f5eb Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 7 Jun 2012 00:24:33 +0200 Subject: Make timed bans / timed passes work as expected. Prevent transmission of media URLs to banned clients. --- .../CoreModules/World/Land/LandManagementModule.cs | 7 ++++-- .../Region/CoreModules/World/Land/LandObject.cs | 29 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 02ac091..add1551 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -1101,8 +1101,11 @@ namespace OpenSim.Region.CoreModules.World.Land { if (!temp.Contains(currentParcel)) { - currentParcel.ForceUpdateLandInfo(); - temp.Add(currentParcel); + if (!currentParcel.IsEitherBannedOrRestricted(remote_client.AgentId)) + { + currentParcel.ForceUpdateLandInfo(); + temp.Add(currentParcel); + } } } } diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 509c4d7..4284444 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -50,6 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Land private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; private int m_lastSeqId = 0; + private int m_expiryCounter = 0; protected LandData m_landData = new LandData(); protected Scene m_scene; @@ -135,6 +136,8 @@ namespace OpenSim.Region.CoreModules.World.Land else LandData.GroupID = UUID.Zero; LandData.IsGroupOwned = is_group_owned; + + m_scene.EventManager.OnFrame += OnFrame; } #endregion @@ -1196,6 +1199,17 @@ namespace OpenSim.Region.CoreModules.World.Land #endregion + private void OnFrame() + { + m_expiryCounter++; + + if (m_expiryCounter >= 50) + { + ExpireAccessList(); + m_expiryCounter = 0; + } + } + private void ExpireAccessList() { List delete = new List(); @@ -1206,7 +1220,22 @@ namespace OpenSim.Region.CoreModules.World.Land delete.Add(entry); } foreach (LandAccessEntry entry in delete) + { LandData.ParcelAccessList.Remove(entry); + ScenePresence presence; + + if (m_scene.TryGetScenePresence(entry.AgentID, out presence) && (!presence.IsChildAgent)) + { + ILandObject land = m_scene.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y); + if (land.LandData.LocalID == LandData.LocalID) + { + Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land); + presence.TeleportWithMomentum(pos); + presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); + } + } + m_log.DebugFormat("[LAND]: Removing entry {0} because it has expired", entry.AgentID); + } if (delete.Count > 0) m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this); -- cgit v1.1 From e93308072ea8ec106e429dc8071795018b58a75a Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 7 Jun 2012 16:32:07 +0200 Subject: Make the "delay restart" button delay restart for 1 hour rather than aborting it altogether. Allow a maximum of three uses before the restart goes through. --- .../World/Estate/EstateManagementModule.cs | 8 ++- .../CoreModules/World/Region/RestartModule.cs | 83 ++++++++++++++-------- .../Region/Framework/Interfaces/IRestartModule.cs | 1 + 3 files changed, 61 insertions(+), 31 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 1e743c3..97a2f4a 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs @@ -61,6 +61,8 @@ namespace OpenSim.Region.CoreModules.World.Estate public event ChangeDelegate OnEstateInfoChange; public event MessageDelegate OnEstateMessage; + private int m_delayCount = 0; + #region Packet Data Responders private void clientSendDetailedEstateData(IClientAPI remote_client, UUID invoice) @@ -259,7 +261,11 @@ namespace OpenSim.Region.CoreModules.World.Estate { if (timeInSeconds == -1) { - restartModule.AbortRestart("Restart aborted by region manager"); + m_delayCount++; + if (m_delayCount > 3) + return; + + restartModule.DelayRestart(3600, "Restart delayed by region manager"); return; } diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs index 65180b5a..287738a 100644 --- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs +++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs @@ -59,6 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Region protected bool m_Notice = false; protected IDialogModule m_DialogModule = null; protected string m_MarkerPath = String.Empty; + private int[] m_CurrentAlerts = null; public void Initialise(IConfigSource config) { @@ -141,6 +142,7 @@ namespace OpenSim.Region.CoreModules.World.Region m_Message = message; m_Initiator = initiator; m_Notice = notice; + m_CurrentAlerts = alerts; m_Alerts = new List(alerts); m_Alerts.Sort(); m_Alerts.Reverse(); @@ -152,12 +154,12 @@ namespace OpenSim.Region.CoreModules.World.Region return; } - int nextInterval = DoOneNotice(); + int nextInterval = DoOneNotice(true); SetTimer(nextInterval); } - public int DoOneNotice() + public int DoOneNotice(bool sendOut) { if (m_Alerts.Count == 0 || m_Alerts[0] == 0) { @@ -182,34 +184,37 @@ namespace OpenSim.Region.CoreModules.World.Region m_Alerts.RemoveAt(0); - int minutes = currentAlert / 60; - string currentAlertString = String.Empty; - if (minutes > 0) + if (sendOut) { - if (minutes == 1) - currentAlertString += "1 minute"; - else - currentAlertString += String.Format("{0} minutes", minutes); + int minutes = currentAlert / 60; + string currentAlertString = String.Empty; + if (minutes > 0) + { + if (minutes == 1) + currentAlertString += "1 minute"; + else + currentAlertString += String.Format("{0} minutes", minutes); + if ((currentAlert % 60) != 0) + currentAlertString += " and "; + } if ((currentAlert % 60) != 0) - currentAlertString += " and "; - } - if ((currentAlert % 60) != 0) - { - int seconds = currentAlert % 60; - if (seconds == 1) - currentAlertString += "1 second"; - else - currentAlertString += String.Format("{0} seconds", seconds); - } + { + int seconds = currentAlert % 60; + if (seconds == 1) + currentAlertString += "1 second"; + else + currentAlertString += String.Format("{0} seconds", seconds); + } - string msg = String.Format(m_Message, currentAlertString); + string msg = String.Format(m_Message, currentAlertString); - if (m_DialogModule != null && msg != String.Empty) - { - if (m_Notice) - m_DialogModule.SendGeneralAlert(msg); - else - m_DialogModule.SendNotificationToUsersInRegion(m_Initiator, "System", msg); + if (m_DialogModule != null && msg != String.Empty) + { + if (m_Notice) + m_DialogModule.SendGeneralAlert(msg); + else + m_DialogModule.SendNotificationToUsersInRegion(m_Initiator, "System", msg); + } } return currentAlert - nextAlert; @@ -226,7 +231,25 @@ namespace OpenSim.Region.CoreModules.World.Region private void OnTimer(object source, ElapsedEventArgs e) { - int nextInterval = DoOneNotice(); + int nextInterval = DoOneNotice(true); + + SetTimer(nextInterval); + } + + public void DelayRestart(int seconds, string message) + { + if (m_CountdownTimer == null) + return; + + m_CountdownTimer.Stop(); + m_CountdownTimer = null; + + m_Alerts = new List(m_CurrentAlerts); + m_Alerts.Add(seconds); + m_Alerts.Sort(); + m_Alerts.Reverse(); + + int nextInterval = DoOneNotice(false); SetTimer(nextInterval); } @@ -240,9 +263,9 @@ namespace OpenSim.Region.CoreModules.World.Region if (m_DialogModule != null && message != String.Empty) m_DialogModule.SendGeneralAlert(message); } - if (m_MarkerPath != String.Empty) - File.Delete(Path.Combine(m_MarkerPath, - m_Scene.RegionInfo.RegionID.ToString())); + if (m_MarkerPath != String.Empty) + File.Delete(Path.Combine(m_MarkerPath, + m_Scene.RegionInfo.RegionID.ToString())); } private void HandleRegionRestart(string module, string[] args) diff --git a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs index c68550f..9b25beb 100644 --- a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs @@ -35,5 +35,6 @@ namespace OpenSim.Region.Framework.Interfaces TimeSpan TimeUntilRestart { get; } void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice); void AbortRestart(string message); + void DelayRestart(int seconds, string message); } } -- cgit v1.1 From 91557f18cd796e64158d2e3dbdef28d0b3927d1b Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 7 Jun 2012 17:59:20 +0200 Subject: Set collision sound type so custom sound types are recognized --- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenSim') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a51c625..37738a5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -4812,6 +4812,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.CollisionSoundVolume = (float)impact_volume; m_host.CollisionSound = m_host.invalidCollisionSoundUUID; + m_host,CollisionSoundType = 0; return; } // TODO: Parameter check logic required. @@ -4831,6 +4832,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } m_host.CollisionSoundVolume = (float)impact_volume; m_host.CollisionSound = soundId; + m_host.CollisionSoundType = 1; } public LSL_String llGetAnimation(string id) -- cgit v1.1 From 64aefe9c28fd5ceb9c92b4069d7915d6b77356fa Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 7 Jun 2012 17:59:38 +0200 Subject: Disable default collision sounds until they can be uploaded, but enable custom ones --- OpenSim/Region/Framework/Scenes/CollisionSounds.cs | 111 +++++++++++---------- 1 file changed, 56 insertions(+), 55 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs index de82ddc..d72cf41 100644 --- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs +++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs @@ -188,9 +188,6 @@ namespace OpenSim.Region.Framework.Scenes public static void PartCollisionSound(SceneObjectPart part, List collidersinfolist) { - // disable for now - return; - if (collidersinfolist.Count == 0 || part == null) return; @@ -238,17 +235,19 @@ namespace OpenSim.Region.Framework.Scenes { if (!HaveSound) { - volume = Math.Abs(colInfo.relativeVel); - if (volume < 0.2f) - continue; - - volume *= volume * .0625f; // 4m/s == full volume - if (volume > 1.0f) - volume = 1.0f; - - soundID = m_TerrainPart[thisMaterial]; +// TODO: Import real collision sounds and uncomment this +// volume = Math.Abs(colInfo.relativeVel); +// if (volume < 0.2f) +// continue; +// +// volume *= volume * .0625f; // 4m/s == full volume +// if (volume > 1.0f) +// volume = 1.0f; +// +// soundID = m_TerrainPart[thisMaterial]; } - part.SendCollisionSound(soundID, volume, colInfo.position); + else // Remove this else when uncommenting the above + part.SendCollisionSound(soundID, volume, colInfo.position); doneownsound = true; } continue; @@ -269,40 +268,41 @@ namespace OpenSim.Region.Framework.Scenes if (volume == 0.0f) continue; } +// TODO: Import real collision sounds and uncomment this +// else +// { +// volume = Math.Abs(colInfo.relativeVel); +// if (volume < 0.2f) +// continue; +// +// volume *= volume * .0625f; // 4m/s == full volume +// if (volume > 1.0f) +// volume = 1.0f; +// +// int otherMaterial = (int)otherPart.Material; +// if (otherMaterial >= MaxMaterials) +// otherMaterial = 3; +// +// soundID = m_PartPart[thisMatScaled + otherMaterial]; +// } + } + + if (soundID != UUID.Zero) // Remove when sounds are there + { // Remove when sounds are there + if (doneownsound) + otherPart.SendCollisionSound(soundID, volume, colInfo.position); else { - volume = Math.Abs(colInfo.relativeVel); - if (volume < 0.2f) - continue; - - volume *= volume * .0625f; // 4m/s == full volume - if (volume > 1.0f) - volume = 1.0f; - - int otherMaterial = (int)otherPart.Material; - if (otherMaterial >= MaxMaterials) - otherMaterial = 3; - - soundID = m_PartPart[thisMatScaled + otherMaterial]; + part.SendCollisionSound(soundID, volume, colInfo.position); + doneownsound = true; } - } - - if (doneownsound) - otherPart.SendCollisionSound(soundID, volume, colInfo.position); - else - { - part.SendCollisionSound(soundID, volume, colInfo.position); - doneownsound = true; - } + } // Remove when sounds are there } } } public static void AvatarCollisionSound(ScenePresence av, List collidersinfolist) { - // disable for now - return; - if (collidersinfolist.Count == 0 || av == null) return; @@ -341,22 +341,23 @@ namespace OpenSim.Region.Framework.Scenes continue; if (otherPart.CollisionSoundType > 0 && otherPart.CollisionSoundVolume > 0f) otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume, colInfo.position); - else - { - volume = Math.Abs(colInfo.relativeVel); - if (volume < 0.2f) - continue; - - volume *= volume * .0625f; // 4m/s == full volume - if (volume > 1.0f) - volume = 1.0f; - otherMaterial = (int)otherPart.Material; - if (otherMaterial >= MaxMaterials) - otherMaterial = 3; - - soundID = m_PartPart[thisMatScaled + otherMaterial]; - otherPart.SendCollisionSound(soundID, volume, colInfo.position); - } +//TODO: uncomment below when sounds are uploaded +// else +// { +// volume = Math.Abs(colInfo.relativeVel); +// if (volume < 0.2f) +// continue; +// +// volume *= volume * .0625f; // 4m/s == full volume +// if (volume > 1.0f) +// volume = 1.0f; +// otherMaterial = (int)otherPart.Material; +// if (otherMaterial >= MaxMaterials) +// otherMaterial = 3; +// +// soundID = m_PartPart[thisMatScaled + otherMaterial]; +// otherPart.SendCollisionSound(soundID, volume, colInfo.position); +// } continue; } /* @@ -374,4 +375,4 @@ namespace OpenSim.Region.Framework.Scenes } } } -} \ No newline at end of file +} -- cgit v1.1 From 31bc9c3ad34d280d7be89dae20ecb9486b5065bb Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 7 Jun 2012 18:04:09 +0200 Subject: Typo correction --- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 37738a5..667aa93 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -4812,7 +4812,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.CollisionSoundVolume = (float)impact_volume; m_host.CollisionSound = m_host.invalidCollisionSoundUUID; - m_host,CollisionSoundType = 0; + m_host.CollisionSoundType = 0; return; } // TODO: Parameter check logic required. -- cgit v1.1 From f5cbe56c569ad9453a055adba0636cf4a6614ec3 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 7 Jun 2012 19:01:33 +0200 Subject: Make not_at_target stop when the target is reached even if the script is not listening to at_target --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 7568888..8fa7880 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -3926,10 +3926,11 @@ namespace OpenSim.Region.Framework.Scenes scriptPosTarget target = m_targets[idx]; if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance) { + at_target = true; + // trigger at_target if (m_scriptListens_atTarget) { - at_target = true; scriptPosTarget att = new scriptPosTarget(); att.targetPos = target.targetPos; att.tolerance = target.tolerance; -- cgit v1.1 From 095dbf0ece0aab1812d04695a17bff86720ab6ac Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 6 Jun 2012 20:35:00 +0200 Subject: Fix not sending TransferInfo when an asset is not found. This clogs up the sound pipeline in the viewer. --- .../Region/ClientStack/Linden/UDP/LLClientView.cs | 33 +++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 77dbca7..5a87958 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -2777,6 +2777,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } + public void SendAssetNotFound(AssetRequestToClient req) + { + TransferInfoPacket Transfer = new TransferInfoPacket(); + Transfer.TransferInfo.ChannelType = 2; + Transfer.TransferInfo.Status = -2; + Transfer.TransferInfo.TargetType = 0; + Transfer.TransferInfo.Params = req.Params; + Transfer.TransferInfo.Size = 0; + Transfer.TransferInfo.TransferID = req.TransferRequestID; + Transfer.Header.Zerocoded = true; + OutPacket(Transfer, ThrottleOutPacketType.Asset); + } + public void SendTexture(AssetBase TextureAsset) { @@ -12178,14 +12191,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// protected void AssetReceived(string id, Object sender, AssetBase asset) { - if (asset == null) - return; - TransferRequestPacket transferRequest = (TransferRequestPacket)sender; UUID requestID = UUID.Zero; byte source = (byte)SourceType.Asset; + AssetRequestToClient req = new AssetRequestToClient(); + + if (asset == null) + { + req.AssetInf = null; + req.AssetRequestSource = source; + req.IsTextureRequest = false; + req.NumPackets = 0; + req.Params = transferRequest.TransferInfo.Params; + req.RequestAssetID = requestID; + req.TransferRequestID = transferRequest.TransferInfo.TransferID; + + SendAssetNotFound(req); + return; + } + if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset) { requestID = new UUID(transferRequest.TransferInfo.Params, 0); @@ -12202,7 +12228,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; // The asset is known to exist and is in our cache, so add it to the AssetRequests list - AssetRequestToClient req = new AssetRequestToClient(); req.AssetInf = asset; req.AssetRequestSource = source; req.IsTextureRequest = false; -- cgit v1.1 From 49423144350b6195a51931bc18a01be337f80f8b Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 7 Jun 2012 20:51:03 +0200 Subject: Implement playing of the real collision sounds, change scaling for avatar collisions to make them really soft because otherwise climbing stairs makes an unbearable amount of noise. --- OpenSim/Region/Framework/Scenes/CollisionSounds.cs | 190 +++++++-------------- 1 file changed, 57 insertions(+), 133 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs index d72cf41..a95e75a 100644 --- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs +++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs @@ -27,9 +27,11 @@ // Ubit 2012 using System; +using System.Reflection; using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; +using log4net; namespace OpenSim.Region.Framework.Scenes { @@ -42,9 +44,11 @@ namespace OpenSim.Region.Framework.Scenes public static class CollisionSounds { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private const int MaxMaterials = 7; // part part -/* + private static UUID snd_StoneStone = new UUID("be7295c0-a158-11e1-b3dd-0800200c9a66"); private static UUID snd_StoneMetal = new UUID("be7295c0-a158-11e1-b3dd-0800201c9a66"); private static UUID snd_StoneGlass = new UUID("be7295c0-a158-11e1-b3dd-0800202c9a66"); @@ -53,7 +57,6 @@ namespace OpenSim.Region.Framework.Scenes private static UUID snd_StonePlastic = new UUID("be7295c0-a158-11e1-b3dd-0800205c9a66"); private static UUID snd_StoneRubber = new UUID("be7295c0-a158-11e1-b3dd-0800206c9a66"); - private static UUID snd_MetalStone = new UUID("be7295c0-a158-11e1-b3dd-0801200c9a66"); private static UUID snd_MetalMetal = new UUID("be7295c0-a158-11e1-b3dd-0801201c9a66"); private static UUID snd_MetalGlass = new UUID("be7295c0-a158-11e1-b3dd-0801202c9a66"); private static UUID snd_MetalWood = new UUID("be7295c0-a158-11e1-b3dd-0801203c9a66"); @@ -61,44 +64,24 @@ namespace OpenSim.Region.Framework.Scenes private static UUID snd_MetalPlastic = new UUID("be7295c0-a158-11e1-b3dd-0801205c9a66"); private static UUID snd_MetalRubber = new UUID("be7295c0-a158-11e1-b3dd-0801206c9a66"); - private static UUID snd_GlassStone = new UUID("be7295c0-a158-11e1-b3dd-0802200c9a66"); - private static UUID snd_GlassMetal = new UUID("be7295c0-a158-11e1-b3dd-0802201c9a66"); private static UUID snd_GlassGlass = new UUID("be7295c0-a158-11e1-b3dd-0802202c9a66"); private static UUID snd_GlassWood = new UUID("be7295c0-a158-11e1-b3dd-0802203c9a66"); private static UUID snd_GlassFlesh = new UUID("be7295c0-a158-11e1-b3dd-0802204c9a66"); private static UUID snd_GlassPlastic = new UUID("be7295c0-a158-11e1-b3dd-0802205c9a66"); private static UUID snd_GlassRubber = new UUID("be7295c0-a158-11e1-b3dd-0802206c9a66"); - private static UUID snd_WoodStone = new UUID("be7295c0-a158-11e1-b3dd-0803200c9a66"); - private static UUID snd_WoodMetal = new UUID("be7295c0-a158-11e1-b3dd-0803201c9a66"); - private static UUID snd_WoodGlass = new UUID("be7295c0-a158-11e1-b3dd-0803202c9a66"); private static UUID snd_WoodWood = new UUID("be7295c0-a158-11e1-b3dd-0803203c9a66"); private static UUID snd_WoodFlesh = new UUID("be7295c0-a158-11e1-b3dd-0803204c9a66"); private static UUID snd_WoodPlastic = new UUID("be7295c0-a158-11e1-b3dd-0803205c9a66"); private static UUID snd_WoodRubber = new UUID("be7295c0-a158-11e1-b3dd-0803206c9a66"); - private static UUID snd_FleshStone = new UUID("be7295c0-a158-11e1-b3dd-0804200c9a66"); - private static UUID snd_FleshMetal = new UUID("be7295c0-a158-11e1-b3dd-0804201c9a66"); - private static UUID snd_FleshGlass = new UUID("be7295c0-a158-11e1-b3dd-0804202c9a66"); - private static UUID snd_FleshWood = new UUID("be7295c0-a158-11e1-b3dd-0804203c9a66"); private static UUID snd_FleshFlesh = new UUID("be7295c0-a158-11e1-b3dd-0804204c9a66"); private static UUID snd_FleshPlastic = new UUID("be7295c0-a158-11e1-b3dd-0804205c9a66"); private static UUID snd_FleshRubber = new UUID("be7295c0-a158-11e1-b3dd-0804206c9a66"); - private static UUID snd_PlasticStone = new UUID("be7295c0-a158-11e1-b3dd-0805200c9a66"); - private static UUID snd_PlasticMetal = new UUID("be7295c0-a158-11e1-b3dd-0805201c9a66"); - private static UUID snd_PlasticGlass = new UUID("be7295c0-a158-11e1-b3dd-0805202c9a66"); - private static UUID snd_PlasticWood = new UUID("be7295c0-a158-11e1-b3dd-0805203c9a66"); - private static UUID snd_PlasticFlesh = new UUID("be7295c0-a158-11e1-b3dd-0805204c9a66"); private static UUID snd_PlasticPlastic = new UUID("be7295c0-a158-11e1-b3dd-0805205c9a66"); private static UUID snd_PlasticRubber = new UUID("be7295c0-a158-11e1-b3dd-0805206c9a66"); - private static UUID snd_RubberStone = new UUID("be7295c0-a158-11e1-b3dd-0806200c9a66"); - private static UUID snd_RubberMetal = new UUID("be7295c0-a158-11e1-b3dd-0806201c9a66"); - private static UUID snd_RubberGlass = new UUID("be7295c0-a158-11e1-b3dd-0806202c9a66"); - private static UUID snd_RubberWood = new UUID("be7295c0-a158-11e1-b3dd-0806203c9a66"); - private static UUID snd_RubberFlesh = new UUID("be7295c0-a158-11e1-b3dd-0806204c9a66"); - private static UUID snd_RubberPlastic = new UUID("be7295c0-a158-11e1-b3dd-0806205c9a66"); private static UUID snd_RubberRubber = new UUID("be7295c0-a158-11e1-b3dd-0806206c9a66"); // terrain part @@ -109,50 +92,6 @@ namespace OpenSim.Region.Framework.Scenes private static UUID snd_TerrainFlesh = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66"); private static UUID snd_TerrainPlastic = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66"); private static UUID snd_TerrainRubber = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66"); -*/ - private static UUID snd_StoneStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_StoneMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_StoneGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_StoneWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_StoneFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_StonePlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_StoneRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - - private static UUID snd_MetalMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_MetalGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_MetalWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_MetalFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_MetalPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_MetalRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - - private static UUID snd_GlassGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_GlassWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_GlassFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_GlassPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_GlassRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - - private static UUID snd_WoodWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_WoodFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_WoodPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_WoodRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - - private static UUID snd_FleshFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_FleshPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_FleshRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - - private static UUID snd_PlasticPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_PlasticRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - - private static UUID snd_RubberRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - - // terrain part - private static UUID snd_TerrainStone = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_TerrainMetal = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_TerrainGlass = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_TerrainWood = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_TerrainFlesh = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_TerrainPlastic = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); - private static UUID snd_TerrainRubber = new UUID("c80260ba-41fd-8a46-768a-6bf236360e3a"); public static UUID[] m_TerrainPart = { snd_TerrainStone, @@ -163,18 +102,7 @@ namespace OpenSim.Region.Framework.Scenes snd_TerrainPlastic, snd_TerrainRubber }; -/* - //full assimetric sounds - public static UUID[] m_PartPart = { - snd_StoneStone, snd_StoneMetal, snd_StoneGlass, snd_StoneWood, snd_StoneFlesh, snd_StonePlastic, snd_StoneRubber, - snd_MetalStone, snd_MetalMetal, snd_MetalGlass, snd_MetalWood, snd_MetalFlesh, snd_MetalPlastic, snd_MetalRubber, - snd_GlassStone, snd_GlassMetal, snd_GlassGlass, snd_GlassWood, snd_GlassFlesh, snd_GlassPlastic, snd_GlassRubber, - snd_WoodStone, snd_WoodMetal, snd_WoodGlass, snd_WoodWood, snd_WoodFlesh, snd_WoodPlastic, snd_WoodRubber, - snd_FleshStone, snd_FleshMetal, snd_FleshGlass, snd_FleshWood, snd_FleshFlesh, snd_FleshPlastic, snd_FleshRubber, - snd_PlasticStone, snd_PlasticMetal, snd_PlasticGlass, snd_PlasticWood, snd_PlasticFlesh, snd_PlasticPlastic, snd_PlasticRubber, - snd_RubberStone, snd_RubberMetal, snd_RubberGlass, snd_RubberWood, snd_RubberFlesh, snd_RubberPlastic, snd_RubberRubber - }; -*/ + // simetric sounds public static UUID[] m_PartPart = { snd_StoneStone, snd_StoneMetal, snd_StoneGlass, snd_StoneWood, snd_StoneFlesh, snd_StonePlastic, snd_StoneRubber, @@ -235,19 +163,17 @@ namespace OpenSim.Region.Framework.Scenes { if (!HaveSound) { -// TODO: Import real collision sounds and uncomment this -// volume = Math.Abs(colInfo.relativeVel); -// if (volume < 0.2f) -// continue; -// -// volume *= volume * .0625f; // 4m/s == full volume -// if (volume > 1.0f) -// volume = 1.0f; -// -// soundID = m_TerrainPart[thisMaterial]; + volume = Math.Abs(colInfo.relativeVel); + if (volume < 0.2f) + continue; + + volume *= volume * .0625f; // 4m/s == full volume + if (volume > 1.0f) + volume = 1.0f; + + soundID = m_TerrainPart[thisMaterial]; } - else // Remove this else when uncommenting the above - part.SendCollisionSound(soundID, volume, colInfo.position); + part.SendCollisionSound(soundID, volume, colInfo.position); doneownsound = true; } continue; @@ -268,35 +194,31 @@ namespace OpenSim.Region.Framework.Scenes if (volume == 0.0f) continue; } -// TODO: Import real collision sounds and uncomment this -// else -// { -// volume = Math.Abs(colInfo.relativeVel); -// if (volume < 0.2f) -// continue; -// -// volume *= volume * .0625f; // 4m/s == full volume -// if (volume > 1.0f) -// volume = 1.0f; -// -// int otherMaterial = (int)otherPart.Material; -// if (otherMaterial >= MaxMaterials) -// otherMaterial = 3; -// -// soundID = m_PartPart[thisMatScaled + otherMaterial]; -// } - } - - if (soundID != UUID.Zero) // Remove when sounds are there - { // Remove when sounds are there - if (doneownsound) - otherPart.SendCollisionSound(soundID, volume, colInfo.position); else { - part.SendCollisionSound(soundID, volume, colInfo.position); - doneownsound = true; + volume = Math.Abs(colInfo.relativeVel); + if (volume < 0.2f) + continue; + + volume *= volume * .0625f; // 4m/s == full volume + if (volume > 1.0f) + volume = 1.0f; + + int otherMaterial = (int)otherPart.Material; + if (otherMaterial >= MaxMaterials) + otherMaterial = 3; + + soundID = m_PartPart[thisMatScaled + otherMaterial]; } - } // Remove when sounds are there + } + + if (doneownsound) + otherPart.SendCollisionSound(soundID, volume, colInfo.position); + else + { + part.SendCollisionSound(soundID, volume, colInfo.position); + doneownsound = true; + } } } } @@ -341,23 +263,25 @@ namespace OpenSim.Region.Framework.Scenes continue; if (otherPart.CollisionSoundType > 0 && otherPart.CollisionSoundVolume > 0f) otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume, colInfo.position); -//TODO: uncomment below when sounds are uploaded -// else -// { -// volume = Math.Abs(colInfo.relativeVel); -// if (volume < 0.2f) -// continue; -// -// volume *= volume * .0625f; // 4m/s == full volume -// if (volume > 1.0f) -// volume = 1.0f; -// otherMaterial = (int)otherPart.Material; -// if (otherMaterial >= MaxMaterials) -// otherMaterial = 3; -// -// soundID = m_PartPart[thisMatScaled + otherMaterial]; -// otherPart.SendCollisionSound(soundID, volume, colInfo.position); -// } + else + { + volume = Math.Abs(colInfo.relativeVel); + if (volume < 0.2f) + continue; + m_log.DebugFormat("Collision speed was {0}", volume); + + // Cap to 0.2 times volume because climbing stairs should not be noisy + // Also changed scaling + volume *= volume * .0125f; // 4m/s == volume 0.2 + if (volume > 0.2f) + volume = 0.2f; + otherMaterial = (int)otherPart.Material; + if (otherMaterial >= MaxMaterials) + otherMaterial = 3; + + soundID = m_PartPart[thisMatScaled + otherMaterial]; + otherPart.SendCollisionSound(soundID, volume, colInfo.position); + } continue; } /* -- cgit v1.1