aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorTeravus Ovares2009-07-25 15:49:10 +0000
committerTeravus Ovares2009-07-25 15:49:10 +0000
commit64bd9a335444379ebe1cad8e34d5b5953a76f671 (patch)
tree66b9ce07dbf95e4c118e3d639068e2c44fc52f58 /OpenSim/Region/OptionalModules
parent* Apply http://opensimulator.org/mantis/view.php?id=3586 (diff)
downloadopensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.zip
opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.gz
opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs3
4 files changed, 8 insertions, 6 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();
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
index 208ddb0..5fac189 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenMetaverse.Assets;
30 31
31namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 32namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
32{ 33{
@@ -38,6 +39,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
38 { 39 {
39 int Type { get; } 40 int Type { get; }
40 UUID AssetID { get; } 41 UUID AssetID { get; }
41 T RetreiveAsset<T>() where T : OpenMetaverse.Asset, new(); 42 T RetreiveAsset<T>() where T : Asset, new();
42 } 43 }
43} 44}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
index b9c0065..40693ab 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
@@ -32,6 +32,7 @@ using OpenSim.Framework;
32using OpenSim.Region.Framework.Scenes; 32using OpenSim.Region.Framework.Scenes;
33//using OpenSim.Services.AssetService; 33//using OpenSim.Services.AssetService;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenMetaverse.Assets;
35 36
36namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 37namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
37{ 38{
@@ -80,7 +81,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
80 public int Type { get { return m_privateItem.Type; } } 81 public int Type { get { return m_privateItem.Type; } }
81 public UUID AssetID { get { return m_privateItem.AssetID; } } 82 public UUID AssetID { get { return m_privateItem.AssetID; } }
82 83
83 public T RetreiveAsset<T>() where T : OpenMetaverse.Asset, new() 84 public T RetreiveAsset<T>() where T : OpenMetaverse.Assets.Asset, new()
84 { 85 {
85 AssetBase a = m_rootSceene.AssetService.Get(AssetID.ToString()); 86 AssetBase a = m_rootSceene.AssetService.Get(AssetID.ToString());
86 T result = new T(); 87 T result = new T();