diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/MessageServerConfig.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs index 5e1daee..d2f07b9 100644 --- a/OpenSim/Framework/MessageServerConfig.cs +++ b/OpenSim/Framework/MessageServerConfig.cs | |||
@@ -39,7 +39,6 @@ namespace OpenSim.Framework | |||
39 | private ConfigurationMember configMember; | 39 | private ConfigurationMember configMember; |
40 | public string DatabaseProvider = String.Empty; | 40 | public string DatabaseProvider = String.Empty; |
41 | public string DatabaseConnect = String.Empty; | 41 | public string DatabaseConnect = String.Empty; |
42 | public string DefaultStartupMsg = String.Empty; | ||
43 | public string GridCommsProvider = String.Empty; | 42 | public string GridCommsProvider = String.Empty; |
44 | public string GridRecvKey = String.Empty; | 43 | public string GridRecvKey = String.Empty; |
45 | public string GridSendKey = String.Empty; | 44 | public string GridSendKey = String.Empty; |
@@ -77,11 +76,9 @@ namespace OpenSim.Framework | |||
77 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 76 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
78 | "Key to expect from grid server", "null", false); | 77 | "Key to expect from grid server", "null", false); |
79 | 78 | ||
80 | |||
81 | configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 79 | configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
82 | "Connection String for Database", "", false); | 80 | "Connection String for Database", "", false); |
83 | 81 | ||
84 | |||
85 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 82 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
86 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); | 83 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); |
87 | 84 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0acbd31..2d0215f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
80 | 80 | ||
81 | private int m_probesWithNoIngressPackets = 0; | 81 | private int m_probesWithNoIngressPackets = 0; |
82 | //private int m_lastPacketsReceived = 0; | 82 | //private int m_lastPacketsReceived = 0; |
83 | private byte[] ZeroOutBuffer = new byte[4096]; | 83 | //private byte[] ZeroOutBuffer = new byte[4096]; |
84 | 84 | ||
85 | private readonly LLUUID m_agentId; | 85 | private readonly LLUUID m_agentId; |
86 | private readonly uint m_circuitCode; | 86 | 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 aacbd55..53533ec 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 | |||
124 | //m_log.Info(ScriptEngineName, "LSL_BaseClass.Start() called."); | 124 | //m_log.Info(ScriptEngineName, "LSL_BaseClass.Start() called."); |
125 | 125 | ||
126 | // Get this AppDomain's settings and display some of them. | 126 | // Get this AppDomain's settings and display some of them. |
127 | AppDomainSetup ads = AppDomain.CurrentDomain.SetupInformation; | 127 | // AppDomainSetup ads = AppDomain.CurrentDomain.SetupInformation; |
128 | // Console.WriteLine("AppName={0}, AppBase={1}, ConfigFile={2}", | 128 | // Console.WriteLine("AppName={0}, AppBase={1}, ConfigFile={2}", |
129 | // ads.ApplicationName, | 129 | // ads.ApplicationName, |
130 | // ads.ApplicationBase, | 130 | // ads.ApplicationBase, |