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

15
OpenSim/Server/Base/HttpServerBase.cs
View File

@@ -116,20 +116,6 @@ namespace OpenSim.Server.Base
{
uint https_port = (uint)networkConfig.GetInt("https_port", 0);
<<<<<<< HEAD
string cert_path = networkConfig.GetString("cert_path",String.Empty);
if (cert_path == String.Empty)
{
System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start.");
Environment.Exit(1);
}
string cert_pass = networkConfig.GetString("cert_pass",String.Empty);
if (cert_pass == String.Empty)
{
System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start.");
Environment.Exit(1);
=======
m_log.WarnFormat("[SSL]: External flag is {0}", ssl_external);
if (!ssl_external)
{
@@ -152,7 +138,6 @@ namespace OpenSim.Server.Base
{
m_log.WarnFormat("[SSL]: SSL port is active but no SSL is used because external SSL was requested.");
MainServer.AddHttpServer(new BaseHttpServer(https_port));
>>>>>>> avn/ubitvar
}
}
}

7
OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
View File

@@ -45,19 +45,12 @@ namespace OpenSim.Server.Handlers.BakedTextures
{
public class BakesServerPostHandler : BaseStreamHandler
{
<<<<<<< HEAD:OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IBakedTextureService m_BakesService;
public BakesServerPostHandler(IBakedTextureService service, IServiceAuth auth) :
base("POST", "/bakes", auth)
=======
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public MSSQLAvatarData(string connectionString, string realm) :
base(connectionString, realm, "Avatar")
>>>>>>> avn/ubitvar:OpenSim/Data/MSSQL/MSSQLAvatarData.cs
{
m_BakesService = service;
}

17
OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
View File

@@ -118,11 +118,6 @@ namespace OpenSim.Server.Handlers.MapImage
httpResponse.StatusCode = (int)OSHttpStatusCode.ClientErrorBadRequest;
return FailureResult("Bad request.");
}
<<<<<<< HEAD
uint x = 0, y = 0;
UInt32.TryParse(request["X"].ToString(), out x);
UInt32.TryParse(request["Y"].ToString(), out y);
=======
int x = 0, y = 0;
// UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
UUID scopeID = UUID.Zero;
@@ -130,7 +125,6 @@ namespace OpenSim.Server.Handlers.MapImage
Int32.TryParse(request["Y"].ToString(), out y);
if (request.ContainsKey("SCOPE"))
UUID.TryParse(request["SCOPE"].ToString(), out scopeID);
>>>>>>> avn/ubitvar
m_log.DebugFormat("[MAP ADD SERVER CONNECTOR]: Received map data for region at {0}-{1}", x, y);
@@ -142,11 +136,7 @@ namespace OpenSim.Server.Handlers.MapImage
if (m_GridService != null)
{
System.Net.IPAddress ipAddr = GetCallerIP(httpRequest);
<<<<<<< HEAD
GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, (int)Util.RegionToWorldLoc(x), (int)Util.RegionToWorldLoc(y));
=======
GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, (int)Util.RegionToWorldLoc((uint)x), (int)Util.RegionToWorldLoc((uint)y));
>>>>>>> avn/ubitvar
if (r != null)
{
if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString())
@@ -167,11 +157,8 @@ namespace OpenSim.Server.Handlers.MapImage
byte[] data = Convert.FromBase64String(request["DATA"].ToString());
string reason = string.Empty;
<<<<<<< HEAD
bool result = m_MapService.AddMapTile((int)x, (int)y, data, out reason);
=======
bool result = m_MapService.AddMapTile(x, y, data, scopeID, out reason);
>>>>>>> avn/ubitvar
bool result = m_MapService.AddMapTile((int)x, (int)y, data, scopeID, out reason);
if (result)
return SuccessResult();

4
OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
View File

@@ -380,7 +380,6 @@ namespace OpenSim.Server.Handlers
}
#endregion Interests
<<<<<<< HEAD
#region User Preferences
public bool UserPreferencesRequest(OSDMap json, ref JsonRpcResponse response)
{
@@ -434,8 +433,7 @@ namespace OpenSim.Server.Handlers
}
#endregion User Preferences
=======
>>>>>>> avn/ubitvar
#region Utility
public bool AvatarImageAssetsRequest(OSDMap json, ref JsonRpcResponse response)
{

25
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@@ -149,7 +149,6 @@ namespace OpenSim.Server.Handlers.Simulation
if (args.ContainsKey("my_version"))
theirVersion = args["my_version"].AsString();
<<<<<<< HEAD
List<UUID> features = new List<UUID>();
if (args.ContainsKey("features"))
@@ -160,18 +159,12 @@ namespace OpenSim.Server.Handlers.Simulation
features.Add(new UUID(o.AsString()));
}
=======
>>>>>>> avn/ubitvar
GridRegion destination = new GridRegion();
destination.RegionID = regionID;
string reason;
string version;
<<<<<<< HEAD
bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, theirVersion, features, out version, out reason);
=======
bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, theirVersion, out version, out reason);
>>>>>>> avn/ubitvar
responsedata["int_response_code"] = HttpStatusCode.OK;
@@ -269,16 +262,7 @@ namespace OpenSim.Server.Handlers.Simulation
httpResponse.KeepAlive = false;
Encoding encoding = Encoding.UTF8;
<<<<<<< HEAD
if (httpRequest.ContentType != "application/json")
=======
Stream inputStream = null;
if ((httpRequest.ContentType == "application/x-gzip" || httpRequest.Headers["Content-Encoding"] == "gzip") || (httpRequest.Headers["X-Content-Encoding"] == "gzip"))
inputStream = new GZipStream(request, CompressionMode.Decompress);
else if (httpRequest.ContentType == "application/json")
inputStream = request;
else // no go
>>>>>>> avn/ubitvar
{
httpResponse.StatusCode = 406;
return encoding.GetBytes("false");
@@ -464,16 +448,13 @@ namespace OpenSim.Server.Handlers.Simulation
protected virtual bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination,
AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason)
{
<<<<<<< HEAD
return m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason);
=======
reason = String.Empty;
if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0)
{
Util.FireAndForget(x =>
{
string r;
m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out r);
m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out r);
m_log.DebugFormat("[AGENT HANDLER]: ASYNC CreateAgent {0}", r);
});
@@ -482,12 +463,10 @@ namespace OpenSim.Server.Handlers.Simulation
else
{
bool ret = m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason);
bool ret = m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason);
m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason);
return ret;
}
>>>>>>> avn/ubitvar
}
}