diff options
author | Melanie | 2012-02-26 14:30:24 +0100 |
---|---|---|
committer | Melanie | 2012-02-26 14:30:24 +0100 |
commit | 8cdc115c91bd074539c5fbae719313d4dc616355 (patch) | |
tree | b071a6011f0644044f02be9ecdd0e84ac957d468 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Fix an infinite recursion caused by checking the wrong values for (diff) | |
download | opensim-SC_OLD-8cdc115c91bd074539c5fbae719313d4dc616355.zip opensim-SC_OLD-8cdc115c91bd074539c5fbae719313d4dc616355.tar.gz opensim-SC_OLD-8cdc115c91bd074539c5fbae719313d4dc616355.tar.bz2 opensim-SC_OLD-8cdc115c91bd074539c5fbae719313d4dc616355.tar.xz |
Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
code.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3ab7e5a..0728042 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1313,7 +1313,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1313 | } | 1313 | } |
1314 | set | 1314 | set |
1315 | { | 1315 | { |
1316 | if (ParentGroup.RootPart != this) | 1316 | if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this) |
1317 | { | 1317 | { |
1318 | ParentGroup.RootPart.Buoyancy = value; | 1318 | ParentGroup.RootPart.Buoyancy = value; |
1319 | return; | 1319 | return; |
@@ -1336,7 +1336,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1336 | 1336 | ||
1337 | set | 1337 | set |
1338 | { | 1338 | { |
1339 | if (ParentGroup.RootPart != this) | 1339 | if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this) |
1340 | { | 1340 | { |
1341 | ParentGroup.RootPart.Force = value; | 1341 | ParentGroup.RootPart.Force = value; |
1342 | return; | 1342 | return; |
@@ -1359,7 +1359,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1359 | 1359 | ||
1360 | set | 1360 | set |
1361 | { | 1361 | { |
1362 | if (ParentGroup.RootPart != this) | 1362 | if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this) |
1363 | { | 1363 | { |
1364 | ParentGroup.RootPart.Torque = value; | 1364 | ParentGroup.RootPart.Torque = value; |
1365 | return; | 1365 | return; |