aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs2
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs2
-rw-r--r--OpenSim/Region/Physics/Meshing/SculptMesh.cs2
3 files changed, 3 insertions, 3 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
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 3386e72..211a0a7 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -311,7 +311,7 @@ namespace OpenSim.Region.Physics.Meshing
311 OSD decodedMeshOsd = new OSD(); 311 OSD decodedMeshOsd = new OSD();
312 byte[] meshBytes = new byte[physSize]; 312 byte[] meshBytes = new byte[physSize];
313 System.Buffer.BlockCopy(primShape.SculptData, physOffset, meshBytes, 0, physSize); 313 System.Buffer.BlockCopy(primShape.SculptData, physOffset, meshBytes, 0, physSize);
314 byte[] decompressed = new byte[physSize * 5]; 314// byte[] decompressed = new byte[physSize * 5];
315 try 315 try
316 { 316 {
317 using (MemoryStream inMs = new MemoryStream(meshBytes)) 317 using (MemoryStream inMs = new MemoryStream(meshBytes))
diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
index e58eb89..4a7f3ad 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
@@ -375,7 +375,7 @@ namespace PrimMesher
375 375
376 int coordsDown = rows.Count; 376 int coordsDown = rows.Count;
377 int coordsAcross = rows[0].Count; 377 int coordsAcross = rows[0].Count;
378 int lastColumn = coordsAcross - 1; 378// int lastColumn = coordsAcross - 1;
379 379
380 float widthUnit = 1.0f / (coordsAcross - 1); 380 float widthUnit = 1.0f / (coordsAcross - 1);
381 float heightUnit = 1.0f / (coordsDown - 1); 381 float heightUnit = 1.0f / (coordsDown - 1);