diff options
| author | UbitUmarov | 2015-08-29 00:32:36 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-08-29 00:32:36 +0100 |
| commit | f31f9002de555d8277a6d4cc008bba4069e7cadc (patch) | |
| tree | 49a02af18237987fcba8d2f6fdef0b3f32b44e33 /OpenSim | |
| parent | review ServiceBase for var (diff) | |
| download | opensim-SC-f31f9002de555d8277a6d4cc008bba4069e7cadc.zip opensim-SC-f31f9002de555d8277a6d4cc008bba4069e7cadc.tar.gz opensim-SC-f31f9002de555d8277a6d4cc008bba4069e7cadc.tar.bz2 opensim-SC-f31f9002de555d8277a6d4cc008bba4069e7cadc.tar.xz | |
change default scopeID to UUID.Zero
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Server/Handlers/Map/MapGetServerConnector.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs index d2fbfa6..ea68114 100644 --- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |||
| @@ -117,7 +117,8 @@ namespace OpenSim.Server.Handlers.MapImage | |||
| 117 | return FailureResult("Bad request."); | 117 | return FailureResult("Bad request."); |
| 118 | } | 118 | } |
| 119 | int x = 0, y = 0; | 119 | int x = 0, y = 0; |
| 120 | UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992"); | 120 | // UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992"); |
| 121 | UUID scopeID = UUID.Zero; | ||
| 121 | Int32.TryParse(request["X"].ToString(), out x); | 122 | Int32.TryParse(request["X"].ToString(), out x); |
| 122 | Int32.TryParse(request["Y"].ToString(), out y); | 123 | Int32.TryParse(request["Y"].ToString(), out y); |
| 123 | if (request.ContainsKey("SCOPE")) | 124 | if (request.ContainsKey("SCOPE")) |
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs index e2c8f35..1ae669c 100644 --- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs | |||
| @@ -95,7 +95,8 @@ namespace OpenSim.Server.Handlers.MapImage | |||
| 95 | byte[] result = new byte[0]; | 95 | byte[] result = new byte[0]; |
| 96 | string format = string.Empty; | 96 | string format = string.Empty; |
| 97 | 97 | ||
| 98 | UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992"); | 98 | // UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992"); |
| 99 | UUID scopeID = UUID.Zero; | ||
| 99 | 100 | ||
| 100 | string[] bits = path.Trim('/').Split(new char[] {'/'}); | 101 | string[] bits = path.Trim('/').Split(new char[] {'/'}); |
| 101 | if (bits.Length > 1) | 102 | if (bits.Length > 1) |
diff --git a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs index 88d774a..4f8f7e1 100644 --- a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs | |||
| @@ -119,7 +119,8 @@ namespace OpenSim.Server.Handlers.MapImage | |||
| 119 | int x = 0, y = 0; | 119 | int x = 0, y = 0; |
| 120 | Int32.TryParse(request["X"].ToString(), out x); | 120 | Int32.TryParse(request["X"].ToString(), out x); |
| 121 | Int32.TryParse(request["Y"].ToString(), out y); | 121 | Int32.TryParse(request["Y"].ToString(), out y); |
| 122 | UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992"); | 122 | // UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992"); |
| 123 | UUID scopeID = UUID.Zero; | ||
| 123 | if (request.ContainsKey("SCOPE")) | 124 | if (request.ContainsKey("SCOPE")) |
| 124 | UUID.TryParse(request["SCOPE"].ToString(), out scopeID); | 125 | UUID.TryParse(request["SCOPE"].ToString(), out scopeID); |
| 125 | 126 | ||