ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-02 00:15:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2012-02-10 23:59:10 +00:00
parent 4455140f30 5023cc86f0
commit acfe7e555e
6 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/RegionInfo.cs
View File

@@ -627,7 +627,6 @@ namespace OpenSim.Framework
foreach (String s in allKeys)
{
string val = config.GetString(s);
SetOtherSetting(s, config.GetString(s));
}
}

5
OpenSim/Framework/Util.cs
View File

@@ -1676,13 +1676,14 @@ namespace OpenSim.Framework
/// </summary>
public static void PrintCallStack()
{
StackTrace stackTrace = new StackTrace(); // get call stack
StackTrace stackTrace = new StackTrace(true); // get call stack
StackFrame[] stackFrames = stackTrace.GetFrames(); // get method calls (frames)
// write call stack method names
foreach (StackFrame stackFrame in stackFrames)
{
m_log.Debug(stackFrame.GetMethod().DeclaringType + "." + stackFrame.GetMethod().Name); // write method name
MethodBase mb = stackFrame.GetMethod();
m_log.DebugFormat("{0}.{1}:{2}", mb.DeclaringType, mb.Name, stackFrame.GetFileLineNumber()); // write method name
}
}