diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Util.cs | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index e0e35db..cc449af 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -1304,8 +1304,19 @@ namespace OpenSim.Framework | |||
1304 | return Path.Combine(configDir(), "inventory"); | 1304 | return Path.Combine(configDir(), "inventory"); |
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | public static string dbDir() | ||
1308 | { | ||
1309 | return Path.Combine("..", Path.Combine("..", "db")); | ||
1310 | } | ||
1311 | |||
1312 | public static string cacheDir() | ||
1313 | { | ||
1314 | return Path.Combine("..", Path.Combine("..", "caches")); | ||
1315 | } | ||
1316 | |||
1307 | public static string configDir() | 1317 | public static string configDir() |
1308 | { | 1318 | { |
1319 | // return Path.Combine("..", Path.Combine("..", "config")); | ||
1309 | return "."; | 1320 | return "."; |
1310 | } | 1321 | } |
1311 | 1322 | ||
@@ -1314,6 +1325,16 @@ namespace OpenSim.Framework | |||
1314 | return "."; | 1325 | return "."; |
1315 | } | 1326 | } |
1316 | 1327 | ||
1328 | public static string logsDir() | ||
1329 | { | ||
1330 | return Path.Combine("..", "logs"); | ||
1331 | } | ||
1332 | |||
1333 | public static string webDir() | ||
1334 | { | ||
1335 | return Path.Combine("..", Path.Combine("..", "web")); | ||
1336 | } | ||
1337 | |||
1317 | public static string logFile() | 1338 | public static string logFile() |
1318 | { | 1339 | { |
1319 | foreach (IAppender appender in LogManager.GetRepository().GetAppenders()) | 1340 | foreach (IAppender appender in LogManager.GetRepository().GetAppenders()) |
@@ -1324,7 +1345,7 @@ namespace OpenSim.Framework | |||
1324 | } | 1345 | } |
1325 | } | 1346 | } |
1326 | 1347 | ||
1327 | return "./OpenSim.log"; | 1348 | return Path.Combine(logsDir(), "OpenSim.log"); |
1328 | } | 1349 | } |
1329 | 1350 | ||
1330 | public static string statsLogFile() | 1351 | public static string statsLogFile() |
@@ -1337,7 +1358,7 @@ namespace OpenSim.Framework | |||
1337 | } | 1358 | } |
1338 | } | 1359 | } |
1339 | 1360 | ||
1340 | return "./OpenSimStats.log"; | 1361 | return Path.Combine(logsDir(), "OpenSimStats.log"); |
1341 | } | 1362 | } |
1342 | 1363 | ||
1343 | public static string logDir() | 1364 | public static string logDir() |