ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
View File

@@ -28,11 +28,8 @@ using System.IO;
using OpenSim.Framework;
<<<<<<< HEAD
=======
using System.IO;
using OpenSim.Framework;
>>>>>>> avn/ubitvar
using OpenMetaverse;
namespace OpenSim.Region.Framework.Interfaces
@@ -55,12 +52,6 @@ namespace OpenSim.Region.Framework.Interfaces
/// </summary>
void PushTerrain(IClientAPI pClient);
/// <summary>
/// When a client initially connects, all the terrain must be pushed to the viewer.
/// This call causes all the terrain patches to be sent to the client.
/// </summary>
void PushTerrain(IClientAPI pClient);
/// <summary>
/// Load a terrain from a stream.
/// </summary>
@@ -69,7 +60,6 @@ namespace OpenSim.Region.Framework.Interfaces
/// </param>
/// <param name="stream"></param>
void LoadFromStream(string filename, Stream stream);
void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream);
void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap);
void LoadFromStream(string filename, Vector3 displacement,
float radianRotation, Vector2 rotationDisplacement, Stream stream);