diff options
author | Diva Canto | 2010-01-13 09:17:30 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-13 09:17:30 -0800 |
commit | 7356860b487febd12c2e0de2f009a6df9ea0aeec (patch) | |
tree | 801eaa0c90483cca8a07f2b4f9f30bf16be84f62 /OpenSim/Server/Handlers/Simulation | |
parent | More appearance woes fixed, this time for child agents. Tested on a grid with... (diff) | |
download | opensim-SC-7356860b487febd12c2e0de2f009a6df9ea0aeec.zip opensim-SC-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.gz opensim-SC-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.bz2 opensim-SC-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.xz |
Several more buglets removed.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 12 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs | 35 |
2 files changed, 28 insertions, 19 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 782034b..da9c015 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -61,11 +61,11 @@ namespace OpenSim.Server.Handlers.Simulation | |||
61 | { | 61 | { |
62 | //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); | 62 | //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); |
63 | 63 | ||
64 | m_log.Debug("---------------------------"); | 64 | //m_log.Debug("---------------------------"); |
65 | m_log.Debug(" >> uri=" + request["uri"]); | 65 | //m_log.Debug(" >> uri=" + request["uri"]); |
66 | m_log.Debug(" >> content-type=" + request["content-type"]); | 66 | //m_log.Debug(" >> content-type=" + request["content-type"]); |
67 | m_log.Debug(" >> http-method=" + request["http-method"]); | 67 | //m_log.Debug(" >> http-method=" + request["http-method"]); |
68 | m_log.Debug("---------------------------\n"); | 68 | //m_log.Debug("---------------------------\n"); |
69 | 69 | ||
70 | Hashtable responsedata = new Hashtable(); | 70 | Hashtable responsedata = new Hashtable(); |
71 | responsedata["content_type"] = "text/html"; | 71 | responsedata["content_type"] = "text/html"; |
@@ -320,7 +320,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
320 | responsedata["int_response_code"] = HttpStatusCode.OK; | 320 | responsedata["int_response_code"] = HttpStatusCode.OK; |
321 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); | 321 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); |
322 | 322 | ||
323 | m_log.Debug("[AGENT HANDLER]: Agent Deleted."); | 323 | m_log.Debug("[AGENT HANDLER]: Agent Released/Deleted."); |
324 | } | 324 | } |
325 | } | 325 | } |
326 | 326 | ||
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs index 995a3c4..b6eabe3 100644 --- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs | |||
@@ -59,13 +59,13 @@ namespace OpenSim.Server.Handlers.Simulation | |||
59 | 59 | ||
60 | public Hashtable Handler(Hashtable request) | 60 | public Hashtable Handler(Hashtable request) |
61 | { | 61 | { |
62 | m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called"); | 62 | //m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called"); |
63 | 63 | ||
64 | m_log.Debug("---------------------------"); | 64 | //m_log.Debug("---------------------------"); |
65 | m_log.Debug(" >> uri=" + request["uri"]); | 65 | //m_log.Debug(" >> uri=" + request["uri"]); |
66 | m_log.Debug(" >> content-type=" + request["content-type"]); | 66 | //m_log.Debug(" >> content-type=" + request["content-type"]); |
67 | m_log.Debug(" >> http-method=" + request["http-method"]); | 67 | //m_log.Debug(" >> http-method=" + request["http-method"]); |
68 | m_log.Debug("---------------------------\n"); | 68 | //m_log.Debug("---------------------------\n"); |
69 | 69 | ||
70 | Hashtable responsedata = new Hashtable(); | 70 | Hashtable responsedata = new Hashtable(); |
71 | responsedata["content_type"] = "text/html"; | 71 | responsedata["content_type"] = "text/html"; |
@@ -75,7 +75,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
75 | string action; | 75 | string action; |
76 | if (!Utils.GetParams((string)request["uri"], out objectID, out regionID, out action)) | 76 | if (!Utils.GetParams((string)request["uri"], out objectID, out regionID, out action)) |
77 | { | 77 | { |
78 | m_log.InfoFormat("[REST COMMS]: Invalid parameters for object message {0}", request["uri"]); | 78 | m_log.InfoFormat("[OBJECT HANDLER]: Invalid parameters for object message {0}", request["uri"]); |
79 | responsedata["int_response_code"] = 404; | 79 | responsedata["int_response_code"] = 404; |
80 | responsedata["str_response_string"] = "false"; | 80 | responsedata["str_response_string"] = "false"; |
81 | 81 | ||
@@ -101,7 +101,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
101 | //} | 101 | //} |
102 | else | 102 | else |
103 | { | 103 | { |
104 | m_log.InfoFormat("[REST COMMS]: method {0} not supported in object message", method); | 104 | m_log.InfoFormat("[OBJECT HANDLER]: method {0} not supported in object message", method); |
105 | responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed; | 105 | responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed; |
106 | responsedata["str_response_string"] = "Mthod not allowed"; | 106 | responsedata["str_response_string"] = "Mthod not allowed"; |
107 | 107 | ||
@@ -148,13 +148,13 @@ namespace OpenSim.Server.Handlers.Simulation | |||
148 | ISceneObject sog = null; | 148 | ISceneObject sog = null; |
149 | try | 149 | try |
150 | { | 150 | { |
151 | //sog = SceneObjectSerializer.FromXml2Format(sogXmlStr); | 151 | //m_log.DebugFormat("[OBJECT HANDLER]: received {0}", sogXmlStr); |
152 | sog = s.DeserializeObject(sogXmlStr); | 152 | sog = s.DeserializeObject(sogXmlStr); |
153 | sog.ExtraFromXmlString(extraStr); | 153 | sog.ExtraFromXmlString(extraStr); |
154 | } | 154 | } |
155 | catch (Exception ex) | 155 | catch (Exception ex) |
156 | { | 156 | { |
157 | m_log.InfoFormat("[REST COMMS]: exception on deserializing scene object {0}", ex.Message); | 157 | m_log.InfoFormat("[OBJECT HANDLER]: exception on deserializing scene object {0}", ex.Message); |
158 | responsedata["int_response_code"] = HttpStatusCode.BadRequest; | 158 | responsedata["int_response_code"] = HttpStatusCode.BadRequest; |
159 | responsedata["str_response_string"] = "Bad request"; | 159 | responsedata["str_response_string"] = "Bad request"; |
160 | return; | 160 | return; |
@@ -171,13 +171,22 @@ namespace OpenSim.Server.Handlers.Simulation | |||
171 | } | 171 | } |
172 | catch (Exception ex) | 172 | catch (Exception ex) |
173 | { | 173 | { |
174 | m_log.InfoFormat("[REST COMMS]: exception on setting state for scene object {0}", ex.Message); | 174 | m_log.InfoFormat("[OBJECT HANDLER]: exception on setting state for scene object {0}", ex.Message); |
175 | // ignore and continue | 175 | // ignore and continue |
176 | } | 176 | } |
177 | } | 177 | } |
178 | } | 178 | } |
179 | // This is the meaning of POST object | 179 | |
180 | bool result = m_SimulationService.CreateObject(destination, sog, false); | 180 | bool result = false; |
181 | try | ||
182 | { | ||
183 | // This is the meaning of POST object | ||
184 | result = m_SimulationService.CreateObject(destination, sog, false); | ||
185 | } | ||
186 | catch (Exception e) | ||
187 | { | ||
188 | m_log.DebugFormat("[OBJECT HANDLER]: Exception in CreateObject: {0}", e.StackTrace); | ||
189 | } | ||
181 | 190 | ||
182 | responsedata["int_response_code"] = HttpStatusCode.OK; | 191 | responsedata["int_response_code"] = HttpStatusCode.OK; |
183 | responsedata["str_response_string"] = result.ToString(); | 192 | responsedata["str_response_string"] = result.ToString(); |