diff options
| author | Diva Canto | 2010-12-10 11:33:09 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-12-10 11:33:09 -0800 |
| commit | 58b251506cd79e1abe5d48e4f5be0df66e7e7413 (patch) | |
| tree | e45b9133dac91049873bc049537a60719b5d197e /OpenSim/Region/Framework | |
| parent | A stab at mantis #5256. Separate ScenePresence updates from SceneObject updat... (diff) | |
| parent | Adjust hypergrid console commands to latest changes. (diff) | |
| download | opensim-SC_OLD-58b251506cd79e1abe5d48e4f5be0df66e7e7413.zip opensim-SC_OLD-58b251506cd79e1abe5d48e4f5be0df66e7e7413.tar.gz opensim-SC_OLD-58b251506cd79e1abe5d48e4f5be0df66e7e7413.tar.bz2 opensim-SC_OLD-58b251506cd79e1abe5d48e4f5be0df66e7e7413.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 032c859..78e5da3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -215,7 +215,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 215 | SceneObjectPart sop = m_parentScene.GetSceneObjectPart(sp.ParentID); | 215 | SceneObjectPart sop = m_parentScene.GetSceneObjectPart(sp.ParentID); |
| 216 | if (sop != null) | 216 | if (sop != null) |
| 217 | { | 217 | { |
| 218 | coarseLocations.Add(sop.AbsolutePosition + sp.AbsolutePosition); | 218 | coarseLocations.Add(sop.AbsolutePosition + sp.OffsetPosition); |
| 219 | avatarUUIDs.Add(sp.UUID); | 219 | avatarUUIDs.Add(sp.UUID); |
| 220 | } | 220 | } |
| 221 | else | 221 | else |