OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'avination-current'

avinationmerge
Melanie Thielker 2014-10-30 01:32:36 +01:00
parent d0dfa721f2 27b70c3fce
commit 30f3de549a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1974,7 +1974,7 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
} }
if (destPart.ScriptAccessPin != pin) if (destPart.ScriptAccessPin == 0 || destPart.ScriptAccessPin != pin)
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[PRIM INVENTORY]: " + "[PRIM INVENTORY]: " +

4
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
View File

@ -630,6 +630,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
// voice, if all do retrieve or obtain the parcel // voice, if all do retrieve or obtain the parcel
// voice channel // voice channel
LandData land = scene.GetLandData(avatar.AbsolutePosition); LandData land = scene.GetLandData(avatar.AbsolutePosition);
if (land == null)
{
return "<llsd><undef /></llsd>";
}
// m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", // 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); // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);