diff options
| author | UbitUmarov | 2014-07-16 16:16:37 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-07-16 16:16:37 +0100 |
| commit | fc1bd4567db449ddcc99f142027e68e5b890b1f1 (patch) | |
| tree | e61e1f2c4f7b6eb09bd427783569827a9bf29855 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in... (diff) | |
| parent | Differentiate between requests only the owner should be able to do and those (diff) | |
| download | opensim-SC-fc1bd4567db449ddcc99f142027e68e5b890b1f1.zip opensim-SC-fc1bd4567db449ddcc99f142027e68e5b890b1f1.tar.gz opensim-SC-fc1bd4567db449ddcc99f142027e68e5b890b1f1.tar.bz2 opensim-SC-fc1bd4567db449ddcc99f142027e68e5b890b1f1.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index e756c70..9e6cc1a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
| @@ -635,15 +635,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
| 635 | // TODO: EstateSettings don't seem to get propagated... | 635 | // TODO: EstateSettings don't seem to get propagated... |
| 636 | if (!scene.RegionInfo.EstateSettings.AllowVoice) | 636 | if (!scene.RegionInfo.EstateSettings.AllowVoice) |
| 637 | { | 637 | { |
| 638 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": voice not enabled in estate settings", | 638 | //m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": voice not enabled in estate settings", |
| 639 | scene.RegionInfo.RegionName); | 639 | // scene.RegionInfo.RegionName); |
| 640 | channel_uri = String.Empty; | 640 | channel_uri = String.Empty; |
| 641 | } | 641 | } |
| 642 | 642 | ||
| 643 | if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0) | 643 | if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0) |
| 644 | { | 644 | { |
| 645 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel", | 645 | //m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel", |
| 646 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName); | 646 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName); |
| 647 | channel_uri = String.Empty; | 647 | channel_uri = String.Empty; |
| 648 | } | 648 | } |
| 649 | else | 649 | else |