diff options
author | lbsa71 | 2007-11-29 15:27:57 +0000 |
---|---|---|
committer | lbsa71 | 2007-11-29 15:27:57 +0000 |
commit | 7704bb6f63f608df79fee2c3dcea7d5deabeee17 (patch) | |
tree | 63ece08049e04720639f1396d8d7ca6597e5089a | |
parent | * Thanks to _SomeOne_, Server side permissions on object editing. Be aware, ... (diff) | |
download | opensim-SC-7704bb6f63f608df79fee2c3dcea7d5deabeee17.zip opensim-SC-7704bb6f63f608df79fee2c3dcea7d5deabeee17.tar.gz opensim-SC-7704bb6f63f608df79fee2c3dcea7d5deabeee17.tar.bz2 opensim-SC-7704bb6f63f608df79fee2c3dcea7d5deabeee17.tar.xz |
* Fixed neighbour range bug
* Various refactorings
9 files changed, 57 insertions, 58 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 7445c2e..251601f 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -115,8 +115,8 @@ namespace OpenSim.Region.ClientStack | |||
115 | scene.LoadWorldMap(); | 115 | scene.LoadWorldMap(); |
116 | scene.RegisterRegionWithGrid(); | 116 | scene.RegisterRegionWithGrid(); |
117 | 117 | ||
118 | scene.PhysScene = GetPhysicsScene(); | 118 | scene.PhysicsScene = GetPhysicsScene(); |
119 | scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D()); | 119 | scene.PhysicsScene.SetTerrain(scene.Terrain.GetHeights1D()); |
120 | 120 | ||
121 | //Master Avatar Setup | 121 | //Master Avatar Setup |
122 | UserProfileData masterAvatar; | 122 | UserProfileData masterAvatar; |
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 0cb17c0..7c13b49 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
47 | 47 | ||
48 | 48 | ||
49 | } | 49 | } |
50 | public PhysicsScene PhyScene | 50 | public PhysicsScene PhysicsScene |
51 | { | 51 | { |
52 | get | 52 | get |
53 | { return _PhyScene; } | 53 | { return _PhyScene; } |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 3c8dc0a..52d0f1c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
429 | SceneObjectPart rootPart = (group).GetChildPart(group.UUID); | 429 | SceneObjectPart rootPart = (group).GetChildPart(group.UUID); |
430 | if (rootPart.PhysActor != null) | 430 | if (rootPart.PhysActor != null) |
431 | { | 431 | { |
432 | phyScene.RemovePrim(rootPart.PhysActor); | 432 | PhysicsScene.RemovePrim(rootPart.PhysActor); |
433 | rootPart.PhysActor = null; | 433 | rootPart.PhysActor = null; |
434 | } | 434 | } |
435 | 435 | ||
@@ -482,7 +482,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
482 | if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0) | 482 | if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0) |
483 | { | 483 | { |
484 | PrimitiveBaseShape pbs = rootPart.Shape; | 484 | PrimitiveBaseShape pbs = rootPart.Shape; |
485 | rootPart.PhysActor = phyScene.AddPrimShape( | 485 | rootPart.PhysActor = PhysicsScene.AddPrimShape( |
486 | rootPart.Name, | 486 | rootPart.Name, |
487 | pbs, | 487 | pbs, |
488 | new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, | 488 | new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 9ea92b0..2d74913 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
74 | public bool m_physicalPrim; | 74 | public bool m_physicalPrim; |
75 | public bool m_sendTasksToChild; | 75 | public bool m_sendTasksToChild; |
76 | private int m_RestartTimerCounter; | 76 | private int m_RestartTimerCounter; |
77 | private Timer t_restartTimer = new Timer(15000); // Wait before firing | 77 | private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing |
78 | private int m_incrementsof15seconds = 0; | 78 | private int m_incrementsof15seconds = 0; |
79 | 79 | ||
80 | protected ModuleLoader m_moduleLoader; | 80 | protected ModuleLoader m_moduleLoader; |
@@ -137,16 +137,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
137 | 137 | ||
138 | private readonly EstateManager m_estateManager; | 138 | private readonly EstateManager m_estateManager; |
139 | 139 | ||
140 | private PhysicsScene phyScene | 140 | public PhysicsScene PhysicsScene |
141 | { | 141 | { |
142 | set { m_innerScene.PhyScene = value; } | 142 | set { m_innerScene.PhysicsScene = value; } |
143 | get { return (m_innerScene.PhyScene); } | 143 | get { return (m_innerScene.PhysicsScene); } |
144 | } | ||
145 | |||
146 | public PhysicsScene PhysScene | ||
147 | { | ||
148 | set { m_innerScene.PhyScene = value; } | ||
149 | get { return (m_innerScene.PhyScene); } | ||
150 | } | 144 | } |
151 | 145 | ||
152 | public object SyncRoot | 146 | public object SyncRoot |
@@ -239,7 +233,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
239 | // | 233 | // |
240 | // Out of memory | 234 | // Out of memory |
241 | // Operating system has killed the plugin | 235 | // Operating system has killed the plugin |
242 | m_innerScene.UnRecoverableError += restartNOW; | 236 | m_innerScene.UnRecoverableError += RestartNow; |
243 | 237 | ||
244 | m_sceneXmlLoader = new SceneXmlLoader(this, m_innerScene, m_regInfo); | 238 | m_sceneXmlLoader = new SceneXmlLoader(this, m_innerScene, m_regInfo); |
245 | 239 | ||
@@ -275,9 +269,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
275 | { | 269 | { |
276 | // Another region is up. We have to tell all our ScenePresences about it | 270 | // Another region is up. We have to tell all our ScenePresences about it |
277 | // This fails to get the desired effect and needs further work. | 271 | // This fails to get the desired effect and needs further work. |
272 | |||
278 | if (RegionInfo.RegionHandle != otherRegion.RegionHandle) | 273 | if (RegionInfo.RegionHandle != otherRegion.RegionHandle) |
279 | { | 274 | { |
280 | if (Math.Abs(otherRegion.RegionLocX - RegionInfo.RegionLocX) <= 1 || Math.Abs(otherRegion.RegionLocY - RegionInfo.RegionLocY) <= 1) | 275 | if ((Math.Abs(otherRegion.RegionLocX - RegionInfo.RegionLocX) <= 1) && (Math.Abs(otherRegion.RegionLocY - RegionInfo.RegionLocY) <= 1)) |
281 | { | 276 | { |
282 | if (!(m_regionRestartNotifyList.Contains(otherRegion))) | 277 | if (!(m_regionRestartNotifyList.Contains(otherRegion))) |
283 | { | 278 | { |
@@ -285,7 +280,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
285 | 280 | ||
286 | m_restartWaitTimer.Interval= 50000; | 281 | m_restartWaitTimer.Interval= 50000; |
287 | m_restartWaitTimer.AutoReset = false; | 282 | m_restartWaitTimer.AutoReset = false; |
288 | m_restartWaitTimer.Elapsed += new ElapsedEventHandler(restart_Notify_Wait_Elapsed); | 283 | m_restartWaitTimer.Elapsed += new ElapsedEventHandler(RestartNotifyWaitElapsed); |
289 | m_restartWaitTimer.Start(); | 284 | m_restartWaitTimer.Start(); |
290 | } | 285 | } |
291 | } | 286 | } |
@@ -302,25 +297,25 @@ namespace OpenSim.Region.Environment.Scenes | |||
302 | { | 297 | { |
303 | if (seconds < 15) | 298 | if (seconds < 15) |
304 | { | 299 | { |
305 | t_restartTimer.Stop(); | 300 | m_restartTimer.Stop(); |
306 | SendGeneralAlert("Restart Aborted"); | 301 | SendGeneralAlert("Restart Aborted"); |
307 | } | 302 | } |
308 | else | 303 | else |
309 | { | 304 | { |
310 | t_restartTimer.Interval = 15000; | 305 | m_restartTimer.Interval = 15000; |
311 | m_incrementsof15seconds = (int) seconds/15; | 306 | m_incrementsof15seconds = (int) seconds/15; |
312 | m_RestartTimerCounter = 0; | 307 | m_RestartTimerCounter = 0; |
313 | t_restartTimer.AutoReset = true; | 308 | m_restartTimer.AutoReset = true; |
314 | t_restartTimer.Elapsed += new ElapsedEventHandler(restartTimer_Elapsed); | 309 | m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed); |
315 | MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds / 60) + " minutes"); | 310 | MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds / 60) + " minutes"); |
316 | t_restartTimer.Start(); | 311 | m_restartTimer.Start(); |
317 | SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes"); | 312 | SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes"); |
318 | } | 313 | } |
319 | 314 | ||
320 | 315 | ||
321 | } | 316 | } |
322 | 317 | ||
323 | public void restartTimer_Elapsed(object sender, ElapsedEventArgs e) | 318 | public void RestartTimer_Elapsed(object sender, ElapsedEventArgs e) |
324 | { | 319 | { |
325 | m_RestartTimerCounter++; | 320 | m_RestartTimerCounter++; |
326 | if (m_RestartTimerCounter <= m_incrementsof15seconds) | 321 | if (m_RestartTimerCounter <= m_incrementsof15seconds) |
@@ -330,14 +325,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
330 | } | 325 | } |
331 | else | 326 | else |
332 | { | 327 | { |
333 | t_restartTimer.Stop(); | 328 | m_restartTimer.Stop(); |
334 | t_restartTimer.AutoReset = false; | 329 | m_restartTimer.AutoReset = false; |
335 | restartNOW(); | 330 | RestartNow(); |
336 | } | 331 | } |
337 | 332 | ||
338 | } | 333 | } |
339 | 334 | ||
340 | public void restartNOW() | 335 | public void RestartNow() |
341 | { | 336 | { |
342 | MainLog.Instance.Error("REGION", "Closing"); | 337 | MainLog.Instance.Error("REGION", "Closing"); |
343 | Close(); | 338 | Close(); |
@@ -345,7 +340,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
345 | base.Restart(0); | 340 | base.Restart(0); |
346 | } | 341 | } |
347 | 342 | ||
348 | public void restart_Notify_Wait_Elapsed(object sender, ElapsedEventArgs e) | 343 | public void RestartNotifyWaitElapsed(object sender, ElapsedEventArgs e) |
349 | { | 344 | { |
350 | m_restartWaitTimer.Stop(); | 345 | m_restartWaitTimer.Stop(); |
351 | foreach (RegionInfo region in m_regionRestartNotifyList) | 346 | foreach (RegionInfo region in m_regionRestartNotifyList) |
@@ -551,7 +546,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
551 | { | 546 | { |
552 | lock (SyncRoot) | 547 | lock (SyncRoot) |
553 | { | 548 | { |
554 | phyScene.SetTerrain(Terrain.GetHeights1D()); | 549 | PhysicsScene.SetTerrain(Terrain.GetHeights1D()); |
555 | } | 550 | } |
556 | 551 | ||
557 | m_storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID); | 552 | m_storageManager.DataStore.StoreTerrain(Terrain.GetHeights2DD(), RegionInfo.RegionID); |
@@ -748,7 +743,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
748 | SceneObjectPart rootPart = prim.GetChildPart(prim.UUID); | 743 | SceneObjectPart rootPart = prim.GetChildPart(prim.UUID); |
749 | bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_physicalPrim); | 744 | bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_physicalPrim); |
750 | if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) | 745 | if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) |
751 | rootPart.PhysActor = phyScene.AddPrimShape( | 746 | rootPart.PhysActor = PhysicsScene.AddPrimShape( |
752 | rootPart.Name, | 747 | rootPart.Name, |
753 | rootPart.Shape, | 748 | rootPart.Shape, |
754 | new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, | 749 | new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, |
@@ -852,7 +847,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
852 | { | 847 | { |
853 | 848 | ||
854 | rootPart.PhysActor = | 849 | rootPart.PhysActor = |
855 | phyScene.AddPrimShape( | 850 | PhysicsScene.AddPrimShape( |
856 | rootPart.Name, | 851 | rootPart.Name, |
857 | rootPart.Shape, | 852 | rootPart.Shape, |
858 | new PhysicsVector(pos.X, pos.Y, pos.Z), | 853 | new PhysicsVector(pos.X, pos.Y, pos.Z), |
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index ed33bf7..52b06f0 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs | |||
@@ -93,12 +93,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
93 | 93 | ||
94 | public void Add(Scene scene) | 94 | public void Add(Scene scene) |
95 | { | 95 | { |
96 | scene.OnRestart += handleRestart; | 96 | scene.OnRestart += HandleRestart; |
97 | m_localScenes.Add(scene); | 97 | m_localScenes.Add(scene); |
98 | 98 | ||
99 | } | 99 | } |
100 | 100 | ||
101 | public void handleRestart(RegionInfo rdata) | 101 | public void HandleRestart(RegionInfo rdata) |
102 | { | 102 | { |
103 | MainLog.Instance.Error("SCENEMANAGER", "Got Restart message for region:" + rdata.RegionName +" Sending up to main"); | 103 | MainLog.Instance.Error("SCENEMANAGER", "Got Restart message for region:" + rdata.RegionName +" Sending up to main"); |
104 | int RegionSceneElement = -1; | 104 | int RegionSceneElement = -1; |
@@ -106,14 +106,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
106 | { | 106 | { |
107 | 107 | ||
108 | if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName) | 108 | if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName) |
109 | { | ||
109 | RegionSceneElement = i; | 110 | RegionSceneElement = i; |
111 | } | ||
110 | } | 112 | } |
111 | 113 | ||
112 | // Now we make sure the region is no longer known about by the SceneManager | 114 | // Now we make sure the region is no longer known about by the SceneManager |
113 | // Prevents Duplicates. | 115 | // Prevents Duplicates. |
114 | 116 | ||
115 | if (RegionSceneElement >= 0) | 117 | if (RegionSceneElement >= 0) |
118 | { | ||
116 | m_localScenes.RemoveAt(RegionSceneElement); | 119 | m_localScenes.RemoveAt(RegionSceneElement); |
120 | } | ||
117 | 121 | ||
118 | // Send signal to main that we're restarting this sim. | 122 | // Send signal to main that we're restarting this sim. |
119 | OnReStartSim(rdata); | 123 | OnReStartSim(rdata); |
@@ -216,7 +220,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
216 | 220 | ||
217 | public void RestartCurrentScene() | 221 | public void RestartCurrentScene() |
218 | { | 222 | { |
219 | ForEachCurrentScene(delegate(Scene scene) { scene.restartNOW(); }); | 223 | ForEachCurrentScene(delegate(Scene scene) { scene.RestartNow(); }); |
220 | 224 | ||
221 | } | 225 | } |
222 | 226 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 6a18587..7d09c9a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
150 | m_rootPart.PhysActor.Position = | 150 | m_rootPart.PhysActor.Position = |
151 | new PhysicsVector(m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y, | 151 | new PhysicsVector(m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y, |
152 | m_rootPart.GroupPosition.Z); | 152 | m_rootPart.GroupPosition.Z); |
153 | m_scene.PhysScene.AddPhysicsActorTaint(m_rootPart.PhysActor); | 153 | m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); |
154 | } | 154 | } |
155 | } | 155 | } |
156 | } | 156 | } |
@@ -515,7 +515,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
515 | { | 515 | { |
516 | PrimitiveBaseShape pbs = dupe.RootPart.Shape; | 516 | PrimitiveBaseShape pbs = dupe.RootPart.Shape; |
517 | 517 | ||
518 | dupe.RootPart.PhysActor = m_scene.PhysScene.AddPrimShape( | 518 | dupe.RootPart.PhysActor = m_scene.PhysicsScene.AddPrimShape( |
519 | dupe.RootPart.Name, | 519 | dupe.RootPart.Name, |
520 | pbs, | 520 | pbs, |
521 | new PhysicsVector(dupe.RootPart.AbsolutePosition.X, dupe.RootPart.AbsolutePosition.Y, | 521 | new PhysicsVector(dupe.RootPart.AbsolutePosition.X, dupe.RootPart.AbsolutePosition.Y, |
@@ -827,7 +827,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
827 | 827 | ||
828 | if (linkPart.PhysActor != null) | 828 | if (linkPart.PhysActor != null) |
829 | { | 829 | { |
830 | m_scene.PhysScene.RemovePrim(linkPart.PhysActor); | 830 | m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor); |
831 | 831 | ||
832 | linkPart.PhysActor = null; | 832 | linkPart.PhysActor = null; |
833 | } | 833 | } |
@@ -897,7 +897,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
897 | // SceneObjectPart.UpdatePrimFlags() | 897 | // SceneObjectPart.UpdatePrimFlags() |
898 | if (m_rootPart.PhysActor != null) | 898 | if (m_rootPart.PhysActor != null) |
899 | { | 899 | { |
900 | linkPart.PhysActor = m_scene.PhysScene.AddPrimShape( | 900 | linkPart.PhysActor = m_scene.PhysicsScene.AddPrimShape( |
901 | linkPart.Name, | 901 | linkPart.Name, |
902 | linkPart.Shape, | 902 | linkPart.Shape, |
903 | new PhysicsVector(linkPart.AbsolutePosition.X, linkPart.AbsolutePosition.Y, | 903 | new PhysicsVector(linkPart.AbsolutePosition.X, linkPart.AbsolutePosition.Y, |
@@ -1205,8 +1205,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1205 | } | 1205 | } |
1206 | if (m_rootPart.PhysActor != null) | 1206 | if (m_rootPart.PhysActor != null) |
1207 | { | 1207 | { |
1208 | m_scene.PhysScene.RemovePrim(m_rootPart.PhysActor); | 1208 | m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor); |
1209 | m_rootPart.PhysActor = m_scene.PhysScene.AddPrimShape( | 1209 | m_rootPart.PhysActor = m_scene.PhysicsScene.AddPrimShape( |
1210 | m_rootPart.Name, | 1210 | m_rootPart.Name, |
1211 | m_rootPart.Shape, | 1211 | m_rootPart.Shape, |
1212 | new PhysicsVector(m_rootPart.AbsolutePosition.X, m_rootPart.AbsolutePosition.Y, | 1212 | new PhysicsVector(m_rootPart.AbsolutePosition.X, m_rootPart.AbsolutePosition.Y, |
@@ -1242,7 +1242,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1242 | { | 1242 | { |
1243 | m_rootPart.PhysActor.Size = | 1243 | m_rootPart.PhysActor.Size = |
1244 | new PhysicsVector(m_rootPart.Scale.X, m_rootPart.Scale.Y, m_rootPart.Scale.Z); | 1244 | new PhysicsVector(m_rootPart.Scale.X, m_rootPart.Scale.Y, m_rootPart.Scale.Z); |
1245 | m_scene.PhysScene.AddPhysicsActorTaint(m_rootPart.PhysActor); | 1245 | m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); |
1246 | } | 1246 | } |
1247 | } | 1247 | } |
1248 | } | 1248 | } |
@@ -1333,7 +1333,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1333 | m_rootPart.PhysActor.Orientation = | 1333 | m_rootPart.PhysActor.Orientation = |
1334 | new Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X, m_rootPart.RotationOffset.Y, | 1334 | new Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X, m_rootPart.RotationOffset.Y, |
1335 | m_rootPart.RotationOffset.Z); | 1335 | m_rootPart.RotationOffset.Z); |
1336 | m_scene.PhysScene.AddPhysicsActorTaint(m_rootPart.PhysActor); | 1336 | m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); |
1337 | } | 1337 | } |
1338 | ScheduleGroupForTerseUpdate(); | 1338 | ScheduleGroupForTerseUpdate(); |
1339 | } | 1339 | } |
@@ -1351,7 +1351,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1351 | m_rootPart.PhysActor.Orientation = | 1351 | m_rootPart.PhysActor.Orientation = |
1352 | new Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X, m_rootPart.RotationOffset.Y, | 1352 | new Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X, m_rootPart.RotationOffset.Y, |
1353 | m_rootPart.RotationOffset.Z); | 1353 | m_rootPart.RotationOffset.Z); |
1354 | m_scene.PhysScene.AddPhysicsActorTaint(m_rootPart.PhysActor); | 1354 | m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); |
1355 | } | 1355 | } |
1356 | AbsolutePosition = pos; | 1356 | AbsolutePosition = pos; |
1357 | ScheduleGroupForTerseUpdate(); | 1357 | ScheduleGroupForTerseUpdate(); |
@@ -1395,7 +1395,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1395 | m_rootPart.PhysActor.Orientation = | 1395 | m_rootPart.PhysActor.Orientation = |
1396 | new Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X, m_rootPart.RotationOffset.Y, | 1396 | new Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X, m_rootPart.RotationOffset.Y, |
1397 | m_rootPart.RotationOffset.Z); | 1397 | m_rootPart.RotationOffset.Z); |
1398 | m_scene.PhysScene.AddPhysicsActorTaint(m_rootPart.PhysActor); | 1398 | m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); |
1399 | } | 1399 | } |
1400 | 1400 | ||
1401 | foreach (SceneObjectPart prim in m_parts.Values) | 1401 | foreach (SceneObjectPart prim in m_parts.Values) |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index e68632b..843ae3d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -173,7 +173,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
173 | //lock (m_parentGroup.m_scene.SyncRoot) | 173 | //lock (m_parentGroup.m_scene.SyncRoot) |
174 | //{ | 174 | //{ |
175 | PhysActor.Position = new PhysicsVector(value.X, value.Y, value.Z); | 175 | PhysActor.Position = new PhysicsVector(value.X, value.Y, value.Z); |
176 | m_parentGroup.m_scene.PhysScene.AddPhysicsActorTaint(PhysActor); | 176 | m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
177 | //} | 177 | //} |
178 | } | 178 | } |
179 | catch (Exception e) | 179 | catch (Exception e) |
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
226 | //lock (m_scene.SyncRoot) | 226 | //lock (m_scene.SyncRoot) |
227 | //{ | 227 | //{ |
228 | PhysActor.Orientation = new Quaternion(value.W, value.X, value.Y, value.Z); | 228 | PhysActor.Orientation = new Quaternion(value.W, value.X, value.Y, value.Z); |
229 | m_parentGroup.m_scene.PhysScene.AddPhysicsActorTaint(PhysActor); | 229 | m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
230 | //} | 230 | //} |
231 | } | 231 | } |
232 | catch (Exception ex) | 232 | catch (Exception ex) |
@@ -961,7 +961,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
961 | AddFlag(LLObject.ObjectFlags.Phantom); | 961 | AddFlag(LLObject.ObjectFlags.Phantom); |
962 | if (PhysActor != null) | 962 | if (PhysActor != null) |
963 | { | 963 | { |
964 | m_parentGroup.m_scene.PhysScene.RemovePrim(PhysActor); | 964 | m_parentGroup.m_scene.PhysicsScene.RemovePrim(PhysActor); |
965 | /// that's not wholesome. Had to make m_scene public | 965 | /// that's not wholesome. Had to make m_scene public |
966 | PhysActor = null; | 966 | PhysActor = null; |
967 | } | 967 | } |
@@ -971,7 +971,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
971 | RemFlag(LLObject.ObjectFlags.Phantom); | 971 | RemFlag(LLObject.ObjectFlags.Phantom); |
972 | if (PhysActor == null) | 972 | if (PhysActor == null) |
973 | { | 973 | { |
974 | PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape( | 974 | PhysActor = m_parentGroup.m_scene.PhysicsScene.AddPrimShape( |
975 | Name, | 975 | Name, |
976 | Shape, | 976 | Shape, |
977 | new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, | 977 | new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, |
@@ -1015,14 +1015,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
1015 | 1015 | ||
1016 | PhysActor.IsPhysical = UsePhysics; | 1016 | PhysActor.IsPhysical = UsePhysics; |
1017 | // If we're not what we're supposed to be in the physics scene, recreate ourselves. | 1017 | // If we're not what we're supposed to be in the physics scene, recreate ourselves. |
1018 | //m_parentGroup.m_scene.PhysScene.RemovePrim(PhysActor); | 1018 | //m_parentGroup.m_scene.PhysicsScene.RemovePrim(PhysActor); |
1019 | /// that's not wholesome. Had to make m_scene public | 1019 | /// that's not wholesome. Had to make m_scene public |
1020 | //PhysActor = null; | 1020 | //PhysActor = null; |
1021 | 1021 | ||
1022 | 1022 | ||
1023 | if ((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) | 1023 | if ((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) |
1024 | { | 1024 | { |
1025 | //PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape( | 1025 | //PhysActor = m_parentGroup.m_scene.PhysicsScene.AddPrimShape( |
1026 | //Name, | 1026 | //Name, |
1027 | //Shape, | 1027 | //Shape, |
1028 | //new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, | 1028 | //new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, |
@@ -1037,7 +1037,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1037 | } | 1037 | } |
1038 | } | 1038 | } |
1039 | } | 1039 | } |
1040 | m_parentGroup.m_scene.PhysScene.AddPhysicsActorTaint(PhysActor); | 1040 | m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
1041 | } | 1041 | } |
1042 | } | 1042 | } |
1043 | 1043 | ||
@@ -1293,7 +1293,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1293 | OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds."); | 1293 | OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds."); |
1294 | RemFlag(LLObject.ObjectFlags.Physics); | 1294 | RemFlag(LLObject.ObjectFlags.Physics); |
1295 | doPhysicsPropertyUpdate(false,true); | 1295 | doPhysicsPropertyUpdate(false,true); |
1296 | m_parentGroup.m_scene.PhysScene.AddPhysicsActorTaint(PhysActor); | 1296 | m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
1297 | 1297 | ||
1298 | 1298 | ||
1299 | } | 1299 | } |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 6117828..fc1d738 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -453,7 +453,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
453 | { | 453 | { |
454 | if (PhysicsActor != null) | 454 | if (PhysicsActor != null) |
455 | { | 455 | { |
456 | m_scene.PhysScene.RemoveAvatar(PhysicsActor); | 456 | m_scene.PhysicsScene.RemoveAvatar(PhysicsActor); |
457 | m_physicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; | 457 | m_physicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; |
458 | m_physicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; | 458 | m_physicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; |
459 | PhysicsActor = null; | 459 | PhysicsActor = null; |
@@ -1320,7 +1320,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1320 | 1320 | ||
1321 | public void AddToPhysicalScene() | 1321 | public void AddToPhysicalScene() |
1322 | { | 1322 | { |
1323 | PhysicsScene scene = m_scene.PhysScene; | 1323 | PhysicsScene scene = m_scene.PhysicsScene; |
1324 | 1324 | ||
1325 | PhysicsVector pVec = | 1325 | PhysicsVector pVec = |
1326 | new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, | 1326 | new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, |
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs index 5c460be..e9c0124 100644 --- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using System.Xml; | 4 | using System.Xml; |
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
47 | bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_parentScene.m_physicalPrim); | 47 | bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_parentScene.m_physicalPrim); |
48 | if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) | 48 | if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) |
49 | { | 49 | { |
50 | rootPart.PhysActor = m_innerScene.PhyScene.AddPrimShape( | 50 | rootPart.PhysActor = m_innerScene.PhysicsScene.AddPrimShape( |
51 | rootPart.Name, | 51 | rootPart.Name, |
52 | rootPart.Shape, | 52 | rootPart.Shape, |
53 | new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, | 53 | new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, |
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
117 | bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_parentScene.m_physicalPrim); | 117 | bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0) && m_parentScene.m_physicalPrim); |
118 | if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) | 118 | if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) |
119 | { | 119 | { |
120 | rootPart.PhysActor = m_innerScene.PhyScene.AddPrimShape( | 120 | rootPart.PhysActor = m_innerScene.PhysicsScene.AddPrimShape( |
121 | rootPart.Name, | 121 | rootPart.Name, |
122 | rootPart.Shape, | 122 | rootPart.Shape, |
123 | new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, | 123 | new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, |