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

Fix a potential nullref in Vivox

avinationmerge
Melanie Thielker 2014-10-30 01:29:22 +01:00
parent 3afd64f2f7
commit 27b70c3fce
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,6 +626,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);