OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a bug on warp3d.dll

httptests
UbitUmarov 2018-05-26 23:03:27 +01:00
parent d5117b6cf7
commit e0b2ee80f9
2 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@ -297,9 +297,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
waterHeight, waterHeight,
m_scene.RegionInfo.RegionSizeY * 0.5f); m_scene.RegionInfo.RegionSizeY * 0.5f);
warp_Material waterColorMaterial = new warp_Material(ConvertColor(WATER_COLOR)); warp_Material waterMaterial = new warp_Material(ConvertColor(WATER_COLOR));
renderer.Scene.addMaterial("WaterColor", waterColorMaterial); renderer.Scene.addMaterial("WaterMat", waterMaterial);
renderer.SetObjectMaterial("Water", "WaterColor"); renderer.SetObjectMaterial("Water", "WaterMat");
} }
// Add a terrain to the renderer. // Add a terrain to the renderer.
@ -419,8 +419,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
texture = new warp_Texture(image); texture = new warp_Texture(image);
warp_Material material = new warp_Material(texture); warp_Material material = new warp_Material(texture);
renderer.Scene.addMaterial("TerrainColor", material); renderer.Scene.addMaterial("TerrainMat", material);
renderer.SetObjectMaterial("Terrain", "TerrainColor"); renderer.SetObjectMaterial("Terrain", "TerrainMat");
} }
private void CreateAllPrims(WarpRenderer renderer) private void CreateAllPrims(WarpRenderer renderer)

BIN
bin/Warp3D.dll
View File

Binary file not shown.