diff options
author | Teravus Ovares | 2009-07-25 15:49:10 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-07-25 15:49:10 +0000 |
commit | 64bd9a335444379ebe1cad8e34d5b5953a76f671 (patch) | |
tree | 66b9ce07dbf95e4c118e3d639068e2c44fc52f58 /OpenSim/Region/OptionalModules/Avatar/Voice | |
parent | * Apply http://opensimulator.org/mantis/view.php?id=3586 (diff) | |
download | opensim-SC-64bd9a335444379ebe1cad8e34d5b5953a76f671.zip opensim-SC-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.gz opensim-SC-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.bz2 opensim-SC-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.xz |
* Updates libOMV to version 0.7.0
* Uses mantis #3811 as a base (thanks jhuliman) with changes.
* E-mail regarding interface changes sent to the opensim-dev list
* Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index de12b0a..5fa7efd 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -443,7 +443,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
443 | // } | 443 | // } |
444 | // else | 444 | // else |
445 | 445 | ||
446 | if ((land.Flags & (uint)Parcel.ParcelFlags.AllowVoiceChat) == 0) | 446 | if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0) |
447 | { | 447 | { |
448 | m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel", | 448 | m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel", |
449 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName); | 449 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName); |
@@ -777,7 +777,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
777 | // Create parcel voice channel. If no parcel exists, then the voice channel ID is the same | 777 | // Create parcel voice channel. If no parcel exists, then the voice channel ID is the same |
778 | // as the directory ID. Otherwise, it reflects the parcel's ID. | 778 | // as the directory ID. Otherwise, it reflects the parcel's ID. |
779 | 779 | ||
780 | if (land.LocalID != 1 && (land.Flags & (uint)Parcel.ParcelFlags.UseEstateVoiceChan) == 0) | 780 | if (land.LocalID != 1 && (land.Flags & (uint)ParcelFlags.UseEstateVoiceChan) == 0) |
781 | { | 781 | { |
782 | landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, land.Name); | 782 | landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, land.Name); |
783 | landUUID = land.GlobalID.ToString(); | 783 | landUUID = land.GlobalID.ToString(); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 47309d0..5465678 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -651,7 +651,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
651 | channel_uri = String.Empty; | 651 | channel_uri = String.Empty; |
652 | } | 652 | } |
653 | 653 | ||
654 | if ((land.Flags & (uint)Parcel.ParcelFlags.AllowVoiceChat) == 0) | 654 | if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0) |
655 | { | 655 | { |
656 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel", | 656 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel", |
657 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName); | 657 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName); |
@@ -722,7 +722,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
722 | // Create parcel voice channel. If no parcel exists, then the voice channel ID is the same | 722 | // Create parcel voice channel. If no parcel exists, then the voice channel ID is the same |
723 | // as the directory ID. Otherwise, it reflects the parcel's ID. | 723 | // as the directory ID. Otherwise, it reflects the parcel's ID. |
724 | 724 | ||
725 | if (land.LocalID != 1 && (land.Flags & (uint)Parcel.ParcelFlags.UseEstateVoiceChan) == 0) | 725 | if (land.LocalID != 1 && (land.Flags & (uint)ParcelFlags.UseEstateVoiceChan) == 0) |
726 | { | 726 | { |
727 | landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, land.Name); | 727 | landName = String.Format("{0}:{1}", scene.RegionInfo.RegionName, land.Name); |
728 | landUUID = land.GlobalID.ToString(); | 728 | landUUID = land.GlobalID.ToString(); |