aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer
diff options
context:
space:
mode:
authorUbitUmarov2012-08-28 03:21:03 +0100
committerUbitUmarov2012-08-28 03:21:03 +0100
commitef6e007a4c7301dbd7a1a0392a07664e7034201b (patch)
tree090ee81b2784f6e3f21fe8e0df72c089d5ea9f5c /OpenSim/Region/CoreModules/Framework/EntityTransfer
parent fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal (diff)
downloadopensim-SC-ef6e007a4c7301dbd7a1a0392a07664e7034201b.zip
opensim-SC-ef6e007a4c7301dbd7a1a0392a07664e7034201b.tar.gz
opensim-SC-ef6e007a4c7301dbd7a1a0392a07664e7034201b.tar.bz2
opensim-SC-ef6e007a4c7301dbd7a1a0392a07664e7034201b.tar.xz
[possible still very broken] mess around keyframes. timer events
threads overlaps, some null objects exceptions, region crossing...
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 560f807..9ffb851 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1855,6 +1855,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1855 if (grp.RootPart.PhysActor != null) 1855 if (grp.RootPart.PhysActor != null)
1856 grp.RootPart.PhysActor.CrossingFailure(); 1856 grp.RootPart.PhysActor.CrossingFailure();
1857 1857
1858 if (grp.RootPart.KeyframeMotion != null)
1859 grp.RootPart.KeyframeMotion.CrossingFailure();
1860
1858 grp.ScheduleGroupForFullUpdate(); 1861 grp.ScheduleGroupForFullUpdate();
1859 } 1862 }
1860 1863
@@ -1910,8 +1913,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1910 grp, e); 1913 grp, e);
1911 } 1914 }
1912 } 1915 }
1916/*
1917 * done on caller ( not in attachments crossing for now)
1913 else 1918 else
1914 { 1919 {
1920
1915 if (!grp.IsDeleted) 1921 if (!grp.IsDeleted)
1916 { 1922 {
1917 PhysicsActor pa = grp.RootPart.PhysActor; 1923 PhysicsActor pa = grp.RootPart.PhysActor;
@@ -1920,15 +1926,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1920 pa.CrossingFailure(); 1926 pa.CrossingFailure();
1921 if (grp.RootPart.KeyframeMotion != null) 1927 if (grp.RootPart.KeyframeMotion != null)
1922 { 1928 {
1923 grp.RootPart.Velocity = Vector3.Zero; 1929 // moved to KeyframeMotion.CrossingFailure
1930// grp.RootPart.Velocity = Vector3.Zero;
1924 grp.RootPart.KeyframeMotion.CrossingFailure(); 1931 grp.RootPart.KeyframeMotion.CrossingFailure();
1925 grp.SendGroupRootTerseUpdate(); 1932// grp.SendGroupRootTerseUpdate();
1926 } 1933 }
1927 } 1934 }
1928 } 1935 }
1929 1936
1930 m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: Prim crossing failed for {0}", grp); 1937 m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: Prim crossing failed for {0}", grp);
1931 } 1938 }
1939 */
1932 } 1940 }
1933 else 1941 else
1934 { 1942 {