aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2016-08-22 20:43:11 +0100
committerUbitUmarov2016-08-22 20:43:47 +0100
commit08c1dff86ce454eb0f53eba9dedceb1bca0e143c (patch)
tree398fa9773ad22de2157c070d4c81457e52ca3fa0 /OpenSim
parentchange ODEs topcolliders code ( still bad), plus a few memory leaks (diff)
downloadopensim-SC-08c1dff86ce454eb0f53eba9dedceb1bca0e143c.zip
opensim-SC-08c1dff86ce454eb0f53eba9dedceb1bca0e143c.tar.gz
opensim-SC-08c1dff86ce454eb0f53eba9dedceb1bca0e143c.tar.bz2
opensim-SC-08c1dff86ce454eb0f53eba9dedceb1bca0e143c.tar.xz
change strange rotation in legacy MapImageModule (untested)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index 5155804..1f2b7c4 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -382,7 +382,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
382 382
383 Vector3 pos = part.GetWorldPosition(); 383 Vector3 pos = part.GetWorldPosition();
384 384
385 // skip prim outside of retion 385 // skip prim outside of region
386 if (!m_scene.PositionIsInCurrentRegion(pos)) 386 if (!m_scene.PositionIsInCurrentRegion(pos))
387 continue; 387 continue;
388 388
@@ -406,12 +406,13 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
406 { 406 {
407 // Translate scale by rotation so scale is represented properly when object is rotated 407 // Translate scale by rotation so scale is represented properly when object is rotated
408 Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z); 408 Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z);
409 lscale *= 0.5f;
410
409 Vector3 scale = new Vector3(); 411 Vector3 scale = new Vector3();
410 Vector3 tScale = new Vector3(); 412 Vector3 tScale = new Vector3();
411 Vector3 axPos = new Vector3(pos.X, pos.Y, pos.Z); 413 Vector3 axPos = new Vector3(pos.X, pos.Y, pos.Z);
412 414
413 Quaternion llrot = part.GetWorldRotation(); 415 Quaternion rot = part.GetWorldRotation();
414 Quaternion rot = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z);
415 scale = lscale * rot; 416 scale = lscale * rot;
416 417
417 // negative scales don't work in this situation 418 // negative scales don't work in this situation
@@ -470,7 +471,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
470 471
471 tScale = new Vector3(lscale.X, -lscale.Y, -lscale.Z); 472 tScale = new Vector3(lscale.X, -lscale.Y, -lscale.Z);
472 scale = ((tScale * rot)); 473 scale = ((tScale * rot));
473
474 vertexes[2] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); 474 vertexes[2] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
475 475
476 //vertexes[2].x = pos.X + vertexes[2].x; 476 //vertexes[2].x = pos.X + vertexes[2].x;