aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
diff options
context:
space:
mode:
authorMW2007-07-09 15:59:35 +0000
committerMW2007-07-09 15:59:35 +0000
commit93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c (patch)
tree1b37d82af9a545e32922fff52c33b046bb6accb4 /OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
parent* Begun work on Primitive Duplication. Not hooked up yet, but theoretically c... (diff)
downloadopensim-SC_OLD-93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c.zip
opensim-SC_OLD-93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c.tar.gz
opensim-SC_OLD-93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c.tar.bz2
opensim-SC_OLD-93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs12
1 files changed, 6 insertions, 6 deletions
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
107 #region position 107 #region position
108 if (multipleupdate.ObjectData[i].Type == 9) //change position 108 if (multipleupdate.ObjectData[i].Type == 9) //change position
109 { 109 {
110 if (OnUpdatePrimPosition != null) 110 if (OnUpdatePrimGroupPosition != null)
111 { 111 {
112 LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); 112 LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
113 OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this); 113 OnUpdatePrimGroupPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
114 } 114 }
115 115
116 } 116 }
@@ -145,22 +145,22 @@ namespace OpenSim.Region.ClientStack
145 } 145 }
146 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
147 { 147 {
148 if (OnUpdatePrimRotation != null) 148 if (OnUpdatePrimGroupRotation != null)
149 { 149 {
150 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true); 150 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
151 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 151 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
152 OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this); 152 OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
153 } 153 }
154 } 154 }
155 else if (multipleupdate.ObjectData[i].Type == 11)//group rotation from mouse 155 else if (multipleupdate.ObjectData[i].Type == 11)//group rotation from mouse
156 { 156 {
157 if (OnUpdatePrimGroupRotation != null) 157 if (OnUpdatePrimGroupMouseRotation != null)
158 { 158 {
159 libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); 159 libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
160 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true); 160 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
161 //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 161 //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
162 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 162 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
163 OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this); 163 OnUpdatePrimGroupMouseRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this);
164 } 164 }
165 } 165 }
166 #endregion 166 #endregion