OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Few small fixes

afrisby
MW 2007-08-10 18:52:46 +00:00
parent afa445660e
commit f147d8e0f0
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/General/Interfaces/IClientAPI.cs
View File

@ -108,9 +108,9 @@ namespace OpenSim.Framework.Interfaces
event GenericCall OnRequestAvatarsData; event GenericCall OnRequestAvatarsData;
event AddNewPrim OnAddPrim; event AddNewPrim OnAddPrim;
event ObjectDuplicate OnObjectDuplicate; event ObjectDuplicate OnObjectDuplicate;
event UpdateVector OnGrapObject; event UpdateVector OnGrabObject;
event ObjectSelect OnDeGrapObject; event ObjectSelect OnDeGrabObject;
event MoveObject OnGrapUpdate; event MoveObject OnGrabUpdate;
event UpdateShape OnUpdatePrimShape; event UpdateShape OnUpdatePrimShape;
event ObjectExtraParams OnUpdateExtraParams; event ObjectExtraParams OnUpdateExtraParams;

6
OpenSim/Framework/General/NullClientAPI.cs
View File

@ -31,9 +31,9 @@ namespace OpenSim.Framework
public event GenericCall OnRequestAvatarsData; public event GenericCall OnRequestAvatarsData;
public event AddNewPrim OnAddPrim; public event AddNewPrim OnAddPrim;
public event ObjectDuplicate OnObjectDuplicate; public event ObjectDuplicate OnObjectDuplicate;
public event UpdateVector OnGrapObject; public event UpdateVector OnGrabObject;
public event ObjectSelect OnDeGrapObject; public event ObjectSelect OnDeGrabObject;
public event MoveObject OnGrapUpdate; public event MoveObject OnGrabUpdate;
public event UpdateShape OnUpdatePrimShape; public event UpdateShape OnUpdatePrimShape;
public event ObjectExtraParams OnUpdateExtraParams; public event ObjectExtraParams OnUpdateExtraParams;

6
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -55,10 +55,10 @@ namespace OpenSim.Region.ClientStack
public event StartAnim OnStartAnim; public event StartAnim OnStartAnim;
public event GenericCall OnRequestAvatarsData; public event GenericCall OnRequestAvatarsData;
public event LinkObjects OnLinkObjects; public event LinkObjects OnLinkObjects;
public event UpdateVector OnGrapObject; public event UpdateVector OnGrabObject;
public event ObjectSelect OnDeGrapObject; public event ObjectSelect OnDeGrabObject;
public event ObjectDuplicate OnObjectDuplicate; public event ObjectDuplicate OnObjectDuplicate;
public event MoveObject OnGrapUpdate; public event MoveObject OnGrabUpdate;
public event AddNewPrim OnAddPrim; public event AddNewPrim OnAddPrim;
public event ObjectExtraParams OnUpdateExtraParams; public event ObjectExtraParams OnUpdateExtraParams;
public event UpdateShape OnUpdatePrimShape; public event UpdateShape OnUpdatePrimShape;

18
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@ -290,24 +290,24 @@ namespace OpenSim.Region.ClientStack
} }
break; break;
case PacketType.ObjectGrab: case PacketType.ObjectGrab:
ObjectGrabPacket grap = (ObjectGrabPacket)Pack; ObjectGrabPacket grab = (ObjectGrabPacket)Pack;
if (OnGrapObject != null) if (OnGrabObject != null)
{ {
OnGrapObject(grap.ObjectData.LocalID, grap.ObjectData.GrabOffset, this); OnGrabObject(grab.ObjectData.LocalID, grab.ObjectData.GrabOffset, this);
} }
break; break;
case PacketType.ObjectGrabUpdate: case PacketType.ObjectGrabUpdate:
ObjectGrabUpdatePacket grapUpdate = (ObjectGrabUpdatePacket)Pack; ObjectGrabUpdatePacket grabUpdate = (ObjectGrabUpdatePacket)Pack;
if (OnGrapUpdate != null) if (OnGrabUpdate != null)
{ {
OnGrapUpdate(grapUpdate.ObjectData.ObjectID, grapUpdate.ObjectData.GrabOffsetInitial, grapUpdate.ObjectData.GrabPosition, this); OnGrabUpdate(grabUpdate.ObjectData.ObjectID, grabUpdate.ObjectData.GrabOffsetInitial, grabUpdate.ObjectData.GrabPosition, this);
} }
break; break;
case PacketType.ObjectDeGrab: case PacketType.ObjectDeGrab:
ObjectDeGrabPacket deGrap = (ObjectDeGrabPacket)Pack; ObjectDeGrabPacket deGrab = (ObjectDeGrabPacket)Pack;
if (OnDeGrapObject != null) if (OnDeGrabObject != null)
{ {
OnDeGrapObject(deGrap.ObjectData.LocalID, this); OnDeGrabObject(deGrab.ObjectData.LocalID, this);
} }
break; break;
case PacketType.ObjectDescription: case PacketType.ObjectDescription:

2
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@ -509,7 +509,7 @@ namespace OpenSim.Region.Environment.Scenes
hasPrim = ((SceneObjectGroup)ent).HasChildPrim(objectID); hasPrim = ((SceneObjectGroup)ent).HasChildPrim(objectID);
if (hasPrim != false) if (hasPrim != false)
{ {
((SceneObjectGroup)ent).GrapMovement(offset, pos, remoteClient); ((SceneObjectGroup)ent).GrabMovement(offset, pos, remoteClient);
break; break;
} }
} }

2
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -588,7 +588,7 @@ namespace OpenSim.Region.Environment.Scenes
client.OnTeleportLocationRequest += RequestTeleportLocation; client.OnTeleportLocationRequest += RequestTeleportLocation;
client.OnObjectSelect += SelectPrim; client.OnObjectSelect += SelectPrim;
client.OnObjectDeselect += DeselectPrim; client.OnObjectDeselect += DeselectPrim;
client.OnGrapUpdate += MoveObject; client.OnGrabUpdate += MoveObject;
client.OnDeRezObject += DeRezObject; client.OnDeRezObject += DeRezObject;
client.OnNameFromUUIDRequest += commsManager.HandleUUIDNameRequest; client.OnNameFromUUIDRequest += commsManager.HandleUUIDNameRequest;
client.OnObjectDescription += PrimDescription; client.OnObjectDescription += PrimDescription;

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -365,7 +365,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="offset"></param> /// <param name="offset"></param>
/// <param name="pos"></param> /// <param name="pos"></param>
/// <param name="remoteClient"></param> /// <param name="remoteClient"></param>
public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient) public void GrabMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
{ {
this.Pos = pos; this.Pos = pos;
this.m_rootPart.SendTerseUpdateToAllClients(); this.m_rootPart.SendTerseUpdateToAllClients();

6
OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
View File

@ -44,9 +44,9 @@ namespace SimpleApp
public event GenericCall OnRequestAvatarsData; public event GenericCall OnRequestAvatarsData;
public event AddNewPrim OnAddPrim; public event AddNewPrim OnAddPrim;
public event ObjectDuplicate OnObjectDuplicate; public event ObjectDuplicate OnObjectDuplicate;
public event UpdateVector OnGrapObject; public event UpdateVector OnGrabObject;
public event ObjectSelect OnDeGrapObject; public event ObjectSelect OnDeGrabObject;
public event MoveObject OnGrapUpdate; public event MoveObject OnGrabUpdate;
public event UpdateShape OnUpdatePrimShape; public event UpdateShape OnUpdatePrimShape;

2
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@ -61,7 +61,7 @@ namespace SimpleApp
client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition; client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition;
client.OnRequestMapBlocks += this.RequestMapBlocks; client.OnRequestMapBlocks += this.RequestMapBlocks;
client.OnTeleportLocationRequest += this.RequestTeleportLocation; client.OnTeleportLocationRequest += this.RequestTeleportLocation;
client.OnGrapUpdate += this.MoveObject; client.OnGrabUpdate += this.MoveObject;
client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest; client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
client.OnCompleteMovementToRegion += delegate() client.OnCompleteMovementToRegion += delegate()