diff options
| author | Melanie | 2012-11-15 00:43:26 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-15 00:43:26 +0000 |
| commit | 06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e (patch) | |
| tree | 845198db417e19540641316f7a8a09c8169e7086 /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Added AssemblyInfos in the OpenSim.Server namespace dlls. (diff) | |
| download | opensim-SC-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.zip opensim-SC-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.gz opensim-SC-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.bz2 opensim-SC-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 2 |
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; | |||
| 36 | using System.Threading; | 36 | using System.Threading; |
| 37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
| 38 | using log4net; | 38 | using log4net; |
| 39 | using Mono.Addins; | ||
| 39 | using Nini.Config; | 40 | using Nini.Config; |
| 40 | using Nwc.XmlRpc; | 41 | using Nwc.XmlRpc; |
| 41 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
| @@ -49,6 +50,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps; | |||
| 49 | 50 | ||
| 50 | namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | 51 | namespace 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 | ||