From 4be35df5fa1f1ba364ac45ae8b2585319dfbdbae Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 16 Feb 2013 05:09:27 +0100
Subject: Fix shape parameters sent for meshes tosupport the full number of
faces
---
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index ca15e3e..0267805 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3893,6 +3893,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
part.Shape.LightEntry = false;
}
}
+
+ if (part.Shape != null && (part.Shape.SculptType == (byte)SculptType.Mesh))
+ {
+ // Ensure that mesh has at least 8 valid faces
+ part.Shape.ProfileBegin = 12500;
+ part.Shape.ProfileEnd = 0;
+ part.Shape.ProfileHollow = 27500;
+ }
}
++updatesThisCall;
--
cgit v1.1
From 8c0b9080a4fb013d559966fc8c8175fb16162c2d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 18 Feb 2013 21:09:14 +0100
Subject: Fix an issue where the viewer would request the seed cap before there
was a handler for it.
---
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 3 +++
1 file changed, 3 insertions(+)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 2bb3d38..248eab6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -343,6 +343,9 @@ namespace OpenSim.Region.ClientStack.Linden
m_log.DebugFormat(
"[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID);
+ if (!m_HostCapsObj.WaitForActivation())
+ return string.Empty;
+
if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint))
{
m_log.WarnFormat(
--
cgit v1.1
From e0e9118f8137ec95c73fe264f0c3fcf9f7305741 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 24 Feb 2013 18:31:49 +0100
Subject: The viewer tries to parse the error message body to LLSD - give it
some.
---
.../Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 986a665..f6e501d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -467,8 +467,8 @@ namespace OpenSim.Region.ClientStack.Linden
responsedata["content_type"] = "text/plain";
responsedata["keepalive"] = false;
responsedata["reusecontext"] = false;
- responsedata["str_response_string"] = "Upstream error: ";
- responsedata["error_status_text"] = "Upstream error:";
+ responsedata["str_response_string"] = "";
+ responsedata["error_status_text"] = "";
responsedata["http_protocol_version"] = "HTTP/1.0";
return responsedata;
}
--
cgit v1.1
From da2b59848461d0f309067762403f9143551bb5ba Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 25 Feb 2013 18:26:59 +0100
Subject: Make banking no longer break sit rotations. Fix spinning avatars.
---
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 0267805..0388828 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4960,6 +4960,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
rotation = part.RotationOffset * presence.Rotation;
}
+ angularVelocity = Vector3.Zero;
+ }
+ else
+ {
+ angularVelocity = presence.AngularVelocity;
+ rotation = presence.Rotation;
}
attachPoint = 0;
@@ -4972,9 +4978,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// may improve movement smoothness.
// acceleration = new Vector3(1, 0, 0);
- angularVelocity = presence.AngularVelocity;
- rotation = presence.Rotation;
-
if (sendTexture)
textureEntry = presence.Appearance.Texture.GetBytes();
else
--
cgit v1.1
From 2ad72db0ecd834ca7071aa6038f209b64f79b868 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 3 Mar 2013 11:40:46 +0100
Subject: Make a viewer sent XML error prettier
---
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index a823dd8..707cc93 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -211,6 +211,10 @@ namespace OpenSim.Region.ClientStack.Linden
m_log.Error("Request: " + request);
return;
}
+ catch (System.Xml.XmlException)
+ {
+ m_log.ErrorFormat("[INVENTORY]: XML Format error");
+ }
ArrayList foldersrequested = (ArrayList)hash["folders"];
--
cgit v1.1