diff options
| author | BlueWall | 2012-02-22 22:29:30 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-22 22:29:30 -0500 |
| commit | af377470e14d9de47e7a67778e1ebd602239e1b1 (patch) | |
| tree | 77efe266c00fcb67ee1cc8a84dc9be411582ecfa /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | V3 Support (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-af377470e14d9de47e7a67778e1ebd602239e1b1.zip opensim-SC_OLD-af377470e14d9de47e7a67778e1ebd602239e1b1.tar.gz opensim-SC_OLD-af377470e14d9de47e7a67778e1ebd602239e1b1.tar.bz2 opensim-SC_OLD-af377470e14d9de47e7a67778e1ebd602239e1b1.tar.xz | |
Merge branch 'master' into v3_support
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index daf711c..9cfdf9f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3223,7 +3223,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3223 | ((SceneObjectGroup)so).LocalId = 0; | 3223 | ((SceneObjectGroup)so).LocalId = 0; |
| 3224 | ((SceneObjectGroup)so).RootPart.ClearUpdateSchedule(); | 3224 | ((SceneObjectGroup)so).RootPart.ClearUpdateSchedule(); |
| 3225 | so.SetState(cAgent.AttachmentObjectStates[i++], m_scene); | 3225 | so.SetState(cAgent.AttachmentObjectStates[i++], m_scene); |
| 3226 | m_scene.IncomingCreateObject(so); | 3226 | m_scene.IncomingCreateObject(Vector3.Zero, so); |
| 3227 | } | 3227 | } |
| 3228 | } | 3228 | } |
| 3229 | } | 3229 | } |