diff options
| author | Melanie Thielker | 2014-10-30 01:32:36 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2014-10-30 01:32:36 +0100 |
| commit | 30f3de549a8e726b8f4e46b7c8cf133655beaac2 (patch) | |
| tree | b252e19e0cd50bdaf0d870bec87b95f6d0be74a3 /OpenSim/Region/OptionalModules/Avatar | |
| parent | change last commit, need to send to Xbakes or changes will not be detected (diff) | |
| parent | Fix a potential nullref in Vivox (diff) | |
| download | opensim-SC_OLD-30f3de549a8e726b8f4e46b7c8cf133655beaac2.zip opensim-SC_OLD-30f3de549a8e726b8f4e46b7c8cf133655beaac2.tar.gz opensim-SC_OLD-30f3de549a8e726b8f4e46b7c8cf133655beaac2.tar.bz2 opensim-SC_OLD-30f3de549a8e726b8f4e46b7c8cf133655beaac2.tar.xz | |
Merge branch 'avination-current'
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
| -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 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); |