ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2011-04-03 14:16:28 +01:00
parent 89a65df160 4f56c732bc
commit 15e0b55e66
9 changed files with 133 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
View File

@@ -80,16 +80,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
m_config = config.Configs["Concierge"];
if (null == m_config)
{
m_log.Info("[Concierge]: no config found, plugin disabled");
return;
}
if (!m_config.GetBoolean("enabled", false))
{
m_log.Info("[Concierge]: plugin disabled by configuration");
return;
}
m_enabled = true;
@@ -113,9 +108,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
{
m_replacingChatModule = false;
}
m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing");
// take note of concierge channel and of identity
m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel);
m_whoami = m_config.GetString("whoami", "conferencier");

6
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
View File

@@ -106,16 +106,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
m_Config = config.Configs["FreeSwitchVoice"];
if (m_Config == null)
{
m_log.Info("[FreeSwitchVoice] no config found, plugin disabled");
return;
}
if (!m_Config.GetBoolean("Enabled", false))
{
m_log.Info("[FreeSwitchVoice] plugin disabled by configuration");
return;
}
try
{

8
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
View File

@@ -121,16 +121,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
m_config = config.Configs["VivoxVoice"];
if (null == m_config)
{
m_log.Info("[VivoxVoice] no config found, plugin disabled");
return;
}
if (!m_config.GetBoolean("enabled", false))
{
m_log.Info("[VivoxVoice] plugin disabled by configuration");
return;
}
try
{
@@ -218,7 +212,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
m_pluginEnabled = true;
m_log.Info("[VivoxVoice] plugin enabled");
}
catch (Exception e)
{
@@ -228,7 +221,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
}
}
// Called to indicate that the module has been added to the region
public void AddRegion(Scene scene)
{

3
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
View File

@@ -86,13 +86,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
return;
}
m_log.Info("[GROUPS-MESSAGING]: Initializing GroupsMessagingModule");
m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
}
m_log.Info("[GROUPS-MESSAGING]: GroupsMessagingModule starting up");
}
public void AddRegion(Scene scene)

10
OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
View File

@@ -75,7 +75,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
if (source.Configs["MRM"].GetBoolean("Enabled", false))
{
m_log.Info("[MRM] Enabling MRM Module");
m_log.Info("[MRM]: Enabling MRM Module");
m_scene = scene;
// when hidden, we don't listen for client initiated script events
@@ -90,14 +90,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
scene.RegisterModuleInterface<IMRMModule>(this);
}
else
{
m_log.Info("[MRM] Disabled MRM Module (Disabled in ini)");
}
}
else
{
m_log.Info("[MRM] Disabled MRM Module (Default disabled)");
}
}