supress some warnings by explict(confirm) the hide of parent fields
parent
4e64445c39
commit
385a265971
|
@ -55,9 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
|
|||
protected List<string> FreezeCache = new List<string>();
|
||||
protected string m_adminPrefix = "";
|
||||
protected object m_syncy = new object();
|
||||
|
||||
protected IConfig m_config;
|
||||
|
||||
#region ISharedRegionModule Members
|
||||
public virtual void Initialise(IConfigSource config)
|
||||
{
|
||||
|
|
|
@ -53,15 +53,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
|
|||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private const int DEBUG_CHANNEL = 2147483647;
|
||||
// private const int DEBUG_CHANNEL = 2147483647; use base value
|
||||
|
||||
private List<IScene> m_scenes = new List<IScene>();
|
||||
private new List<IScene> m_scenes = new List<IScene>();
|
||||
private List<IScene> m_conciergedScenes = new List<IScene>();
|
||||
|
||||
private bool m_replacingChatModule = false;
|
||||
|
||||
private IConfig m_config;
|
||||
|
||||
private string m_whoami = "conferencier";
|
||||
private Regex m_regions = null;
|
||||
private string m_welcomes = null;
|
||||
|
@ -72,14 +70,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
|
|||
private string m_brokerURI = String.Empty;
|
||||
private int m_brokerUpdateTimeout = 300;
|
||||
|
||||
internal object m_syncy = new object();
|
||||
internal new object m_syncy = new object();
|
||||
|
||||
internal bool m_enabled = false;
|
||||
internal new bool m_enabled = false;
|
||||
|
||||
#region ISharedRegionModule Members
|
||||
public override void Initialise(IConfigSource config)
|
||||
{
|
||||
m_config = config.Configs["Concierge"];
|
||||
IConfig m_config = config.Configs["Concierge"];
|
||||
|
||||
if (null == m_config)
|
||||
return;
|
||||
|
@ -89,7 +87,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
|
|||
|
||||
m_enabled = true;
|
||||
|
||||
|
||||
// check whether ChatModule has been disabled: if yes,
|
||||
// then we'll "stand in"
|
||||
try
|
||||
|
@ -136,7 +133,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
public override void AddRegion(Scene scene)
|
||||
{
|
||||
if (!m_enabled) return;
|
||||
|
|
Loading…
Reference in New Issue