diff options
| author | Melanie Thielker | 2014-10-30 01:29:22 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2014-10-30 01:29:22 +0100 |
| commit | 27b70c3fce43ff07d5253554d8b8c5b7b5e87702 (patch) | |
| tree | 3ba0a43243790fe0334f5898f0234aec3fec5012 | |
| parent | Fix a script load issue (diff) | |
| download | opensim-SC_OLD-27b70c3fce43ff07d5253554d8b8c5b7b5e87702.zip opensim-SC_OLD-27b70c3fce43ff07d5253554d8b8c5b7b5e87702.tar.gz opensim-SC_OLD-27b70c3fce43ff07d5253554d8b8c5b7b5e87702.tar.bz2 opensim-SC_OLD-27b70c3fce43ff07d5253554d8b8c5b7b5e87702.tar.xz | |
Fix a potential nullref in Vivox
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 9e6cc1a..aef64d4 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 | |||
| 626 | // voice, if all do retrieve or obtain the parcel | 626 | // voice, if all do retrieve or obtain the parcel |
| 627 | // voice channel | 627 | // voice channel |
| 628 | LandData land = scene.GetLandData(avatar.AbsolutePosition); | 628 | LandData land = scene.GetLandData(avatar.AbsolutePosition); |
| 629 | if (land == null) | ||
| 630 | { | ||
| 631 | return "<llsd><undef /></llsd>"; | ||
| 632 | } | ||
| 629 | 633 | ||
| 630 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", | 634 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", |
| 631 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); | 635 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); |