aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authoronefang2019-05-19 22:15:41 +1000
committeronefang2019-05-19 22:15:41 +1000
commit295e91b8f44a356ab742dedd27c1b7edfe7b1157 (patch)
treede336b1b137c27f94bd4e0a2fb63bea9b1de60e2 /OpenSim/Server
parentMove db directory out of tree. (diff)
downloadopensim-SC_OLD-295e91b8f44a356ab742dedd27c1b7edfe7b1157.zip
opensim-SC_OLD-295e91b8f44a356ab742dedd27c1b7edfe7b1157.tar.gz
opensim-SC_OLD-295e91b8f44a356ab742dedd27c1b7edfe7b1157.tar.bz2
opensim-SC_OLD-295e91b8f44a356ab742dedd27c1b7edfe7b1157.tar.xz
Move cache, config, logs out of tree, and various related clean ups.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs2
-rw-r--r--OpenSim/Server/Handlers/BakedTextures/XBakes.cs7
2 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 176e876..1484ee0 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Server.Base
85 string fileName = ""; 85 string fileName = "";
86 if (Assembly.GetEntryAssembly() != null) 86 if (Assembly.GetEntryAssembly() != null)
87 fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location); 87 fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
88 string iniFile = fileName + ".ini"; 88 string iniFile = Util.configDir() + fileName + ".ini";
89 string logConfig = null; 89 string logConfig = null;
90 90
91 IConfig startupConfig = argvConfig.Configs["Startup"]; 91 IConfig startupConfig = argvConfig.Configs["Startup"];
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
index 4e55433..0c74564 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
@@ -67,12 +67,7 @@ namespace OpenSim.Server.Handlers.BakedTextures
67 throw new Exception("No BakedTextureService configuration"); 67 throw new Exception("No BakedTextureService configuration");
68 } 68 }
69 69
70 m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty); 70 m_FSBase = assetConfig.GetString("BaseDirectory", Util.cacheDir() + "/bakes");
71 if (m_FSBase == String.Empty)
72 {
73 m_log.ErrorFormat("[BAKES]: BaseDirectory not specified");
74 throw new Exception("Configuration error");
75 }
76 71
77 m_log.Info("[BAKES]: XBakes service enabled"); 72 m_log.Info("[BAKES]: XBakes service enabled");
78 } 73 }