aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
2 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b179646..ffe2094 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Diagnostics;
32using System.Threading; 33using System.Threading;
33using System.Xml; 34using System.Xml;
34using System.Xml.Serialization; 35using System.Xml.Serialization;
@@ -138,6 +139,15 @@ namespace OpenSim.Region.Framework.Scenes
138 m_log.Error("[SceneObjectGroup.m_parts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue."); 139 m_log.Error("[SceneObjectGroup.m_parts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
139 try 140 try
140 { 141 {
142 StackTrace stackTrace = new StackTrace(); // get call stack
143 StackFrame[] stackFrames = stackTrace.GetFrames(); // get method calls (frames)
144
145 // write call stack method names
146 foreach (StackFrame stackFrame in stackFrames)
147 {
148 m_log.Error("[SceneObjectGroup.m_parts] "+(stackFrame.GetMethod().Name); // write method name
149 }
150
141 m_partsLock.ExitReadLock(); 151 m_partsLock.ExitReadLock();
142 } 152 }
143 catch { } // Ignore errors, to allow resync 153 catch { } // Ignore errors, to allow resync
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ba1f562..fbe1da9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3332,7 +3332,7 @@ namespace OpenSim.Region.Framework.Scenes
3332 texcolor.B = Util.Clip((float)color.Z, 0.0f, 1.0f); 3332 texcolor.B = Util.Clip((float)color.Z, 0.0f, 1.0f);
3333 tex.FaceTextures[face].RGBA = texcolor; 3333 tex.FaceTextures[face].RGBA = texcolor;
3334 UpdateTexture(tex); 3334 UpdateTexture(tex);
3335 TriggerScriptChangedEvent(Changed.COLOR); 3335 TriggerScriptChangedEvent(Changed.COLOR);
3336 return; 3336 return;
3337 } 3337 }
3338 else if (face == ALL_SIDES) 3338 else if (face == ALL_SIDES)
@@ -3354,7 +3354,7 @@ namespace OpenSim.Region.Framework.Scenes
3354 tex.DefaultTexture.RGBA = texcolor; 3354 tex.DefaultTexture.RGBA = texcolor;
3355 } 3355 }
3356 UpdateTexture(tex); 3356 UpdateTexture(tex);
3357 TriggerScriptChangedEvent(Changed.COLOR); 3357 TriggerScriptChangedEvent(Changed.COLOR);
3358 return; 3358 return;
3359 } 3359 }
3360 } 3360 }