aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/EventQueue
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs11
2 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index a05e88c..ffb53af 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -451,8 +451,8 @@ namespace OpenSim.Region.ClientStack.Linden
451 responsedata["content_type"] = "text/plain"; 451 responsedata["content_type"] = "text/plain";
452 responsedata["keepalive"] = false; 452 responsedata["keepalive"] = false;
453 responsedata["reusecontext"] = false; 453 responsedata["reusecontext"] = false;
454 responsedata["str_response_string"] = "Upstream error: "; 454 responsedata["str_response_string"] = "<llsd></llsd>";
455 responsedata["error_status_text"] = "Upstream error:"; 455 responsedata["error_status_text"] = "<llsd></llsd>";
456 responsedata["http_protocol_version"] = "HTTP/1.0"; 456 responsedata["http_protocol_version"] = "HTTP/1.0";
457 return responsedata; 457 return responsedata;
458 } 458 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index ded228d..3fb7de2 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -157,6 +157,12 @@ namespace OpenSim.Region.ClientStack.Linden
157 uint locationID, uint flags, string capsURL, UUID agentID, 157 uint locationID, uint flags, string capsURL, UUID agentID,
158 int regionSizeX, int regionSizeY) 158 int regionSizeX, int regionSizeY)
159 { 159 {
160 // not sure why flags get overwritten here
161 if ((flags & (uint)TeleportFlags.IsFlying) != 0)
162 flags = (uint)TeleportFlags.ViaLocation | (uint)TeleportFlags.IsFlying;
163 else
164 flags = (uint)TeleportFlags.ViaLocation;
165
160 OSDMap info = new OSDMap(); 166 OSDMap info = new OSDMap();
161 info.Add("AgentID", OSD.FromUUID(agentID)); 167 info.Add("AgentID", OSD.FromUUID(agentID));
162 info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this? 168 info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this?
@@ -165,7 +171,8 @@ namespace OpenSim.Region.ClientStack.Linden
165 info.Add("SimAccess", OSD.FromInteger(simAccess)); 171 info.Add("SimAccess", OSD.FromInteger(simAccess));
166 info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes())); 172 info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));
167 info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); 173 info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port));
168 info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation 174// info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
175 info.Add("TeleportFlags", OSD.FromUInteger(flags));
169 info.Add("RegionSizeX", new OSDInteger(regionSizeX)); 176 info.Add("RegionSizeX", new OSDInteger(regionSizeX));
170 info.Add("RegionSizeY", new OSDInteger(regionSizeY)); 177 info.Add("RegionSizeY", new OSDInteger(regionSizeY));
171 178
@@ -412,7 +419,7 @@ namespace OpenSim.Region.ClientStack.Linden
412 public static OSD partPhysicsProperties(uint localID, byte physhapetype, 419 public static OSD partPhysicsProperties(uint localID, byte physhapetype,
413 float density, float friction, float bounce, float gravmod) 420 float density, float friction, float bounce, float gravmod)
414 { 421 {
415 422
416 OSDMap physinfo = new OSDMap(6); 423 OSDMap physinfo = new OSDMap(6);
417 physinfo["LocalID"] = localID; 424 physinfo["LocalID"] = localID;
418 physinfo["Density"] = density; 425 physinfo["Density"] = density;