From 93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 9 Jul 2007 15:59:35 +0000
Subject: Done a little bit of renaming in primitive.cs and on a few events in
 IClientAPI. Disabled CAPS asset uploading as it seems it now crashes the
 server.

---
 OpenSim/Region/ClientStack/ClientView.API.cs            |  6 +++---
 OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 3c1df75..5866b45 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -64,11 +64,11 @@ namespace OpenSim.Region.ClientStack
         public event GenericCall7 OnObjectName;
         public event UpdatePrimFlags OnUpdatePrimFlags;
         public event UpdatePrimTexture OnUpdatePrimTexture;
-        public event UpdateVector OnUpdatePrimPosition;
+        public event UpdateVector OnUpdatePrimGroupPosition;
         public event UpdateVector OnUpdatePrimSinglePosition;
-        public event UpdatePrimRotation OnUpdatePrimRotation;
+        public event UpdatePrimRotation OnUpdatePrimGroupRotation;
         public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
-        public event UpdatePrimGroupRotation OnUpdatePrimGroupRotation;
+        public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
         public event UpdateVector OnUpdatePrimScale;
         public event StatusChange OnChildAgentStatus;
         public event GenericCall2 OnStopMovement;
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 5cea28a..31ea3eb 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -107,10 +107,10 @@ namespace OpenSim.Region.ClientStack
                 #region position
                 if (multipleupdate.ObjectData[i].Type == 9) //change position
                 {
-                    if (OnUpdatePrimPosition != null)
+                    if (OnUpdatePrimGroupPosition != null)
                     {
                         LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
-                        OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
+                        OnUpdatePrimGroupPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
                     }
 
                 }
@@ -145,22 +145,22 @@ namespace OpenSim.Region.ClientStack
                 }
                 else if (multipleupdate.ObjectData[i].Type == 10)//group rotation from object tab
                 {
-                    if (OnUpdatePrimRotation != null)
+                    if (OnUpdatePrimGroupRotation != null)
                     {
                         libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
                       //  Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
-                        OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+                        OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
                     }
                 }
                 else if (multipleupdate.ObjectData[i].Type == 11)//group rotation from mouse
                 {
-                    if (OnUpdatePrimGroupRotation != null)
+                    if (OnUpdatePrimGroupMouseRotation != null)
                     {
                         libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
                         libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
                         //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
                        // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
-                        OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this);
+                        OnUpdatePrimGroupMouseRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this);
                     }
                 }
                 #endregion
-- 
cgit v1.1