From 3afd64f2f77a1460bb03ee1d4a43fea67e8e5005 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 30 Oct 2014 01:29:03 +0100 Subject: [PATCH 1/2] Fix a script load issue --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index d2e41f8d38..d70aa45852 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -1946,7 +1946,7 @@ namespace OpenSim.Region.Framework.Scenes return; } - if (destPart.ScriptAccessPin != pin) + if (destPart.ScriptAccessPin == 0 || destPart.ScriptAccessPin != pin) { m_log.WarnFormat( "[PRIM INVENTORY]: " + From 27b70c3fce43ff07d5253554d8b8c5b7b5e87702 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 30 Oct 2014 01:29:22 +0100 Subject: [PATCH 2/2] Fix a potential nullref in Vivox --- .../Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 9e6cc1af6b..aef64d4beb 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs @@ -626,6 +626,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice // voice, if all do retrieve or obtain the parcel // voice channel LandData land = scene.GetLandData(avatar.AbsolutePosition); + if (land == null) + { + return ""; + } // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);