aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs21
2 files changed, 14 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 6de6af6..9e7117f 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Text; 31using System.Text;
32using Axiom.MathLib; 32using Axiom.Math;
33using libsecondlife; 33using libsecondlife;
34using libsecondlife.Packets; 34using libsecondlife.Packets;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
@@ -63,7 +63,9 @@ namespace OpenSim.Region.ClientStack
63 public event UpdatePrimFlags OnUpdatePrimFlags; 63 public event UpdatePrimFlags OnUpdatePrimFlags;
64 public event UpdatePrimTexture OnUpdatePrimTexture; 64 public event UpdatePrimTexture OnUpdatePrimTexture;
65 public event UpdateVector OnUpdatePrimPosition; 65 public event UpdateVector OnUpdatePrimPosition;
66 public event UpdateVector OnUpdatePrimSinglePosition;
66 public event UpdatePrimRotation OnUpdatePrimRotation; 67 public event UpdatePrimRotation OnUpdatePrimRotation;
68 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
67 public event UpdatePrimGroupRotation OnUpdatePrimGroupRotation; 69 public event UpdatePrimGroupRotation OnUpdatePrimGroupRotation;
68 public event UpdateVector OnUpdatePrimScale; 70 public event UpdateVector OnUpdatePrimScale;
69 public event StatusChange OnChildAgentStatus; 71 public event StatusChange OnChildAgentStatus;
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 0b6c4f6..5cea28a 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ClientStack
101 protected bool MultipleObjUpdate(ClientView simClient, Packet packet) 101 protected bool MultipleObjUpdate(ClientView simClient, Packet packet)
102 { 102 {
103 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet; 103 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
104 // Console.WriteLine("new multi update packet " + multipleupdate.ToString()); 104 //System.Console.WriteLine("new multi update packet " + multipleupdate.ToString());
105 for (int i = 0; i < multipleupdate.ObjectData.Length; i++) 105 for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
106 { 106 {
107 #region position 107 #region position
@@ -116,30 +116,31 @@ namespace OpenSim.Region.ClientStack
116 } 116 }
117 else if (multipleupdate.ObjectData[i].Type == 1) //single item of group change position 117 else if (multipleupdate.ObjectData[i].Type == 1) //single item of group change position
118 { 118 {
119 if (OnUpdatePrimPosition != null) 119 if (OnUpdatePrimSinglePosition != null)
120 { 120 {
121 // libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); 121 libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
122 //OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this); 122 // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
123 OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
123 } 124 }
124 } 125 }
125 #endregion position 126 #endregion position
126 #region rotation 127 #region rotation
127 else if (multipleupdate.ObjectData[i].Type == 2)// single item of group rotation from tab 128 else if (multipleupdate.ObjectData[i].Type == 2)// single item of group rotation from tab
128 { 129 {
129 if (OnUpdatePrimRotation != null) 130 if (OnUpdatePrimSingleRotation != null)
130 { 131 {
131 LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true); 132 LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
132 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 133 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
133 OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this); 134 OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
134 } 135 }
135 } 136 }
136 else if (multipleupdate.ObjectData[i].Type == 3)// single item of group rotation from mouse 137 else if (multipleupdate.ObjectData[i].Type == 3)// single item of group rotation from mouse
137 { 138 {
138 if (OnUpdatePrimRotation != null) 139 if (OnUpdatePrimSingleRotation != null)
139 { 140 {
140 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true); 141 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
141 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 142 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
142 OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this); 143 OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
143 } 144 }
144 } 145 }
145 else if (multipleupdate.ObjectData[i].Type == 10)//group rotation from object tab 146 else if (multipleupdate.ObjectData[i].Type == 10)//group rotation from object tab
@@ -182,7 +183,7 @@ namespace OpenSim.Region.ClientStack
182 // OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this); 183 // OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
183 } 184 }
184 } 185 }
185 else if (multipleupdate.ObjectData[i].Type == 5)//single scale from object tab 186 else if (multipleupdate.ObjectData[i].Type == 5)//single prim scale from object tab
186 { 187 {
187 if (OnUpdatePrimScale != null) 188 if (OnUpdatePrimScale != null)
188 { 189 {
@@ -191,7 +192,7 @@ namespace OpenSim.Region.ClientStack
191 OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this); 192 OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
192 } 193 }
193 } 194 }
194 else if (multipleupdate.ObjectData[i].Type == 21)//single scale from mouse 195 else if (multipleupdate.ObjectData[i].Type == 21)//single prim scale from mouse
195 { 196 {
196 if (OnUpdatePrimScale != null) 197 if (OnUpdatePrimScale != null)
197 { 198 {