* minor: Remove most mono compiler warnings
							parent
							
								
									a5c9354df3
								
							
						
					
					
						commit
						36e648a37a
					
				| 
						 | 
				
			
			@ -41,7 +41,7 @@ namespace OpenSim.Client.MXP
 | 
			
		|||
    public class MXPModule : IRegionModule
 | 
			
		||||
    {
 | 
			
		||||
        private int mxp_Port = 1253;
 | 
			
		||||
        private double mxp_BubbleRadius = 181.01933598375616624661615669884; // Radius of a sphere big enough to encapsulate a 256x256 square
 | 
			
		||||
        //private double mxp_BubbleRadius = 181.01933598375616624661615669884; // Radius of a sphere big enough to encapsulate a 256x256 square
 | 
			
		||||
 | 
			
		||||
        private readonly Timer ticker = new Timer(100);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -38,7 +38,7 @@ namespace OpenSim.Data.Tests
 | 
			
		|||
{
 | 
			
		||||
    public class BasicAssetTest
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        public AssetDataBase db;
 | 
			
		||||
        public UUID uuid1;
 | 
			
		||||
        public UUID uuid2;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -40,7 +40,7 @@ namespace OpenSim.Data.Tests
 | 
			
		|||
{
 | 
			
		||||
    public class BasicEstateTest
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        public IEstateDataStore db;
 | 
			
		||||
        public IRegionDataStore regionDb;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -39,7 +39,7 @@ namespace OpenSim.Data.Tests
 | 
			
		|||
{
 | 
			
		||||
    public class BasicGridTest
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        public GridDataBase db;
 | 
			
		||||
        public UUID region1, region2, region3;
 | 
			
		||||
        public UUID zero = UUID.Zero;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -38,7 +38,7 @@ namespace OpenSim.Data.Tests
 | 
			
		|||
{
 | 
			
		||||
    public class BasicInventoryTest
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        public IInventoryDataPlugin db;
 | 
			
		||||
        public UUID zero = UUID.Zero;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -42,7 +42,7 @@ namespace OpenSim.Data.Tests
 | 
			
		|||
{
 | 
			
		||||
    public class BasicUserTest
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        public IUserDataPlugin db;
 | 
			
		||||
        public UUID user1;
 | 
			
		||||
        public UUID user2;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -42,7 +42,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
 | 
			
		|||
    public class BrowseFrontendPlugin : IAssetInventoryServerPlugin
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        private AssetInventoryServer m_server;
 | 
			
		||||
        //private AssetInventoryServer m_server;
 | 
			
		||||
 | 
			
		||||
        public BrowseFrontendPlugin()
 | 
			
		||||
        {
 | 
			
		||||
| 
						 | 
				
			
			@ -52,7 +52,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
 | 
			
		|||
 | 
			
		||||
        public void Initialise(AssetInventoryServer server)
 | 
			
		||||
        {
 | 
			
		||||
            m_server = server;
 | 
			
		||||
            //m_server = server;
 | 
			
		||||
 | 
			
		||||
            // Request for / or /?...
 | 
			
		||||
            //m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server));
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -40,7 +40,7 @@ namespace OpenSim.Grid.GridServer.Modules
 | 
			
		|||
{
 | 
			
		||||
    public class GridMessagingModule : IMessagingServerDiscovery
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
 | 
			
		||||
        protected GridDBService m_gridDBService;
 | 
			
		||||
        protected IGridServiceCore m_gridCore;
 | 
			
		||||
| 
						 | 
				
			
			@ -50,7 +50,7 @@ namespace OpenSim.Grid.GridServer.Modules
 | 
			
		|||
        /// <value>
 | 
			
		||||
        /// Used to notify old regions as to which OpenSim version to upgrade to
 | 
			
		||||
        /// </value>
 | 
			
		||||
        private string m_opensimVersion;
 | 
			
		||||
        //private string m_opensimVersion;
 | 
			
		||||
 | 
			
		||||
        protected BaseHttpServer m_httpServer;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -63,7 +63,7 @@ namespace OpenSim.Grid.GridServer.Modules
 | 
			
		|||
 | 
			
		||||
        public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config)
 | 
			
		||||
        {
 | 
			
		||||
            m_opensimVersion = opensimVersion;
 | 
			
		||||
            //m_opensimVersion = opensimVersion;
 | 
			
		||||
            m_gridDBService = gridDBService;
 | 
			
		||||
            m_gridCore = gridCore;
 | 
			
		||||
            m_config = config;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,7 @@ namespace OpenSim.Grid.GridServer.Modules
 | 
			
		|||
        /// <value>
 | 
			
		||||
        /// Used to notify old regions as to which OpenSim version to upgrade to
 | 
			
		||||
        /// </value>
 | 
			
		||||
        private string m_opensimVersion;
 | 
			
		||||
        //private string m_opensimVersion;
 | 
			
		||||
 | 
			
		||||
        protected BaseHttpServer m_httpServer;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer.Modules
 | 
			
		|||
 | 
			
		||||
        public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config)
 | 
			
		||||
        {
 | 
			
		||||
            m_opensimVersion = opensimVersion;
 | 
			
		||||
            //m_opensimVersion = opensimVersion;
 | 
			
		||||
            m_gridDBService = gridDBService;
 | 
			
		||||
            m_gridCore = gridCore;
 | 
			
		||||
            m_config = config;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules
 | 
			
		|||
{
 | 
			
		||||
    public class UserServerAvatarAppearanceModule
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
 | 
			
		||||
        private UserDataBaseService m_userDataBaseService;
 | 
			
		||||
        private BaseHttpServer m_httpServer;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules
 | 
			
		|||
{
 | 
			
		||||
    public class UserServerFriendsModule
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
 | 
			
		||||
        private UserDataBaseService m_userDataBaseService;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -241,10 +241,12 @@ namespace OpenSim.Grid.UserServer
 | 
			
		|||
            m_userDataBaseService.ResetUserPassword(firstName, lastName, newPassword);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        /*
 | 
			
		||||
        private void HandleTestCommand(string module, string[] cmd)
 | 
			
		||||
        {
 | 
			
		||||
            m_log.Info("test command received");
 | 
			
		||||
        }
 | 
			
		||||
        */
 | 
			
		||||
 | 
			
		||||
        private void HandleLoginCommand(string module, string[] cmd)
 | 
			
		||||
        {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -122,11 +122,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 | 
			
		|||
        public event PacketStats OnPacketStats;
 | 
			
		||||
        public event PacketDrop OnPacketDrop;
 | 
			
		||||
 | 
			
		||||
        private SynchronizeClientHandler m_SynchronizeClient = null;
 | 
			
		||||
        
 | 
			
		||||
        //private SynchronizeClientHandler m_SynchronizeClient = null;
 | 
			
		||||
 | 
			
		||||
        public SynchronizeClientHandler SynchronizeClient
 | 
			
		||||
        {
 | 
			
		||||
            set { m_SynchronizeClient = value; }
 | 
			
		||||
            set { /* m_SynchronizeClient = value; */ }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        // Packet sequencing
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,7 @@ namespace OpenSim.Region.Communications.Hypergrid
 | 
			
		|||
{
 | 
			
		||||
    public class HGGridServicesGridMode : HGGridServices
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// Encapsulate remote backend services for manipulation of grid regions
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -56,7 +56,7 @@ namespace OpenSim.Region.Communications.Hypergrid
 | 
			
		|||
        /// </summary>
 | 
			
		||||
        protected LocalBackEndServices m_localBackend = new LocalBackEndServices();
 | 
			
		||||
 | 
			
		||||
        private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>();
 | 
			
		||||
        //private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>();
 | 
			
		||||
 | 
			
		||||
        public LocalBackEndServices LocalBackend
 | 
			
		||||
        {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -426,7 +426,7 @@ namespace OpenSim.Region.Framework.Scenes
 | 
			
		|||
                throw new Exception("This constructor must specify the xml is in OpenSim's original format");
 | 
			
		||||
 | 
			
		||||
            //m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
 | 
			
		||||
            int time = System.Environment.TickCount;
 | 
			
		||||
            //int time = System.Environment.TickCount;
 | 
			
		||||
 | 
			
		||||
            // libomv.types changes UUID to Guid
 | 
			
		||||
            xmlData = xmlData.Replace("<UUID>", "<Guid>");
 | 
			
		||||
| 
						 | 
				
			
			@ -769,7 +769,7 @@ namespace OpenSim.Region.Framework.Scenes
 | 
			
		|||
        public void ToXml2(XmlTextWriter writer)
 | 
			
		||||
        {
 | 
			
		||||
            //m_log.DebugFormat("[SOG]: Starting serialization of SOG {0} to XML2", Name);
 | 
			
		||||
            int time = System.Environment.TickCount;
 | 
			
		||||
            //int time = System.Environment.TickCount;
 | 
			
		||||
 | 
			
		||||
            writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
 | 
			
		||||
            m_rootPart.ToXml(writer);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -42,7 +42,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
 | 
			
		|||
    /// </summary>
 | 
			
		||||
    public class PhysXPlugin : IPhysicsPlugin
 | 
			
		||||
    {
 | 
			
		||||
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 
 | 
			
		||||
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 
 | 
			
		||||
        private PhysXScene _mScene;
 | 
			
		||||
 | 
			
		||||
        public PhysXPlugin()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -622,7 +622,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 | 
			
		|||
                fs.Read(data, 0, data.Length);
 | 
			
		||||
                fs.Close();
 | 
			
		||||
            }
 | 
			
		||||
            catch (Exception e)
 | 
			
		||||
            catch (Exception)
 | 
			
		||||
            {
 | 
			
		||||
                string errtext = String.Empty;
 | 
			
		||||
                errtext += "No compile error. But not able to open file.";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue