aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2016-11-22 09:35:37 +0000
committerUbitUmarov2016-11-22 09:35:37 +0000
commit385a265971372a556a94ef5f96ea61f9065c041d (patch)
treecbed01303a3aaf28487dbe572d326db7f62f1e5d /OpenSim
parentreplace datetime.now on just timming by faster utcnow (diff)
downloadopensim-SC-385a265971372a556a94ef5f96ea61f9065c041d.zip
opensim-SC-385a265971372a556a94ef5f96ea61f9065c041d.tar.gz
opensim-SC-385a265971372a556a94ef5f96ea61f9065c041d.tar.bz2
opensim-SC-385a265971372a556a94ef5f96ea61f9065c041d.tar.xz
supress some warnings by explict(confirm) the hide of parent fields
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs14
2 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index fe0a243..5164289 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -55,9 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
55 protected List<string> FreezeCache = new List<string>(); 55 protected List<string> FreezeCache = new List<string>();
56 protected string m_adminPrefix = ""; 56 protected string m_adminPrefix = "";
57 protected object m_syncy = new object(); 57 protected object m_syncy = new object();
58
59 protected IConfig m_config; 58 protected IConfig m_config;
60
61 #region ISharedRegionModule Members 59 #region ISharedRegionModule Members
62 public virtual void Initialise(IConfigSource config) 60 public virtual void Initialise(IConfigSource config)
63 { 61 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index c48e585..c4a70c0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -53,15 +53,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
53 { 53 {
54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
55 55
56 private const int DEBUG_CHANNEL = 2147483647; 56// private const int DEBUG_CHANNEL = 2147483647; use base value
57 57
58 private List<IScene> m_scenes = new List<IScene>(); 58 private new List<IScene> m_scenes = new List<IScene>();
59 private List<IScene> m_conciergedScenes = new List<IScene>(); 59 private List<IScene> m_conciergedScenes = new List<IScene>();
60 60
61 private bool m_replacingChatModule = false; 61 private bool m_replacingChatModule = false;
62 62
63 private IConfig m_config;
64
65 private string m_whoami = "conferencier"; 63 private string m_whoami = "conferencier";
66 private Regex m_regions = null; 64 private Regex m_regions = null;
67 private string m_welcomes = null; 65 private string m_welcomes = null;
@@ -72,14 +70,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
72 private string m_brokerURI = String.Empty; 70 private string m_brokerURI = String.Empty;
73 private int m_brokerUpdateTimeout = 300; 71 private int m_brokerUpdateTimeout = 300;
74 72
75 internal object m_syncy = new object(); 73 internal new object m_syncy = new object();
76 74
77 internal bool m_enabled = false; 75 internal new bool m_enabled = false;
78 76
79 #region ISharedRegionModule Members 77 #region ISharedRegionModule Members
80 public override void Initialise(IConfigSource config) 78 public override void Initialise(IConfigSource config)
81 { 79 {
82 m_config = config.Configs["Concierge"]; 80 IConfig m_config = config.Configs["Concierge"];
83 81
84 if (null == m_config) 82 if (null == m_config)
85 return; 83 return;
@@ -89,7 +87,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
89 87
90 m_enabled = true; 88 m_enabled = true;
91 89
92
93 // check whether ChatModule has been disabled: if yes, 90 // check whether ChatModule has been disabled: if yes,
94 // then we'll "stand in" 91 // then we'll "stand in"
95 try 92 try
@@ -136,7 +133,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
136 } 133 }
137 } 134 }
138 135
139
140 public override void AddRegion(Scene scene) 136 public override void AddRegion(Scene scene)
141 { 137 {
142 if (!m_enabled) return; 138 if (!m_enabled) return;