diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs index 5e1daee21d..d2f07b9206 100644 --- a/OpenSim/Framework/MessageServerConfig.cs +++ b/OpenSim/Framework/MessageServerConfig.cs @@ -39,7 +39,6 @@ namespace OpenSim.Framework private ConfigurationMember configMember; public string DatabaseProvider = String.Empty; public string DatabaseConnect = String.Empty; - public string DefaultStartupMsg = String.Empty; public string GridCommsProvider = String.Empty; public string GridRecvKey = String.Empty; public string GridSendKey = String.Empty; @@ -77,11 +76,9 @@ namespace OpenSim.Framework configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false); - configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Connection String for Database", "", false); - configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Data.MySQL.dll", false); diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0acbd31b74..2d0215f24f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private int m_probesWithNoIngressPackets = 0; //private int m_lastPacketsReceived = 0; - private byte[] ZeroOutBuffer = new byte[4096]; + //private byte[] ZeroOutBuffer = new byte[4096]; private readonly LLUUID m_agentId; private readonly uint m_circuitCode; diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index aacbd555ac..53533ec710 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs @@ -124,7 +124,7 @@ namespace OpenSim.Region.ScriptEngine.Common //m_log.Info(ScriptEngineName, "LSL_BaseClass.Start() called."); // Get this AppDomain's settings and display some of them. - AppDomainSetup ads = AppDomain.CurrentDomain.SetupInformation; + // AppDomainSetup ads = AppDomain.CurrentDomain.SetupInformation; // Console.WriteLine("AppName={0}, AppBase={1}, ConfigFile={2}", // ads.ApplicationName, // ads.ApplicationBase,