aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDahlia Trimble2008-07-26 01:58:13 +0000
committerDahlia Trimble2008-07-26 01:58:13 +0000
commit287674296e1b59d490c89e259c4078613b4ed22b (patch)
treeb1c503c8dd9ea321b4bc4239ffaaf9f316e8e54b
parentAttempt to update viewer for some physics status changes in SOP (diff)
downloadopensim-SC_OLD-287674296e1b59d490c89e259c4078613b4ed22b.zip
opensim-SC_OLD-287674296e1b59d490c89e259c4078613b4ed22b.tar.gz
opensim-SC_OLD-287674296e1b59d490c89e259c4078613b4ed22b.tar.bz2
opensim-SC_OLD-287674296e1b59d490c89e259c4078613b4ed22b.tar.xz
reinstated ResetChildPrimPhysicsPositions() as some prims had bad/missing proxies without it
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index abd24a2..89d68d0 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -877,11 +877,13 @@ namespace OpenSim.Region.Environment.Scenes
877 // justincc: I don't believe this hack is needed any longer, especially since the physics 877 // justincc: I don't believe this hack is needed any longer, especially since the physics
878 // parts of set AbsolutePosition were already commented out. By changing HasGroupChanged to false 878 // parts of set AbsolutePosition were already commented out. By changing HasGroupChanged to false
879 // this method was preventing proper reload of scene objects. 879 // this method was preventing proper reload of scene objects.
880 //public void ResetChildPrimPhysicsPositions() 880 // dahlia: I had to uncomment it, without it meshing was failing on some prims and objects
881 //{ 881 // at region startup
882 // AbsolutePosition = AbsolutePosition; 882 public void ResetChildPrimPhysicsPositions()
883 // HasGroupChanged = false; 883 {
884 //} 884 AbsolutePosition = AbsolutePosition;
885 HasGroupChanged = false;
886 }
885 887
886 public LLUUID GetPartsFullID(uint localID) 888 public LLUUID GetPartsFullID(uint localID)
887 { 889 {
@@ -1067,7 +1069,7 @@ namespace OpenSim.Region.Environment.Scenes
1067 } 1069 }
1068 1070
1069 // Hack to get the physics scene geometries in the right spot 1071 // Hack to get the physics scene geometries in the right spot
1070 //ResetChildPrimPhysicsPositions(); 1072 ResetChildPrimPhysicsPositions();
1071 } 1073 }
1072 } 1074 }
1073 else 1075 else