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

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,11 @@ using System.IO;
using OpenSim.Framework;
<<<<<<< HEAD
=======
using System.IO;
using OpenSim.Framework;
>>>>>>> avn/ubitvar
using OpenMetaverse;
namespace OpenSim.Region.Framework.Interfaces
@@ -43,7 +48,13 @@ namespace OpenSim.Region.Framework.Interfaces
/// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight)
/// </summary>
void TaintTerrain();
/// <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>
/// 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.
@@ -60,6 +71,8 @@ namespace OpenSim.Region.Framework.Interfaces
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);
/// <summary>
/// Save a terrain to a stream.
/// </summary>