aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorKevin Cozens2018-05-16 14:29:10 -0400
committerKevin Cozens2018-05-16 14:29:10 -0400
commit1ea71c6182ef730aae1369d036fe691206f944c1 (patch)
tree7d7bff45bb43f7e0f76b2c8e5dffc4964cd4187b /OpenSim/Region
parentbreaking map a bit more... (diff)
downloadopensim-SC-1ea71c6182ef730aae1369d036fe691206f944c1.zip
opensim-SC-1ea71c6182ef730aae1369d036fe691206f944c1.tar.gz
opensim-SC-1ea71c6182ef730aae1369d036fe691206f944c1.tar.bz2
opensim-SC-1ea71c6182ef730aae1369d036fe691206f944c1.tar.xz
Whitespace changes
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 450c679..3e41c9f 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
70 private IRendering m_primMesher; 70 private IRendering m_primMesher;
71 internal IJ2KDecoder m_imgDecoder; 71 internal IJ2KDecoder m_imgDecoder;
72 72
73 // caches per rendering 73 // caches per rendering
74 private Dictionary<string, warp_Texture> m_warpTextures = new Dictionary<string, warp_Texture>(); 74 private Dictionary<string, warp_Texture> m_warpTextures = new Dictionary<string, warp_Texture>();
75 private Dictionary<UUID, int> m_colors = new Dictionary<UUID, int>(); 75 private Dictionary<UUID, int> m_colors = new Dictionary<UUID, int>();
76 76
@@ -236,7 +236,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
236 renderer.Scene.defaultCamera.setOrthographic(true, viewWitdh, viewHeigth); 236 renderer.Scene.defaultCamera.setOrthographic(true, viewWitdh, viewHeigth);
237 else 237 else
238 renderer.Scene.defaultCamera.setFov(fov); 238 renderer.Scene.defaultCamera.setFov(fov);
239 239
240 renderer.Scene.defaultCamera.setPos(pos); 240 renderer.Scene.defaultCamera.setPos(pos);
241 renderer.Scene.defaultCamera.lookAt(lookat); 241 renderer.Scene.defaultCamera.lookAt(lookat);
242 #endregion Camera 242 #endregion Camera
@@ -439,7 +439,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
439 } 439 }
440 ); 440 );
441 } 441 }
442 442
443 private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim) 443 private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim)
444 { 444 {
445 if ((PCode)prim.Shape.PCode != PCode.Prim) 445 if ((PCode)prim.Shape.PCode != PCode.Prim)
@@ -554,7 +554,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
554 warp_Vertex vert = new warp_Vertex(pos, v.TexCoord.X, v.TexCoord.Y); 554 warp_Vertex vert = new warp_Vertex(pos, v.TexCoord.X, v.TexCoord.Y);
555 faceObj.addVertex(vert); 555 faceObj.addVertex(vert);
556 } 556 }
557 } 557 }
558 else 558 else
559 { 559 {
560 float tu; 560 float tu;
@@ -598,10 +598,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
598 tv += offsetv; 598 tv += offsetv;
599 vert = new warp_Vertex(pos, tu, tv); 599 vert = new warp_Vertex(pos, tu, tv);
600 } 600 }
601 601
602 faceObj.addVertex(vert); 602 faceObj.addVertex(vert);
603 } 603 }
604 } 604 }
605 605
606 for (int j = 0; j < face.Indices.Count; j += 3) 606 for (int j = 0; j < face.Indices.Count; j += 3)
607 { 607 {
@@ -716,7 +716,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
716 } 716 }
717 else 717 else
718 color = warp_Color.multiply(color, warp_Color.Grey); 718 color = warp_Color.multiply(color, warp_Color.Grey);
719 719
720 mat.setColor(color); 720 mat.setColor(color);
721 renderer.Scene.addMaterial(materialName, mat); 721 renderer.Scene.addMaterial(materialName, mat);
722 722
@@ -735,7 +735,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
735 byte[] asset = m_scene.AssetService.GetData(id.ToString()); 735 byte[] asset = m_scene.AssetService.GetData(id.ToString());
736 736
737 if (asset != null) 737 if (asset != null)
738 { 738 {
739 IJ2KDecoder imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>(); 739 IJ2KDecoder imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>();
740 try 740 try
741 { 741 {