aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice
diff options
context:
space:
mode:
authorMelanie2012-11-15 00:43:26 +0000
committerMelanie2012-11-15 00:43:26 +0000
commit06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e (patch)
tree845198db417e19540641316f7a8a09c8169e7086 /OpenSim/Region/OptionalModules/Avatar/Voice
parentMerge branch 'master' into careminster (diff)
parentAdded AssemblyInfos in the OpenSim.Server namespace dlls. (diff)
downloadopensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.zip
opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.gz
opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.bz2
opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 8a8a31c..7da1de6 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -36,6 +36,7 @@ using System.Reflection;
36using System.Threading; 36using System.Threading;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39using Mono.Addins;
39using Nini.Config; 40using Nini.Config;
40using Nwc.XmlRpc; 41using Nwc.XmlRpc;
41using OpenSim.Framework; 42using OpenSim.Framework;
@@ -49,6 +50,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
49 50
50namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice 51namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
51{ 52{
53 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "VivoxVoiceModule")]
52 public class VivoxVoiceModule : ISharedRegionModule 54 public class VivoxVoiceModule : ISharedRegionModule
53 { 55 {
54 56