diff options
| author | Melanie | 2012-05-03 00:15:45 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-03 00:15:45 +0200 |
| commit | 8b1cc0dd29156cb3d10c66bfcb097fb7f9aa9f59 (patch) | |
| tree | 04fb4bfde802563c412a137499e1d936f26bb874 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Improved sitted avatars crossings ( plus tests on vehicles) (diff) | |
| download | opensim-SC_OLD-8b1cc0dd29156cb3d10c66bfcb097fb7f9aa9f59.zip opensim-SC_OLD-8b1cc0dd29156cb3d10c66bfcb097fb7f9aa9f59.tar.gz opensim-SC_OLD-8b1cc0dd29156cb3d10c66bfcb097fb7f9aa9f59.tar.bz2 opensim-SC_OLD-8b1cc0dd29156cb3d10c66bfcb097fb7f9aa9f59.tar.xz | |
Merge branch 'avination'
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index dce20c1..42b6bc5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -634,10 +634,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 634 | ScenePresence agent = icon.EndInvoke(iar); | 634 | ScenePresence agent = icon.EndInvoke(iar); |
| 635 | 635 | ||
| 636 | //// If the cross was successful, this agent is a child agent | 636 | //// If the cross was successful, this agent is a child agent |
| 637 | //if (agent.IsChildAgent) | 637 | if (agent.IsChildAgent) |
| 638 | // agent.Reset(); | 638 | { |
| 639 | //else // Not successful | 639 | if (agent.ParentUUID != UUID.Zero) |
| 640 | // agent.RestoreInCurrentScene(); | 640 | { |
| 641 | agent.ParentPart = null; | ||
| 642 | agent.ParentPosition = Vector3.Zero; | ||
| 643 | } | ||
| 644 | } | ||
| 645 | |||
| 646 | // agent.Reset(); | ||
| 647 | // else // Not successful | ||
| 648 | // agent.RestoreInCurrentScene(); | ||
| 641 | 649 | ||
| 642 | // In any case | 650 | // In any case |
| 643 | agent.IsInTransit = false; | 651 | agent.IsInTransit = false; |