aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs4
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c956421..e532939 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1616,8 +1616,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1616 agentData.child = false; 1616 agentData.child = false;
1617 agentData.firstname = m_firstName; 1617 agentData.firstname = m_firstName;
1618 agentData.lastname = m_lastName; 1618 agentData.lastname = m_lastName;
1619 1619
1620 ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>(); 1620 ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>();
1621
1622 if (capsModule == null) // can happen when shutting down.
1623 return agentData;
1624
1621 agentData.CapsPath = capsModule.GetCapsPath(m_agentId); 1625 agentData.CapsPath = capsModule.GetCapsPath(m_agentId);
1622 agentData.ChildrenCapSeeds = new Dictionary<ulong,string>(capsModule.GetChildrenSeeds(m_agentId)); 1626 agentData.ChildrenCapSeeds = new Dictionary<ulong,string>(capsModule.GetChildrenSeeds(m_agentId));
1623 1627
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index 81b47be..c064df1 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -375,7 +375,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
375 Hashtable responsedata = new Hashtable(); 375 Hashtable responsedata = new Hashtable();
376 responsedata["int_response_code"] = 200; 376 responsedata["int_response_code"] = 200;
377 responsedata["content_type"] = "application/xml"; 377 responsedata["content_type"] = "application/xml";
378 responsedata["keepalive"] = false; 378 responsedata["keepalive"] = true;
379 responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(events); 379 responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(events);
380 return responsedata; 380 return responsedata;
381 //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]); 381 //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]);
@@ -386,7 +386,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
386 Hashtable responsedata = new Hashtable(); 386 Hashtable responsedata = new Hashtable();
387 responsedata["int_response_code"] = 502; 387 responsedata["int_response_code"] = 502;
388 responsedata["content_type"] = "text/plain"; 388 responsedata["content_type"] = "text/plain";
389 responsedata["keepalive"] = false; 389 responsedata["keepalive"] = true;
390 responsedata["str_response_string"] = "Upstream error: "; 390 responsedata["str_response_string"] = "Upstream error: ";
391 responsedata["error_status_text"] = "Upstream error:"; 391 responsedata["error_status_text"] = "Upstream error:";
392 responsedata["http_protocol_version"] = "HTTP/1.0"; 392 responsedata["http_protocol_version"] = "HTTP/1.0";