diff options
| author | Melanie Thielker | 2008-10-12 16:40:18 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-10-12 16:40:18 +0000 |
| commit | cc72ea532a5ad6d075a7ed2b017428fbecbb54b5 (patch) | |
| tree | ade6e6d25ac7ab31c24fcd1262889325f573f5b3 /OpenSim/Region/Environment/Scenes | |
| parent | Add EventInfoRequest and EventInfoReply packets. (diff) | |
| download | opensim-SC-cc72ea532a5ad6d075a7ed2b017428fbecbb54b5.zip opensim-SC-cc72ea532a5ad6d075a7ed2b017428fbecbb54b5.tar.gz opensim-SC-cc72ea532a5ad6d075a7ed2b017428fbecbb54b5.tar.bz2 opensim-SC-cc72ea532a5ad6d075a7ed2b017428fbecbb54b5.tar.xz | |
Fix linking phantom and nonphantom prims. Make the error message more friendly
when estate_settings.xml is empty or missing
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 27601d2..bf6025e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
| @@ -553,7 +553,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 553 | 553 | ||
| 554 | if (ParentGroup != null && ParentGroup.RootPart != null) | 554 | if (ParentGroup != null && ParentGroup.RootPart != null) |
| 555 | { | 555 | { |
| 556 | if (_parentID != 0) | 556 | if (_parentID != 0 && PhysActor != null) |
| 557 | { | 557 | { |
| 558 | Vector3 resultingposition = GetWorldPosition(); | 558 | Vector3 resultingposition = GetWorldPosition(); |
| 559 | PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z); | 559 | PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z); |