aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2014-10-30 01:32:36 +0100
committerMelanie Thielker2014-10-30 01:32:36 +0100
commit30f3de549a8e726b8f4e46b7c8cf133655beaac2 (patch)
treeb252e19e0cd50bdaf0d870bec87b95f6d0be74a3 /OpenSim
parentchange last commit, need to send to Xbakes or changes will not be detected (diff)
parentFix a potential nullref in Vivox (diff)
downloadopensim-SC-30f3de549a8e726b8f4e46b7c8cf133655beaac2.zip
opensim-SC-30f3de549a8e726b8f4e46b7c8cf133655beaac2.tar.gz
opensim-SC-30f3de549a8e726b8f4e46b7c8cf133655beaac2.tar.bz2
opensim-SC-30f3de549a8e726b8f4e46b7c8cf133655beaac2.tar.xz
Merge branch 'avination-current'
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs4
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 87fee56..cd8c9a5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1974,7 +1974,7 @@ namespace OpenSim.Region.Framework.Scenes
1974 return; 1974 return;
1975 } 1975 }
1976 1976
1977 if (destPart.ScriptAccessPin != pin) 1977 if (destPart.ScriptAccessPin == 0 || destPart.ScriptAccessPin != pin)
1978 { 1978 {
1979 m_log.WarnFormat( 1979 m_log.WarnFormat(
1980 "[PRIM INVENTORY]: " + 1980 "[PRIM INVENTORY]: " +
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 38ba54d..6ee15ad 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -630,6 +630,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
630 // voice, if all do retrieve or obtain the parcel 630 // voice, if all do retrieve or obtain the parcel
631 // voice channel 631 // voice channel
632 LandData land = scene.GetLandData(avatar.AbsolutePosition); 632 LandData land = scene.GetLandData(avatar.AbsolutePosition);
633 if (land == null)
634 {
635 return "<llsd><undef /></llsd>";
636 }
633 637
634// m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", 638// m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}",
635// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); 639// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);