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

Change the map tile system to be multi-grid hosting compatible

Browse Source 
Conflicts:

	OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
This commit is contained in:
Melanie Thielker
2014-08-23 17:33:14 +02:00
parent 0eaabef1dc
commit 1a7efc2c64
7 changed files with 297 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,8 +117,11 @@ namespace OpenSim.Server.Handlers.MapImage
return FailureResult("Bad request.");
}
int x = 0, y = 0;
UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
Int32.TryParse(request["X"].ToString(), out x);
Int32.TryParse(request["Y"].ToString(), out y);
if (request.ContainsKey("SCOPE"))
UUID.TryParse(request["SCOPE"].ToString(), out scopeID);
m_log.DebugFormat("[MAP ADD SERVER CONNECTOR]: Received map data for region at {0}-{1}", x, y);
@@ -151,7 +154,7 @@ namespace OpenSim.Server.Handlers.MapImage
byte[] data = Convert.FromBase64String(request["DATA"].ToString());
string reason = string.Empty;
bool result = m_MapService.AddMapTile(x, y, data, out reason);
bool result = m_MapService.AddMapTile(x, y, data, scopeID, out reason);
if (result)
return SuccessResult();