remove further mono compiler warnings
							parent
							
								
									3d095e84d6
								
							
						
					
					
						commit
						04ecd748d9
					
				| 
						 | 
				
			
			@ -50,8 +50,8 @@ namespace OpenSim.Framework.Capabilities
 | 
			
		|||
 | 
			
		||||
    public class Caps
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log =
 | 
			
		||||
            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
//        private static readonly ILog m_log =
 | 
			
		||||
//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
 | 
			
		||||
        private string m_httpListenerHostName;
 | 
			
		||||
        private uint m_httpListenPort;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -43,7 +43,7 @@ namespace OpenSim.Data.MySQL
 | 
			
		|||
    public class MySQLAvatarData : MySQLGenericTableHandler<AvatarBaseData>,
 | 
			
		||||
            IAvatarData
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
 | 
			
		||||
        public MySQLAvatarData(string connectionString, string realm) :
 | 
			
		||||
                base(connectionString, realm, "Avatar")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,7 +48,7 @@ namespace OpenSim.Data.MySQL
 | 
			
		|||
        private string m_connectionString;
 | 
			
		||||
        private long m_waitTimeout;
 | 
			
		||||
        private long m_waitTimeoutLeeway = 60 * TimeSpan.TicksPerSecond;
 | 
			
		||||
        private long m_lastConnectionUse;
 | 
			
		||||
//        private long m_lastConnectionUse;
 | 
			
		||||
 | 
			
		||||
        private FieldInfo[] m_Fields;
 | 
			
		||||
        private Dictionary<string, FieldInfo> m_FieldMap =
 | 
			
		||||
| 
						 | 
				
			
			@ -127,7 +127,7 @@ namespace OpenSim.Data.MySQL
 | 
			
		|||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                m_lastConnectionUse = DateTime.Now.Ticks;
 | 
			
		||||
//                m_lastConnectionUse = DateTime.Now.Ticks;
 | 
			
		||||
 | 
			
		||||
                m_log.DebugFormat(
 | 
			
		||||
                    "[REGION DB]: Connection wait timeout {0} seconds",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -39,7 +39,7 @@ namespace OpenSim.Data.MySQL
 | 
			
		|||
{
 | 
			
		||||
    public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new()
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        
 | 
			
		||||
        protected Dictionary<string, FieldInfo> m_Fields =
 | 
			
		||||
                new Dictionary<string, FieldInfo>();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -43,7 +43,7 @@ namespace OpenSim.Data.MySQL
 | 
			
		|||
    public class MySQLPresenceData : MySQLGenericTableHandler<PresenceData>,
 | 
			
		||||
            IPresenceData
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
 | 
			
		||||
        public MySQLPresenceData(string connectionString, string realm) :
 | 
			
		||||
                base(connectionString, realm, "Presence")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -189,7 +189,7 @@ namespace OpenSim.Data.MySQL
 | 
			
		|||
                    {
 | 
			
		||||
                        cmd.ExecuteNonQuery();
 | 
			
		||||
                    }
 | 
			
		||||
                    catch (Exception e)
 | 
			
		||||
                    catch (Exception)
 | 
			
		||||
                    {
 | 
			
		||||
                        return false;
 | 
			
		||||
                    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3151,7 +3151,7 @@ namespace OpenSim.Region.Framework.Scenes
 | 
			
		|||
            {
 | 
			
		||||
                cAgent.AttachmentObjects = new List<ISceneObject>();
 | 
			
		||||
                cAgent.AttachmentObjectStates = new List<string>();
 | 
			
		||||
                IScriptModule se = m_scene.RequestModuleInterface<IScriptModule>();
 | 
			
		||||
//                IScriptModule se = m_scene.RequestModuleInterface<IScriptModule>();
 | 
			
		||||
                m_InTransitScriptStates.Clear();
 | 
			
		||||
                foreach (SceneObjectGroup sog in m_attachments)
 | 
			
		||||
                {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue