From f41379549773531b2886b64aaacf57c954a64610 Mon Sep 17 00:00:00 2001 From: MW Date: Mon, 25 Jun 2007 16:01:30 +0000 Subject: updated prebuild.xml. Added some more events to IClientAPI (OnGrapObject , OnGrapUpdate, OnDeGrapObject). --- .../GridCommsManager.cs | 3 +- .../OpenGrid.Framework.Communications.OGS1.csproj | 61 +++++++++++----------- .../CommunicationsManager.cs | 2 +- .../OpenGrid.Framework.UserManagement.csproj.user | 2 +- Common/OpenSim.Framework/Interfaces/IClientAPI.cs | 15 ++++-- 5 files changed, 45 insertions(+), 38 deletions(-) (limited to 'Common') diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs index 0784ffa..308e00f 100644 --- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs +++ b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs @@ -1,12 +1,13 @@ using System; using System.Collections.Generic; using System.Text; +using OpenSim.Framework.Types; using OpenGrid.Framework.Communications; namespace OpenGrid.Framework.Communications.OGS1 { public class GridCommsManager : CommunicationsManager { - public GridCommsManager() + public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo) { GridServer = new OGS1GridServices(); InterRegion = new OGSInterSimComms(); diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj index 4a80635..3f4f22d 100644 --- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj +++ b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj @@ -1,13 +1,12 @@ - + Local 8.0.50727 2.0 - {C1F40DD4-A68B-4233-9142-CE236775A3CE} + {17442AF1-0000-0000-0000-000000000000} Debug AnyCPU - - + OpenGrid.Framework.Communications.OGS1 @@ -16,11 +15,9 @@ IE50 false Library - - + OpenGrid.Framework.Communications.OGS1 - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,23 +55,22 @@ False False 4 - - + - + ..\..\bin\libsecondlife.dll False - + System.dll False - + System.Data.dll False - + System.Xml.dll False @@ -87,44 +80,52 @@ OpenGrid.Framework.Communications {683344D5-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False - {62CDF671-0000-0000-0000-000000000000} OpenGrid.Framework.Data + {62CDF671-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False OpenSim.Framework {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework.Console {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Servers {8BB20F0A-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False XMLRPC {8E81D43C-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False - + + Code + Code - - + + Code + + + Code + Code @@ -136,4 +137,4 @@ - \ No newline at end of file + diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs index 2ed4fd2..8d8a647 100644 --- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs +++ b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs @@ -43,7 +43,7 @@ namespace OpenGrid.Framework.Communications public IGridServices GridServer; public IInterRegionCommunications InterRegion; - public CommunicationsManager() + public CommunicationsManager(NetworkServersInfo serversInfo) { } diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user index ae8a33c..5941547 100644 --- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user +++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - E:\work\oslauth\sim\branches\Sugilite\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs index 9028d8d..009648c 100644 --- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs +++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs @@ -55,11 +55,12 @@ namespace OpenSim.Framework.Interfaces public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); - public delegate void UpdatePrimVector(uint localID, LLVector3 pos, IClientAPI remoteClient); + public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient); public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); public delegate void StatusChange(bool status); public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status); public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation); + public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient); public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client); public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client); @@ -86,14 +87,17 @@ namespace OpenSim.Framework.Interfaces event UpdateAgent OnAgentUpdate; event GenericCall OnRequestAvatarsData; event GenericCall4 OnAddPrim; + event UpdateVector OnGrapObject; + event ObjectSelect OnDeGrapObject; + event MoveObject OnGrapUpdate; event UpdateShape OnUpdatePrimShape; event ObjectSelect OnObjectSelect; event UpdatePrimFlags OnUpdatePrimFlags; event UpdatePrimTexture OnUpdatePrimTexture; - event UpdatePrimVector OnUpdatePrimPosition; + event UpdateVector OnUpdatePrimPosition; event UpdatePrimRotation OnUpdatePrimRotation; - event UpdatePrimVector OnUpdatePrimScale; + event UpdateVector OnUpdatePrimScale; event StatusChange OnChildAgentStatus; event GenericCall2 OnStopMovement; event NewAvatar OnNewAvatar; @@ -143,13 +147,14 @@ namespace OpenSim.Framework.Interfaces void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags); void SendTeleportCancel(); void SendTeleportLocationStart(); + void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry); void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity); void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); - void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID); - void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID); + void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID , uint flags); + void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags); void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation); } } -- cgit v1.1