From 56802afff4ce1585dba96ba49be02bc34a5c29e0 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 26 Jun 2008 20:04:06 +0000 Subject: Update svn properties. Minor formatting cleanup. --- OpenSim/Framework/IClientAPI.cs | 7 +- OpenSim/Framework/UndoStack.cs | 6 +- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 3 +- bin/OpenSim.Example.xml | 94 +++++++++++----------- 4 files changed, 51 insertions(+), 59 deletions(-) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 8eb82b2..5b0726b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -37,11 +37,9 @@ namespace OpenSim.Framework public interface IEventArgs { IScene Scene { get; set; } - IClientAPI Sender { get; set; } } - public delegate void ViewerEffectEventHandler(IClientAPI sender, List args); public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e); @@ -281,6 +279,7 @@ namespace OpenSim.Framework public LLVector3 UserLocation; public LLVector3 UserLookAt; } + public class RegionHandshakeArgs : EventArgs { public bool isEstateManager; @@ -358,6 +357,7 @@ namespace OpenSim.Framework public int SourceType; public LLUUID TransferID; } + public class AgentUpdateArgs : EventArgs { public LLUUID AgentID; @@ -644,7 +644,6 @@ namespace OpenSim.Framework public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey); public delegate void ScriptReset(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID); - public interface IClientAPI { LLVector3 StartPos { get; set; } @@ -681,8 +680,6 @@ namespace OpenSim.Framework set; } - - [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")] uint CircuitCode { get; } [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")] diff --git a/OpenSim/Framework/UndoStack.cs b/OpenSim/Framework/UndoStack.cs index a49a0cc..1fbe083 100644 --- a/OpenSim/Framework/UndoStack.cs +++ b/OpenSim/Framework/UndoStack.cs @@ -50,7 +50,6 @@ namespace OpenSim.Framework get { return m_new == m_old; } } - public int Capacity { get { return m_Undos.Length - 1; } @@ -67,7 +66,6 @@ namespace OpenSim.Framework } } - public void Push(T item) { if (IsFull) @@ -95,13 +93,11 @@ namespace OpenSim.Framework throw new InvalidOperationException("Cannot pop from emtpy stack"); } - public T Peek() { return m_Undos[m_new]; } - public void Clear() { if (Count > 0) @@ -115,4 +111,4 @@ namespace OpenSim.Framework } } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index b6c59e3..7ba096b 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -164,7 +164,6 @@ namespace OpenSim.Region.Environment.Scenes //neighbouring regions we have enabled a child agent in private readonly List m_knownChildRegions = new List(); - /// /// Implemented Control Flags /// @@ -214,12 +213,12 @@ namespace OpenSim.Region.Environment.Scenes return false; } - public bool Updated { set { m_updateflag = value; } get { return m_updateflag; } } + public bool Invulnerable { set { m_invulnerable = value; } diff --git a/bin/OpenSim.Example.xml b/bin/OpenSim.Example.xml index 97abde9..12133e6 100644 --- a/bin/OpenSim.Example.xml +++ b/bin/OpenSim.Example.xml @@ -1,48 +1,48 @@ - -
- - - - - - - - - - - - - -
-
- - - - - - - - - -
-
- - - - - - - - - - - - -
-
- -
-
- -
+ +
+ + + + + + + + + + + + + +
+
+ + + + + + + + + +
+
+ + + + + + + + + + + + +
+
+ +
+
+ +
\ No newline at end of file -- cgit v1.1