ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +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

9
OpenSim/Services/Interfaces/IBakedTextureService.cs
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
@@ -26,14 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
=======
////////////////////////////////////////////////////////////////
//
// (c) 2009, 2010 Careminster Limited and Melanie Thielker
//
// All rights reserved
//
>>>>>>> avn/ubitvar
using System;
using Nini.Config;

128
OpenSim/Services/Interfaces/IGridService.cs
View File

@@ -159,23 +159,24 @@ namespace OpenSim.Services.Interfaces
}
}
set {
<<<<<<< HEAD
if (value.EndsWith("/")) {
=======
if ( value == null)
{
m_serverURI = String.Empty;
return;
}
if ( value.EndsWith("/") ) {
>>>>>>> avn/ubitvar
if ( value.EndsWith("/") )
{
m_serverURI = value;
} else {
}
else
{
m_serverURI = value + '/';
}
}
}
protected string m_serverURI;
/// <summary>
@@ -368,6 +369,13 @@ namespace OpenSim.Services.Interfaces
if (kvp.ContainsKey("regionName"))
RegionName = (string)kvp["regionName"];
if (kvp.ContainsKey("access"))
{
byte access = Convert.ToByte((string)kvp["access"]);
Access = access;
Maturity = (int)Util.ConvertAccessLevelToMaturity(access);
}
if (kvp.ContainsKey("flags") && kvp["flags"] != null)
RegionFlags = (OpenSim.Framework.RegionFlags?)Convert.ToInt32((string)kvp["flags"]);
@@ -404,9 +412,6 @@ namespace OpenSim.Services.Interfaces
if (kvp.ContainsKey("parcelMapTexture"))
UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage);
if (kvp.ContainsKey("access"))
Access = Byte.Parse((string)kvp["access"]);
if (kvp.ContainsKey("regionSecret"))
RegionSecret =(string)kvp["regionSecret"];
@@ -539,110 +544,5 @@ namespace OpenSim.Services.Interfaces
{
get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); }
}
<<<<<<< HEAD
=======
public Dictionary<string, object> ToKeyValuePairs()
{
Dictionary<string, object> kvp = new Dictionary<string, object>();
kvp["uuid"] = RegionID.ToString();
kvp["locX"] = RegionLocX.ToString();
kvp["locY"] = RegionLocY.ToString();
kvp["sizeX"] = RegionSizeX.ToString();
kvp["sizeY"] = RegionSizeY.ToString();
kvp["regionName"] = RegionName;
kvp["serverIP"] = ExternalHostName; //ExternalEndPoint.Address.ToString();
kvp["serverHttpPort"] = HttpPort.ToString();
kvp["serverURI"] = ServerURI;
kvp["serverPort"] = InternalEndPoint.Port.ToString();
kvp["regionMapTexture"] = TerrainImage.ToString();
kvp["parcelMapTexture"] = ParcelImage.ToString();
kvp["access"] = Access.ToString();
kvp["regionSecret"] = RegionSecret;
kvp["owner_uuid"] = EstateOwner.ToString();
kvp["Token"] = Token.ToString();
// Maturity doesn't seem to exist in the DB
return kvp;
}
public GridRegion(Dictionary<string, object> kvp)
{
if (kvp.ContainsKey("uuid"))
RegionID = new UUID((string)kvp["uuid"]);
if (kvp.ContainsKey("locX"))
RegionLocX = Convert.ToInt32((string)kvp["locX"]);
if (kvp.ContainsKey("locY"))
RegionLocY = Convert.ToInt32((string)kvp["locY"]);
if (kvp.ContainsKey("sizeX"))
RegionSizeX = Convert.ToInt32((string)kvp["sizeX"]);
else
RegionSizeX = (int)Constants.RegionSize;
if (kvp.ContainsKey("sizeY"))
RegionSizeY = Convert.ToInt32((string)kvp["sizeY"]);
else
RegionSizeY = (int)Constants.RegionSize;
if (kvp.ContainsKey("regionName"))
RegionName = (string)kvp["regionName"];
if (kvp.ContainsKey("access"))
{
byte access = Convert.ToByte((string)kvp["access"]);
Maturity = (int)Util.ConvertAccessLevelToMaturity(access);
}
if (kvp.ContainsKey("serverIP"))
{
//int port = 0;
//Int32.TryParse((string)kvp["serverPort"], out port);
//IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["serverIP"]), port);
ExternalHostName = (string)kvp["serverIP"];
}
else
ExternalHostName = "127.0.0.1";
if (kvp.ContainsKey("serverPort"))
{
Int32 port = 0;
Int32.TryParse((string)kvp["serverPort"], out port);
InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
}
if (kvp.ContainsKey("serverHttpPort"))
{
UInt32 port = 0;
UInt32.TryParse((string)kvp["serverHttpPort"], out port);
HttpPort = port;
}
if (kvp.ContainsKey("serverURI"))
ServerURI = (string)kvp["serverURI"];
if (kvp.ContainsKey("regionMapTexture"))
UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage);
if (kvp.ContainsKey("parcelMapTexture"))
UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage);
if (kvp.ContainsKey("access"))
Access = Byte.Parse((string)kvp["access"]);
if (kvp.ContainsKey("regionSecret"))
RegionSecret =(string)kvp["regionSecret"];
if (kvp.ContainsKey("owner_uuid"))
EstateOwner = new UUID(kvp["owner_uuid"].ToString());
if (kvp.ContainsKey("Token"))
Token = kvp["Token"].ToString();
// m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>",
// LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY);
}
>>>>>>> avn/ubitvar
}
}

6
OpenSim/Services/Interfaces/IMapImageService.cs
View File

@@ -34,14 +34,8 @@ namespace OpenSim.Services.Interfaces
public interface IMapImageService
{
//List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY);
<<<<<<< HEAD
bool AddMapTile(int x, int y, byte[] imageData, out string reason);
bool RemoveMapTile(int x, int y, out string reason);
byte[] GetMapTile(string fileName, out string format);
=======
bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason);
bool RemoveMapTile(int x, int y, UUID scopeID, out string reason);
byte[] GetMapTile(string fileName, UUID scopeID, out string format);
>>>>>>> avn/ubitvar
}
}

9
OpenSim/Services/Interfaces/ISimulationService.cs
View File

@@ -86,7 +86,7 @@ namespace OpenSim.Services.Interfaces
/// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param>
/// <param name="viaTeleport">True: via teleport; False: via cross (walking)</param>
/// <param name="position">Position in the region</param>
<<<<<<< HEAD
/// <param name="sversion">
/// Version that the requesting simulator is runing. If null then no version check is carried out.
/// </param>
@@ -94,13 +94,6 @@ namespace OpenSim.Services.Interfaces
/// <param name="reason">[out] Optional error message</param>
/// <returns>True: ok; False: not allowed</returns>
bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason);
=======
/// <param name="sversion">version that the requesting simulator is runing</param>
/// <param name="version">version that the target simulator is running</param>
/// <param name="reason">[out] Optional error message</param>
/// <returns>True: ok; False: not allowed</returns>
bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, out string version, out string reason);
>>>>>>> avn/ubitvar
/// <summary>
/// Message from receiving region to departing region, telling it got contacted by the client.

5
OpenSim/Services/Interfaces/IUserProfilesService.cs
View File

@@ -57,6 +57,11 @@ namespace OpenSim.Services.Interfaces
bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
#endregion Profile Properties
#region User Preferences
bool UserPreferencesRequest(ref UserPreferences pref, ref string result);
bool UserPreferencesUpdate(ref UserPreferences pref, ref string result);
#endregion User Preferences
#region Interests
bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);