aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-03-31 14:50:14 +0100
committerMelanie Thielker2017-03-31 14:50:14 +0100
commit5587ee45005bd99ee01cefd8fb3ae3f2b91bf284 (patch)
tree2863324dc4f7832d60c22118268b8a432fb7c1bf /OpenSim/Framework/Util.cs
parentadd CanSellObject() permitions check functions (diff)
parentIf a DNS resolution fails on an outbound request, simply allow it (diff)
downloadopensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.zip
opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.gz
opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.bz2
opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.xz
Merge branch 'melanie'
Diffstat (limited to 'OpenSim/Framework/Util.cs')
-rw-r--r--OpenSim/Framework/Util.cs15
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 9f5868b..0ec24e6 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1192,7 +1192,7 @@ namespace OpenSim.Framework
1192 { 1192 {
1193 foreach (IAppender appender in LogManager.GetRepository().GetAppenders()) 1193 foreach (IAppender appender in LogManager.GetRepository().GetAppenders())
1194 { 1194 {
1195 if (appender is FileAppender) 1195 if (appender is FileAppender && appender.Name == "LogFileAppender")
1196 { 1196 {
1197 return ((FileAppender)appender).File; 1197 return ((FileAppender)appender).File;
1198 } 1198 }
@@ -1201,6 +1201,19 @@ namespace OpenSim.Framework
1201 return "./OpenSim.log"; 1201 return "./OpenSim.log";
1202 } 1202 }
1203 1203
1204 public static string statsLogFile()
1205 {
1206 foreach (IAppender appender in LogManager.GetRepository().GetAppenders())
1207 {
1208 if (appender is FileAppender && appender.Name == "StatsLogFileAppender")
1209 {
1210 return ((FileAppender)appender).File;
1211 }
1212 }
1213
1214 return "./OpenSimStats.log";
1215 }
1216
1204 public static string logDir() 1217 public static string logDir()
1205 { 1218 {
1206 return Path.GetDirectoryName(logFile()); 1219 return Path.GetDirectoryName(logFile());