OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change default scopeID to UUID.Zero

avinationmerge
UbitUmarov 2015-08-29 00:32:36 +01:00
parent 46054d4f02
commit f31f9002de
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,8 @@ namespace OpenSim.Server.Handlers.MapImage
return FailureResult("Bad request."); return FailureResult("Bad request.");
} }
int x = 0, y = 0; int x = 0, y = 0;
UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992"); // UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
UUID scopeID = UUID.Zero;
Int32.TryParse(request["X"].ToString(), out x); Int32.TryParse(request["X"].ToString(), out x);
Int32.TryParse(request["Y"].ToString(), out y); Int32.TryParse(request["Y"].ToString(), out y);
if (request.ContainsKey("SCOPE")) if (request.ContainsKey("SCOPE"))

3
OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
View File

@ -95,7 +95,8 @@ namespace OpenSim.Server.Handlers.MapImage
byte[] result = new byte[0]; byte[] result = new byte[0];
string format = string.Empty; string format = string.Empty;
UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992"); // UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
UUID scopeID = UUID.Zero;
string[] bits = path.Trim('/').Split(new char[] {'/'}); string[] bits = path.Trim('/').Split(new char[] {'/'});
if (bits.Length > 1) if (bits.Length > 1)

3
OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
View File

@ -119,7 +119,8 @@ namespace OpenSim.Server.Handlers.MapImage
int x = 0, y = 0; int x = 0, y = 0;
Int32.TryParse(request["X"].ToString(), out x); Int32.TryParse(request["X"].ToString(), out x);
Int32.TryParse(request["Y"].ToString(), out y); Int32.TryParse(request["Y"].ToString(), out y);
UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992"); // UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
UUID scopeID = UUID.Zero;
if (request.ContainsKey("SCOPE")) if (request.ContainsKey("SCOPE"))
UUID.TryParse(request["SCOPE"].ToString(), out scopeID); UUID.TryParse(request["SCOPE"].ToString(), out scopeID);