aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormeta72010-08-10 09:17:30 -0700
committermeta72010-08-10 09:17:30 -0700
commitfb14390fb0446e225bca08ec2dc25960d1441728 (patch)
tree8b2b1ea36cf7aad262982ada6806bbb60e2c6fc2
parentResolve merge failure (diff)
downloadopensim-SC-fb14390fb0446e225bca08ec2dc25960d1441728.zip
opensim-SC-fb14390fb0446e225bca08ec2dc25960d1441728.tar.gz
opensim-SC-fb14390fb0446e225bca08ec2dc25960d1441728.tar.bz2
opensim-SC-fb14390fb0446e225bca08ec2dc25960d1441728.tar.xz
Note to self: don't break the build
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/TaskInventoryDictionary.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 6b65fba..a8a53f2 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Framework
99 // write call stack method names 99 // write call stack method names
100 foreach (StackFrame stackFrame in stackFrames) 100 foreach (StackFrame stackFrame in stackFrames)
101 { 101 {
102 m_log.Error("[SceneObjectGroup.m_parts] "+(stackFrame.GetMethod().Name); // write method name 102 m_log.Error("[SceneObjectGroup.m_parts] "+(stackFrame.GetMethod().Name)); // write method name
103 } 103 }
104 } 104 }
105 catch 105 catch
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ffe2094..20a2abc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Framework.Scenes
145 // write call stack method names 145 // write call stack method names
146 foreach (StackFrame stackFrame in stackFrames) 146 foreach (StackFrame stackFrame in stackFrames)
147 { 147 {
148 m_log.Error("[SceneObjectGroup.m_parts] "+(stackFrame.GetMethod().Name); // write method name 148 m_log.Error("[SceneObjectGroup.m_parts] "+(stackFrame.GetMethod().Name)); // write method name
149 } 149 }
150 150
151 m_partsLock.ExitReadLock(); 151 m_partsLock.ExitReadLock();