aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-07 21:23:11 +0000
committerMelanie Thielker2009-07-07 21:23:11 +0000
commit4badac3c90cd0e77b2f79c14e2b5e7a08893583e (patch)
treefe2585a5f8cd48bc05e5cf7854d589eb46e15bff
parentUpdate prompt and make it settable from within the ini file (diff)
downloadopensim-SC_OLD-4badac3c90cd0e77b2f79c14e2b5e7a08893583e.zip
opensim-SC_OLD-4badac3c90cd0e77b2f79c14e2b5e7a08893583e.tar.gz
opensim-SC_OLD-4badac3c90cd0e77b2f79c14e2b5e7a08893583e.tar.bz2
opensim-SC_OLD-4badac3c90cd0e77b2f79c14e2b5e7a08893583e.tar.xz
Make a renamed OpenSim.Server.exe use the corret ini file, e.g.
renaming OpenSim.Server.exe to OpenSim.AssetServer.exe will cause OpenSim.AssetServer.ini to be read by that instance. This facilitates legacy usage
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 757b2c1..0c00c15 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
29using System.Xml; 30using System.Xml;
30using System.Threading; 31using System.Threading;
31using System.Reflection; 32using System.Reflection;
@@ -83,10 +84,8 @@ namespace OpenSim.Server.Base
83 84
84 // Automagically create the ini file name 85 // Automagically create the ini file name
85 // 86 //
86 string fullName = Assembly.GetEntryAssembly().FullName; 87 string fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
87 AssemblyName assemblyName = new AssemblyName(fullName); 88 string iniFile = fileName + ".ini";
88
89 string iniFile = assemblyName.Name + ".ini";
90 89
91 IConfig startupConfig = argvConfig.Configs["Startup"]; 90 IConfig startupConfig = argvConfig.Configs["Startup"];
92 if (startupConfig != null) 91 if (startupConfig != null)
@@ -204,7 +203,8 @@ namespace OpenSim.Server.Base
204 { 203 {
205 if (startupConfig != null) 204 if (startupConfig != null)
206 fileAppender.File = startupConfig.GetString("logfile", 205 fileAppender.File = startupConfig.GetString("logfile",
207 assemblyName.Name + ".log"); 206 fileName + ".log");
207 // assemblyName.Name + ".log");
208 } 208 }
209 209
210 // Register the quit command 210 // Register the quit command