aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorUbitUmarov2012-05-19 16:35:48 +0100
committerUbitUmarov2012-05-19 16:35:48 +0100
commit10889c86d9d67ca994a090166ad53840ed1dedd0 (patch)
tree21f169cb630f952ccf70072ac1cb73761f16bda5 /OpenSim/Region/Framework/Scenes
parent a bit faster collision sound type verification plus a few fixes/changes (diff)
downloadopensim-SC_OLD-10889c86d9d67ca994a090166ad53840ed1dedd0.zip
opensim-SC_OLD-10889c86d9d67ca994a090166ad53840ed1dedd0.tar.gz
opensim-SC_OLD-10889c86d9d67ca994a090166ad53840ed1dedd0.tar.bz2
opensim-SC_OLD-10889c86d9d67ca994a090166ad53840ed1dedd0.tar.xz
reduce useless waste of cpu. Make character collision events be done similiar to parts. Let same thread do it all ( like in parts ) ( to change this some structs copies must be added)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 06dec8f..be94508 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4098,6 +4098,7 @@ namespace OpenSim.Region.Framework.Scenes
4098 4098
4099 private void RaiseCollisionScriptEvents(Dictionary<uint, ContactPoint> coldata) 4099 private void RaiseCollisionScriptEvents(Dictionary<uint, ContactPoint> coldata)
4100 { 4100 {
4101 /*
4101 lock(m_collisionEventLock) 4102 lock(m_collisionEventLock)
4102 { 4103 {
4103 if (m_collisionEventFlag) 4104 if (m_collisionEventFlag)
@@ -4107,6 +4108,7 @@ namespace OpenSim.Region.Framework.Scenes
4107 4108
4108 Util.FireAndForget(delegate(object x) 4109 Util.FireAndForget(delegate(object x)
4109 { 4110 {
4111 */
4110 try 4112 try
4111 { 4113 {
4112 List<uint> thisHitColliders = new List<uint>(); 4114 List<uint> thisHitColliders = new List<uint>();
@@ -4286,7 +4288,7 @@ namespace OpenSim.Region.Framework.Scenes
4286 { 4288 {
4287 m_collisionEventFlag = false; 4289 m_collisionEventFlag = false;
4288 } 4290 }
4289 }); 4291// });
4290 } 4292 }
4291 4293
4292 private void TeleportFlagsDebug() { 4294 private void TeleportFlagsDebug() {