aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-08-10 18:52:46 +0000
committerMW2007-08-10 18:52:46 +0000
commitf147d8e0f035b4377f92dd22a546da1e523bf7fd (patch)
treefb02044c8b0668fd1fabf93e0ab00c0eb7a8658f
parentI'm sorry but it has now became a case of either it goes or I go, so I'm remo... (diff)
downloadopensim-SC_OLD-f147d8e0f035b4377f92dd22a546da1e523bf7fd.zip
opensim-SC_OLD-f147d8e0f035b4377f92dd22a546da1e523bf7fd.tar.gz
opensim-SC_OLD-f147d8e0f035b4377f92dd22a546da1e523bf7fd.tar.bz2
opensim-SC_OLD-f147d8e0f035b4377f92dd22a546da1e523bf7fd.tar.xz
Few small fixes
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs6
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs6
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs6
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs18
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs6
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs2
9 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index fa323ba..1af96e7 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -108,9 +108,9 @@ namespace OpenSim.Framework.Interfaces
108 event GenericCall OnRequestAvatarsData; 108 event GenericCall OnRequestAvatarsData;
109 event AddNewPrim OnAddPrim; 109 event AddNewPrim OnAddPrim;
110 event ObjectDuplicate OnObjectDuplicate; 110 event ObjectDuplicate OnObjectDuplicate;
111 event UpdateVector OnGrapObject; 111 event UpdateVector OnGrabObject;
112 event ObjectSelect OnDeGrapObject; 112 event ObjectSelect OnDeGrabObject;
113 event MoveObject OnGrapUpdate; 113 event MoveObject OnGrabUpdate;
114 114
115 event UpdateShape OnUpdatePrimShape; 115 event UpdateShape OnUpdatePrimShape;
116 event ObjectExtraParams OnUpdateExtraParams; 116 event ObjectExtraParams OnUpdateExtraParams;
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 459e12b..864ea60 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -31,9 +31,9 @@ namespace OpenSim.Framework
31 public event GenericCall OnRequestAvatarsData; 31 public event GenericCall OnRequestAvatarsData;
32 public event AddNewPrim OnAddPrim; 32 public event AddNewPrim OnAddPrim;
33 public event ObjectDuplicate OnObjectDuplicate; 33 public event ObjectDuplicate OnObjectDuplicate;
34 public event UpdateVector OnGrapObject; 34 public event UpdateVector OnGrabObject;
35 public event ObjectSelect OnDeGrapObject; 35 public event ObjectSelect OnDeGrabObject;
36 public event MoveObject OnGrapUpdate; 36 public event MoveObject OnGrabUpdate;
37 37
38 public event UpdateShape OnUpdatePrimShape; 38 public event UpdateShape OnUpdatePrimShape;
39 public event ObjectExtraParams OnUpdateExtraParams; 39 public event ObjectExtraParams OnUpdateExtraParams;
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 81c20e8..d9c7508 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -55,10 +55,10 @@ namespace OpenSim.Region.ClientStack
55 public event StartAnim OnStartAnim; 55 public event StartAnim OnStartAnim;
56 public event GenericCall OnRequestAvatarsData; 56 public event GenericCall OnRequestAvatarsData;
57 public event LinkObjects OnLinkObjects; 57 public event LinkObjects OnLinkObjects;
58 public event UpdateVector OnGrapObject; 58 public event UpdateVector OnGrabObject;
59 public event ObjectSelect OnDeGrapObject; 59 public event ObjectSelect OnDeGrabObject;
60 public event ObjectDuplicate OnObjectDuplicate; 60 public event ObjectDuplicate OnObjectDuplicate;
61 public event MoveObject OnGrapUpdate; 61 public event MoveObject OnGrabUpdate;
62 public event AddNewPrim OnAddPrim; 62 public event AddNewPrim OnAddPrim;
63 public event ObjectExtraParams OnUpdateExtraParams; 63 public event ObjectExtraParams OnUpdateExtraParams;
64 public event UpdateShape OnUpdatePrimShape; 64 public event UpdateShape OnUpdatePrimShape;
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index a50a3bd..401f500 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -290,24 +290,24 @@ namespace OpenSim.Region.ClientStack
290 } 290 }
291 break; 291 break;
292 case PacketType.ObjectGrab: 292 case PacketType.ObjectGrab:
293 ObjectGrabPacket grap = (ObjectGrabPacket)Pack; 293 ObjectGrabPacket grab = (ObjectGrabPacket)Pack;
294 if (OnGrapObject != null) 294 if (OnGrabObject != null)
295 { 295 {
296 OnGrapObject(grap.ObjectData.LocalID, grap.ObjectData.GrabOffset, this); 296 OnGrabObject(grab.ObjectData.LocalID, grab.ObjectData.GrabOffset, this);
297 } 297 }
298 break; 298 break;
299 case PacketType.ObjectGrabUpdate: 299 case PacketType.ObjectGrabUpdate:
300 ObjectGrabUpdatePacket grapUpdate = (ObjectGrabUpdatePacket)Pack; 300 ObjectGrabUpdatePacket grabUpdate = (ObjectGrabUpdatePacket)Pack;
301 if (OnGrapUpdate != null) 301 if (OnGrabUpdate != null)
302 { 302 {
303 OnGrapUpdate(grapUpdate.ObjectData.ObjectID, grapUpdate.ObjectData.GrabOffsetInitial, grapUpdate.ObjectData.GrabPosition, this); 303 OnGrabUpdate(grabUpdate.ObjectData.ObjectID, grabUpdate.ObjectData.GrabOffsetInitial, grabUpdate.ObjectData.GrabPosition, this);
304 } 304 }
305 break; 305 break;
306 case PacketType.ObjectDeGrab: 306 case PacketType.ObjectDeGrab:
307 ObjectDeGrabPacket deGrap = (ObjectDeGrabPacket)Pack; 307 ObjectDeGrabPacket deGrab = (ObjectDeGrabPacket)Pack;
308 if (OnDeGrapObject != null) 308 if (OnDeGrabObject != null)
309 { 309 {
310 OnDeGrapObject(deGrap.ObjectData.LocalID, this); 310 OnDeGrabObject(deGrab.ObjectData.LocalID, this);
311 } 311 }
312 break; 312 break;
313 case PacketType.ObjectDescription: 313 case PacketType.ObjectDescription:
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 4300ce4..4ea5f20 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -509,7 +509,7 @@ namespace OpenSim.Region.Environment.Scenes
509 hasPrim = ((SceneObjectGroup)ent).HasChildPrim(objectID); 509 hasPrim = ((SceneObjectGroup)ent).HasChildPrim(objectID);
510 if (hasPrim != false) 510 if (hasPrim != false)
511 { 511 {
512 ((SceneObjectGroup)ent).GrapMovement(offset, pos, remoteClient); 512 ((SceneObjectGroup)ent).GrabMovement(offset, pos, remoteClient);
513 break; 513 break;
514 } 514 }
515 } 515 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d3c7f77..e7f5f56 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Environment.Scenes
588 client.OnTeleportLocationRequest += RequestTeleportLocation; 588 client.OnTeleportLocationRequest += RequestTeleportLocation;
589 client.OnObjectSelect += SelectPrim; 589 client.OnObjectSelect += SelectPrim;
590 client.OnObjectDeselect += DeselectPrim; 590 client.OnObjectDeselect += DeselectPrim;
591 client.OnGrapUpdate += MoveObject; 591 client.OnGrabUpdate += MoveObject;
592 client.OnDeRezObject += DeRezObject; 592 client.OnDeRezObject += DeRezObject;
593 client.OnNameFromUUIDRequest += commsManager.HandleUUIDNameRequest; 593 client.OnNameFromUUIDRequest += commsManager.HandleUUIDNameRequest;
594 client.OnObjectDescription += PrimDescription; 594 client.OnObjectDescription += PrimDescription;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 8b761f6..39b7fb0 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -365,7 +365,7 @@ namespace OpenSim.Region.Environment.Scenes
365 /// <param name="offset"></param> 365 /// <param name="offset"></param>
366 /// <param name="pos"></param> 366 /// <param name="pos"></param>
367 /// <param name="remoteClient"></param> 367 /// <param name="remoteClient"></param>
368 public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient) 368 public void GrabMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
369 { 369 {
370 this.Pos = pos; 370 this.Pos = pos;
371 this.m_rootPart.SendTerseUpdateToAllClients(); 371 this.m_rootPart.SendTerseUpdateToAllClients();
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index 3e9b669..af3d77b 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -44,9 +44,9 @@ namespace SimpleApp
44 public event GenericCall OnRequestAvatarsData; 44 public event GenericCall OnRequestAvatarsData;
45 public event AddNewPrim OnAddPrim; 45 public event AddNewPrim OnAddPrim;
46 public event ObjectDuplicate OnObjectDuplicate; 46 public event ObjectDuplicate OnObjectDuplicate;
47 public event UpdateVector OnGrapObject; 47 public event UpdateVector OnGrabObject;
48 public event ObjectSelect OnDeGrapObject; 48 public event ObjectSelect OnDeGrabObject;
49 public event MoveObject OnGrapUpdate; 49 public event MoveObject OnGrabUpdate;
50 50
51 51
52 public event UpdateShape OnUpdatePrimShape; 52 public event UpdateShape OnUpdatePrimShape;
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 1a69e74..92dd61b 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -61,7 +61,7 @@ namespace SimpleApp
61 client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition; 61 client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition;
62 client.OnRequestMapBlocks += this.RequestMapBlocks; 62 client.OnRequestMapBlocks += this.RequestMapBlocks;
63 client.OnTeleportLocationRequest += this.RequestTeleportLocation; 63 client.OnTeleportLocationRequest += this.RequestTeleportLocation;
64 client.OnGrapUpdate += this.MoveObject; 64 client.OnGrabUpdate += this.MoveObject;
65 client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest; 65 client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
66 66
67 client.OnCompleteMovementToRegion += delegate() 67 client.OnCompleteMovementToRegion += delegate()