From 8b4f7604e618ed409cd4dcb44dcf14ce22b72be7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 15 Jul 2012 19:45:08 +0200
Subject: Revert "Experimentally handle UseCircuitCode synchrnonously"

This reverts commit e3fa73da96f5612da52d140425f1633494d6edef.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 56c0992..bd8273d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -701,8 +701,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 object[] array = new object[] { buffer, packet };
 
-                //Util.FireAndForget(HandleUseCircuitCode, array);
-                HandleUseCircuitCode(array);
+                Util.FireAndForget(HandleUseCircuitCode, array);
 
                 return;
             }
-- 
cgit v1.1


From 47f7cc9457bfc5c909290ac189b34dd3eceebe7f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 15 Jul 2012 20:41:10 +0200
Subject: Fix a sit rotation issue

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d2dab6f..952d5da 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8062,7 +8062,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 }
 
                                 Quaternion srot = sitpart.RotationOffset;
-                                rot = Quaternion.Conjugate(srot) * rot; // removed sit part offset rotation
+                                rot = srot * rot; // removed sit part offset rotation
                                 av.Rotation = rot;
 //                                av.SendAvatarDataToAllAgents();
                                 av.SendTerseUpdateToAllClients();
-- 
cgit v1.1