diff options
author | Justin Clark-Casey (justincc) | 2011-11-19 00:29:52 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-19 00:29:52 +0000 |
commit | d05d065d859c8877cb910cf5748e32e1560086a6 (patch) | |
tree | b4b6d1053da7b49810cdd72ae265e2457d2e43e4 /OpenSim/Server | |
parent | improve region deregistration log message (diff) | |
download | opensim-SC_OLD-d05d065d859c8877cb910cf5748e32e1560086a6.zip opensim-SC_OLD-d05d065d859c8877cb910cf5748e32e1560086a6.tar.gz opensim-SC_OLD-d05d065d859c8877cb910cf5748e32e1560086a6.tar.bz2 opensim-SC_OLD-d05d065d859c8877cb910cf5748e32e1560086a6.tar.xz |
Improve some grid region log messages to express regions at co-ordinate (e.g. 1000, 1000) rather than meter positions (256000, 256000)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs index 99f98b6..8291107 100644 --- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Server.Handlers.MapImage | |||
79 | 79 | ||
80 | public override byte[] Handle(string path, Stream requestData, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 80 | public override byte[] Handle(string path, Stream requestData, OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
81 | { | 81 | { |
82 | m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path); | 82 | // m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path); |
83 | StreamReader sr = new StreamReader(requestData); | 83 | StreamReader sr = new StreamReader(requestData); |
84 | string body = sr.ReadToEnd(); | 84 | string body = sr.ReadToEnd(); |
85 | sr.Close(); | 85 | sr.Close(); |
@@ -97,9 +97,14 @@ namespace OpenSim.Server.Handlers.MapImage | |||
97 | int x = 0, y = 0; | 97 | int x = 0, y = 0; |
98 | Int32.TryParse(request["X"].ToString(), out x); | 98 | Int32.TryParse(request["X"].ToString(), out x); |
99 | Int32.TryParse(request["Y"].ToString(), out y); | 99 | Int32.TryParse(request["Y"].ToString(), out y); |
100 | string type = "image/jpeg"; | 100 | |
101 | if (request.ContainsKey("TYPE")) | 101 | m_log.DebugFormat("[MAP ADD SERVER CONNECTOR]: Received map data for region at {0}-{1}", x, y); |
102 | type = request["TYPE"].ToString(); | 102 | |
103 | // string type = "image/jpeg"; | ||
104 | // | ||
105 | // if (request.ContainsKey("TYPE")) | ||
106 | // type = request["TYPE"].ToString(); | ||
107 | |||
103 | byte[] data = Convert.FromBase64String(request["DATA"].ToString()); | 108 | byte[] data = Convert.FromBase64String(request["DATA"].ToString()); |
104 | 109 | ||
105 | string reason = string.Empty; | 110 | string reason = string.Empty; |
@@ -117,7 +122,6 @@ namespace OpenSim.Server.Handlers.MapImage | |||
117 | } | 122 | } |
118 | 123 | ||
119 | return FailureResult("Unexpected server error"); | 124 | return FailureResult("Unexpected server error"); |
120 | |||
121 | } | 125 | } |
122 | 126 | ||
123 | private byte[] SuccessResult() | 127 | private byte[] SuccessResult() |