From 7870cfb75fa33749e2baeac2877f5489c8e82b4d Mon Sep 17 00:00:00 2001 From: Jim Radford Date: Fri, 16 Oct 2009 07:36:31 +0000 Subject: [PATCH] LIBOMV-686 Remove some cruft left in after prior changes git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3150 52acb1d6-8a22-11de-b505-999d5b087335 --- OpenMetaverse/AgentManager.cs | 107 ++++------------------------------ 1 file changed, 11 insertions(+), 96 deletions(-) diff --git a/OpenMetaverse/AgentManager.cs b/OpenMetaverse/AgentManager.cs index 35c13f61..824af469 100644 --- a/OpenMetaverse/AgentManager.cs +++ b/OpenMetaverse/AgentManager.cs @@ -819,13 +819,7 @@ namespace OpenMetaverse add { lock (m_MoneyBalanceReplyLock) { m_MoneyBalance += value; } } remove { lock (m_MoneyBalanceReplyLock) { m_MoneyBalance -= value; } } } - /// - /// Triggered on incoming instant messages - /// - /// Instant message data structure - /// Simulator where this IM was received from - //public delegate void InstantMessageCallback(InstantMessage im, Simulator simulator); - + /// The event subscribers. null if no subcribers private EventHandler m_InstantMessage; @@ -916,19 +910,7 @@ namespace OpenMetaverse { add { lock (m_AnimationsChangedLock) { m_AnimationsChanged += value; } } remove { lock (m_AnimationsChangedLock) { m_AnimationsChanged -= value; } } - } - - /// - /// Triggered when an object or avatar forcefully collides with our - /// agent - /// - /// Collision type - /// Colliding object or avatar ID - /// Victim ID, should be our own AgentID - /// Velocity or total force of the collision - /// Time the collision occurred - //public delegate void MeanCollisionCallback(MeanCollisionType type, UUID perp, UUID victim, - // float magnitude, DateTime time); + } /// The event subscribers. null if no subcribers private EventHandler m_MeanCollision; @@ -951,14 +933,7 @@ namespace OpenMetaverse { add { lock (m_MeanCollisionLock) { m_MeanCollision += value; } } remove { lock (m_MeanCollisionLock) { m_MeanCollision -= value; } } - } - - /// - /// Triggered when the agent physically moves in to a neighboring region - /// - /// Simulator agent was previously occupying - /// Simulator agent is now currently occupying - //public delegate void RegionCrossedCallback(Simulator oldSim, Simulator newSim); + } /// The event subscribers. null if no subcribers private EventHandler m_RegionCrossed; @@ -982,15 +957,7 @@ namespace OpenMetaverse add { lock (m_RegionCrossedLock) { m_RegionCrossed += value; } } remove { lock (m_RegionCrossedLock) { m_RegionCrossed -= value; } } } - /// - /// Fired when group chat session confirmed joined - /// Key of Session (groups UUID) - /// Temporary session Key - /// A string representation of the session name - /// if session start successful, - /// otherwise - //public delegate void GroupChatJoinedCallback(UUID groupChatSessionID, string sessionName, UUID tmpSessionID, bool success);GroupChatJoinedEventArgs - + /// The event subscribers. null if no subcribers private EventHandler m_GroupChatJoined; @@ -1012,10 +979,7 @@ namespace OpenMetaverse { add { lock (m_GroupChatJoinedLock) { m_GroupChatJoined += value; } } remove { lock (m_GroupChatJoinedLock) { m_GroupChatJoined -= value; } } - } - /// Fired when agent group chat session terminated - /// Key of Session (groups UUID) - //public delegate void GroupChatLeftCallback(UUID groupchatSessionID); + } /// The event subscribers. null if no subcribers private EventHandler m_GroupChatLeft; @@ -1038,12 +1002,7 @@ namespace OpenMetaverse { add { lock (m_GroupChatLeftLock) { m_GroupChatLeft += value; } } remove { lock (m_GroupChatLeftLock) { m_GroupChatLeft -= value; } } - } - /// - /// Fired when alert message received from simulator - /// - /// the message sent from the grid to our avatar. - //public delegate void AlertMessageCallback(string message); + } /// The event subscribers. null if no subcribers private EventHandler m_AlertMessage; @@ -1067,16 +1026,7 @@ namespace OpenMetaverse { add { lock (m_AlertMessageLock) { m_AlertMessage += value; } } remove { lock (m_AlertMessageLock) { m_AlertMessage -= value; } } - } - - - /// - /// Fired when a script wants to give or release controls. - /// - /// Control to give or take - /// true of passing control to agent - /// true of taking control from agent - //public delegate void ScriptControlCallback(ScriptControlChange controls, bool pass, bool take); ScriptControlEventArgs + } /// The event subscribers. null if no subcribers private EventHandler m_ScriptControl; @@ -1100,13 +1050,7 @@ namespace OpenMetaverse add { lock (m_ScriptControlLock) { m_ScriptControl += value; } } remove { lock (m_ScriptControlLock) { m_ScriptControl -= value; } } } - - /// - /// Fired when camera tries to view beyond its view limits - /// - /// representing plane where constraints were hit - //public delegate void CameraConstraintCallback(Vector4 collidePlane); - + /// The event subscribers. null if no subcribers private EventHandler m_CameraConstraint; @@ -1130,24 +1074,7 @@ namespace OpenMetaverse add { lock (m_CameraConstraintLock) { m_CameraConstraint += value; } } remove { lock (m_CameraConstraintLock) { m_CameraConstraint -= value; } } } - /// - /// Fired when script sensor reply is received - /// - /// requestors UUID - /// Sources Group UUID - /// Sources Name - /// Objects UUID - /// Object owners UUID - /// Position of Object - /// Range of Object - /// Rotation of object - /// Objects Type - /// representing the velocity of object - /// TODO: this should probably be a struct, and there should be an enum added for type - //public delegate void ScriptSensorReplyCallback(UUID requestorID, UUID groupID, string name, - // UUID objectID, UUID ownerID, Vector3 position, float range, Quaternion rotation, - // ScriptSensorTypeFlags type, Vector3 velocity); - + /// The event subscribers. null if no subcribers public EventHandler m_ScriptSensorReply; @@ -1192,13 +1119,7 @@ namespace OpenMetaverse { add { lock (m_AvatarSitResponseLock) { m_AvatarSitResponse += value; } } remove { lock (m_AvatarSitResponseLock) { m_AvatarSitResponse -= value; } } - } - /// - /// Fired when a new member joins a Group chat session - /// - /// the ID of the session - /// the ID of the avatar that joined - //public delegate void ChatSessionMemberAddedCallback(UUID sessionID, UUID agent_key); + } /// The event subscribers. null if no subcribers private EventHandler m_ChatSessionMemberAdded; @@ -1221,13 +1142,7 @@ namespace OpenMetaverse { add { lock (m_ChatSessionMemberAddedLock) { m_ChatSessionMemberAdded += value; } } remove { lock (m_ChatSessionMemberAddedLock) { m_ChatSessionMemberAdded -= value; } } - } - /// - /// Fired when a member of a Group chat leaves the session - /// - /// the ID of the session - /// the ID of the avatar that joined - //public delegate void ChatSessionMemberLeftCallback(UUID sessionID, UUID agent_key); + } /// The event subscribers. null if no subcribers private EventHandler m_ChatSessionMemberLeft;