Merge branch 'avination' into ubitwork

2 files changed, 2 insertions, 3 deletions

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;
             }
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();