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.

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1798cba..5e08d53 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -469,10 +469,10 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnInstantMessage += this.InstantMessage;

             client.OnRequestWearables += this.InformClientOfNeighbours;

             client.OnAddPrim += this.AddNewPrim;

-            client.OnUpdatePrimPosition += this.UpdatePrimPosition;

+            client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition;

             client.OnUpdatePrimSinglePosition += this.UpdatePrimSinglePosition;

-            client.OnUpdatePrimRotation += this.UpdatePrimRotation;

             client.OnUpdatePrimGroupRotation += this.UpdatePrimRotation;

+            client.OnUpdatePrimGroupMouseRotation += this.UpdatePrimRotation;

             client.OnUpdatePrimSingleRotation += this.UpdatePrimSingleRotation;

             client.OnUpdatePrimScale += this.UpdatePrimScale;

             client.OnUpdatePrimShape += this.UpdatePrimShape;