From 9ef4bffe0c96b5f0e076ffbf3b94c33f839a73bb Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 14 Jun 2007 12:41:42 +0000
Subject: trying to clean up the namespaces.
---
OpenSim/OpenSim.Region/EstateManager.cs | 5 +-
OpenSim/OpenSim.Region/OpenSim.Region.csproj | 83 +--
OpenSim/OpenSim.Region/ParcelManager.cs | 2 +
.../Scene/Entities/Avatar.Animations.cs | 76 ---
.../OpenSim.Region/Scene/Entities/Avatar.Update.cs | 148 -----
OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs | 225 -------
OpenSim/OpenSim.Region/Scene/Entities/Entity.cs | 148 -----
OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs | 541 ----------------
.../OpenSim.Region/Scene/Entities/SceneObject.cs | 128 ----
.../OpenSim.Region/Scene/Scene.PacketHandlers.cs | 253 --------
OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs | 184 ------
OpenSim/OpenSim.Region/Scene/Scene.cs | 718 ---------------------
OpenSim/OpenSim.Region/Scene/SceneBase.cs | 138 ----
.../Scene/scripting/IScriptContext.cs | 40 --
.../Scene/scripting/IScriptEntity.cs | 46 --
.../Scene/scripting/IScriptHandler.cs | 125 ----
OpenSim/OpenSim.Region/Scene/scripting/Script.cs | 53 --
.../Scene/scripting/ScriptFactory.cs | 35 -
.../Scene/scripting/Scripts/FollowRandomAvatar.cs | 64 --
OpenSim/OpenSim/Application.cs | 2 +-
OpenSim/OpenSim/OpenSimMain.cs | 11 +-
21 files changed, 57 insertions(+), 2968 deletions(-)
delete mode 100644 OpenSim/OpenSim.Region/Scene/Entities/Avatar.Animations.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/Entities/Avatar.Update.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/Scene.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/SceneBase.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/scripting/IScriptContext.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/scripting/IScriptEntity.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/scripting/Script.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/scripting/ScriptFactory.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/scripting/Scripts/FollowRandomAvatar.cs
diff --git a/OpenSim/OpenSim.Region/EstateManager.cs b/OpenSim/OpenSim.Region/EstateManager.cs
index 88b2dac..69ce481 100644
--- a/OpenSim/OpenSim.Region/EstateManager.cs
+++ b/OpenSim/OpenSim.Region/EstateManager.cs
@@ -28,14 +28,15 @@
using System;
using System.Collections.Generic;
using System.Text;
-
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
using OpenSim.Region;
+using OpenSim.Region.Scenes;
using OpenSim;
-
using libsecondlife;
using libsecondlife.Packets;
+using Avatar = OpenSim.Region.Scenes.Avatar;
+
namespace OpenSim.Region
{
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 4382454..92a74cf 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -1,4 +1,4 @@
-
+
Local
8.0.50727
@@ -6,7 +6,8 @@
{196916AF-0000-0000-0000-000000000000}
Debug
AnyCPU
-
+
+
OpenSim.Region
@@ -15,9 +16,11 @@
IE50
false
Library
-
+
+
OpenSim.Region
-
+
+
@@ -28,7 +31,8 @@
TRACE;DEBUG
-
+
+
True
4096
False
@@ -37,7 +41,8 @@
False
False
4
-
+
+
False
@@ -46,7 +51,8 @@
TRACE
-
+
+
False
4096
True
@@ -55,26 +61,27 @@
False
False
4
-
+
+
-
+
..\..\bin\Axiom.MathLib.dll
False
-
+
..\..\bin\Db4objects.Db4o.dll
False
-
+
..\..\bin\libsecondlife.dll
False
-
+
System.dll
False
-
+
System.Xml.dll
False
@@ -84,49 +91,49 @@
OpenGrid.Framework.Communications
{683344D5-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ 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.GenericConfig.Xml
{E88EF749-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
OpenSim.Physics.Manager
{8BE16150-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
OpenSim.Terrain.BasicTerrain
{2270B8FE-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
XMLRPC
{8E81D43C-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
@@ -136,52 +143,52 @@
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
@@ -192,4 +199,4 @@
-
+
\ No newline at end of file
diff --git a/OpenSim/OpenSim.Region/ParcelManager.cs b/OpenSim/OpenSim.Region/ParcelManager.cs
index 081f9a2..ce53d24 100644
--- a/OpenSim/OpenSim.Region/ParcelManager.cs
+++ b/OpenSim/OpenSim.Region/ParcelManager.cs
@@ -32,6 +32,8 @@ using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
+using OpenSim.Region.Scenes;
+using Avatar = OpenSim.Region.Scenes.Avatar;
namespace OpenSim.Region
{
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.Animations.cs b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.Animations.cs
deleted file mode 100644
index 5f24cd4..0000000
--- a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.Animations.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using System.Xml;
-
-namespace OpenSim.Region
-{
- partial class Avatar
- {
- public class AvatarAnimations
- {
-
- public Dictionary AnimsLLUUID = new Dictionary();
- public Dictionary AnimsNames = new Dictionary();
-
- public AvatarAnimations()
- {
- }
-
- public void LoadAnims()
- {
- //OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
- XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
-
- XmlDocument doc = new XmlDocument();
- doc.Load(reader);
- foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
- {
-
- if (nod.Attributes["name"] != null)
- {
- AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
- }
-
- }
-
- reader.Close();
-
- // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-
- foreach (KeyValuePair kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)
- {
- AnimsNames.Add(kp.Value, kp.Key);
- }
- }
- }
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.Update.cs b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.Update.cs
deleted file mode 100644
index d373fdb..0000000
--- a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.Update.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-
-namespace OpenSim.Region
-{
- partial class Avatar
- {
- ///
- ///
- ///
- public override void update()
- {
-
-
- }
-
- ///
- ///
- ///
- ///
- public void SendUpdateToOtherClient(Avatar remoteAvatar)
- {
-
- }
-
- ///
- ///
- ///
- ///
- public ObjectUpdatePacket CreateUpdatePacket()
- {
- return null;
- }
-
- ///
- ///
- ///
- public void SendInitialPosition()
- {
- this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
- }
-
- ///
- ///
- ///
- public void SendOurAppearance()
- {
-
- }
-
- ///
- ///
- ///
- ///
- public void SendOurAppearance(IClientAPI OurClient)
- {
- this.ControllingClient.SendWearables(this.Wearables);
- }
-
- ///
- ///
- ///
- ///
- public void SendAppearanceToOtherAgent(Avatar avatarInfo)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
- {
-
- }
-
- ///
- ///
- ///
- public void StopMovement()
- {
-
- }
-
- ///
- /// Very likely to be deleted soon!
- ///
- ///
- public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateTerseBlock()
- {
- return null;
- }
-
- ///
- ///
- ///
- ///
- ///
- public void SendAnimPack(LLUUID animID, int seq)
- {
-
-
- }
-
- ///
- ///
- ///
- public void SendAnimPack()
- {
-
- }
-
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
deleted file mode 100644
index 989c53d..0000000
--- a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using Axiom.MathLib;
-
-namespace OpenSim.Region
-{
- public partial class Avatar : Entity
- {
- public static bool PhysicsEngineFlying = false;
- public static AvatarAnimations Animations;
- public string firstname;
- public string lastname;
- public IClientAPI ControllingClient;
- public LLUUID current_anim;
- public int anim_seq;
- private static libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;
- private bool updateflag = false;
- private byte movementflag = 0;
- private List forcesList = new List();
- private short _updateCount = 0;
- private Axiom.MathLib.Quaternion bodyRot;
- private LLObject.TextureEntry avatarAppearanceTexture = null;
- private byte[] visualParams;
- private AvatarWearable[] Wearables;
- private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
- private ulong m_regionHandle;
- private Dictionary m_clientThreads;
- private bool childAvatar = false;
-
- protected RegionInfo m_regionInfo;
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public Avatar(IClientAPI theClient, Scene world, Dictionary clientThreads, RegionInfo reginfo)
- {
-
- m_world = world;
- m_clientThreads = clientThreads;
- this.uuid = theClient.AgentId;
-
- m_regionInfo = reginfo;
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
- ControllingClient = theClient;
- this.firstname = ControllingClient.FirstName;
- this.lastname = ControllingClient.LastName;
- localid = this.m_world.NextLocalId;
- Pos = ControllingClient.StartPos;
- visualParams = new byte[218];
- for (int i = 0; i < 218; i++)
- {
- visualParams[i] = 100;
- }
-
- Wearables = AvatarWearable.DefaultWearables;
-
- this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-
- //register for events
- ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance);
- //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
- ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement);
- ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition);
- /* ControllingClient.OnAgentUpdate += new GenericCall3(this.HandleAgentUpdate);
- ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
- ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
- ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
- */
- }
-
- ///
- ///
- ///
- public PhysicsActor PhysActor
- {
- set
- {
- this._physActor = value;
- }
- get
- {
- return _physActor;
- }
- }
-
- ///
- ///
- ///
- ///
- public void ChildStatusChange(bool status)
- {
-
- }
-
- ///
- ///
- ///
- public override void addForces()
- {
-
- }
-
- ///
- /// likely to removed very soon
- ///
- ///
- public static void SetupTemplate(string name)
- {
-
- }
-
- ///
- /// likely to removed very soon
- ///
- ///
- protected static void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
- {
-
-
-
- }
-
- ///
- ///
- ///
- public void CompleteMovement()
- {
- this.ControllingClient.MoveAgentIntoRegion(m_regionInfo);
- }
-
- ///
- ///
- ///
- ///
- public void HandleAgentUpdate(Packet pack)
- {
- this.HandleUpdate((AgentUpdatePacket)pack);
- }
-
- ///
- ///
- ///
- ///
- public void HandleUpdate(AgentUpdatePacket pack)
- {
-
- }
-
- ///
- ///
- ///
- public void SendRegionHandshake()
- {
-
- }
-
- ///
- ///
- ///
- public static void LoadAnims()
- {
-
- }
-
- ///
- ///
- ///
- public override void LandRenegerated()
- {
-
- }
-
-
- public class NewForce
- {
- public float X;
- public float Y;
- public float Z;
-
- public NewForce()
- {
-
- }
- }
- }
-
-}
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs b/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
deleted file mode 100644
index 9e288d7..0000000
--- a/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Axiom.MathLib;
-using OpenSim.Physics.Manager;
-using libsecondlife;
-using OpenSim.Region.Scripting;
-
-namespace OpenSim.Region
-{
- public abstract class Entity : IScriptReadonlyEntity
- {
- public libsecondlife.LLUUID uuid;
- public uint localid;
- public LLVector3 velocity;
- public Quaternion rotation;
- protected List children;
- protected LLVector3 m_pos;
- protected PhysicsActor _physActor;
- protected Scene m_world;
- protected string m_name;
-
- ///
- ///
- ///
- public virtual string Name
- {
- get { return m_name; }
- }
-
- ///
- ///
- ///
- public virtual LLVector3 Pos
- {
- get
- {
- if (this._physActor != null)
- {
- m_pos.X = _physActor.Position.X;
- m_pos.Y = _physActor.Position.Y;
- m_pos.Z = _physActor.Position.Z;
- }
-
- return m_pos;
- }
- set
- {
- if (this._physActor != null)
- {
- try
- {
- lock (this.m_world.SyncRoot)
- {
-
- this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
- }
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
-
- m_pos = value;
- }
- }
-
- ///
- /// Creates a new Entity (should not occur on it's own)
- ///
- public Entity()
- {
- uuid = new libsecondlife.LLUUID();
- localid = 0;
- m_pos = new LLVector3();
- velocity = new LLVector3();
- rotation = new Quaternion();
- m_name = "(basic entity)";
- children = new List();
- }
-
- ///
- ///
- ///
- public virtual void addForces()
- {
- foreach (Entity child in children)
- {
- child.addForces();
- }
- }
-
- ///
- /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
- ///
- public virtual void update() {
- // Do any per-frame updates needed that are applicable to every type of entity
- foreach (Entity child in children)
- {
- child.update();
- }
- }
-
- ///
- /// Called at a set interval to inform entities that they should back themsleves up to the DB
- ///
- public virtual void BackUp()
- {
-
- }
-
- ///
- /// Infoms the entity that the land (heightmap) has changed
- ///
- public virtual void LandRenegerated()
- {
-
- }
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
deleted file mode 100644
index f3972af..0000000
--- a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
+++ /dev/null
@@ -1,541 +0,0 @@
-
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-
-namespace OpenSim.Region
-{
- public class Primitive : Entity
- {
- internal PrimData primData;
- private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
- // private Dictionary m_clientThreads;
- private ulong m_regionHandle;
- private const uint FULL_MASK_PERMISSIONS = 2147483647;
- private bool physicsEnabled = false;
- private byte updateFlag = 0;
-
- private Dictionary inventoryItems;
-
- #region Properties
-
- public LLVector3 Scale
- {
- set
- {
- this.primData.Scale = value;
- //this.dirtyFlag = true;
- }
- get
- {
- return this.primData.Scale;
- }
- }
-
- public PhysicsActor PhysActor
- {
- set
- {
- this._physActor = value;
- }
- }
-
- public override LLVector3 Pos
- {
- get
- {
- return base.Pos;
- }
- set
- {
- base.Pos = value;
- }
- }
- #endregion
-
- ///
- ///
- ///
- ///
- ///
- ///
- public Primitive( ulong regionHandle, Scene world)
- {
- // m_clientThreads = clientThreads;
- m_regionHandle = regionHandle;
- m_world = world;
- inventoryItems = new Dictionary();
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public Primitive(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
- {
- // m_clientThreads = clientThreads;
- m_regionHandle = regionHandle;
- m_world = world;
- inventoryItems = new Dictionary();
- this.CreateFromPacket(addPacket, ownerID, localID);
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public Primitive( ulong regionHandle, Scene world, LLUUID owner, LLUUID fullID, uint localID)
- {
- // m_clientThreads = clientThreads;
- m_regionHandle = regionHandle;
- m_world = world;
- inventoryItems = new Dictionary();
- this.primData = new PrimData();
- this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
- this.primData.OwnerID = owner;
- this.primData.FullID = this.uuid = fullID;
- this.primData.LocalID = this.localid = localID;
- }
-
- ///
- /// Constructor to create a default cube
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public Primitive( ulong regionHandle, Scene world, LLUUID owner, uint localID, LLVector3 position)
- {
- //m_clientThreads = clientThreads;
- m_regionHandle = regionHandle;
- m_world = world;
- inventoryItems = new Dictionary();
- this.primData = PrimData.DefaultCube();
- this.primData.OwnerID = owner;
- this.primData.LocalID = this.localid = localID;
- this.Pos = this.primData.Position = position;
-
- this.updateFlag = 1;
- }
-
- ///
- ///
- ///
- ///
- public byte[] GetByteArray()
- {
- byte[] result = null;
- List dataArrays = new List();
- dataArrays.Add(primData.ToBytes());
- foreach (Entity child in children)
- {
- if (child is OpenSim.Region.Primitive)
- {
- dataArrays.Add(((OpenSim.Region.Primitive)child).GetByteArray());
- }
- }
- byte[] primstart = Helpers.StringToField("");
- byte[] primend = Helpers.StringToField("");
- int totalLength = primstart.Length + primend.Length;
- for (int i = 0; i < dataArrays.Count; i++)
- {
- totalLength += dataArrays[i].Length;
- }
-
- result = new byte[totalLength];
- int arraypos = 0;
- Array.Copy(primstart, 0, result, 0, primstart.Length);
- arraypos += primstart.Length;
- for (int i = 0; i < dataArrays.Count; i++)
- {
- Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length);
- arraypos += dataArrays[i].Length;
- }
- Array.Copy(primend, 0, result, arraypos, primend.Length);
-
- return result;
- }
-
- #region Overridden Methods
-
- ///
- ///
- ///
- public override void update()
- {
- if (this.updateFlag == 1) // is a new prim just been created/reloaded
- {
- this.SendFullUpdateToAllClients();
- this.updateFlag = 0;
- }
- if (this.updateFlag == 2) //some change has been made so update the clients
- {
- this.SendTerseUpdateToALLClients();
- this.updateFlag = 0;
- }
- }
-
- ///
- ///
- ///
- public override void BackUp()
- {
-
- }
-
- #endregion
-
- #region Packet handlers
-
- ///
- ///
- ///
- ///
- public void UpdatePosition(LLVector3 pos)
- {
- this.Pos = new LLVector3(pos.X, pos.Y, pos.Z);
- this.updateFlag = 2;
- }
-
- ///
- ///
- ///
- ///
- public void UpdateShape(ObjectShapePacket.ObjectDataBlock updatePacket)
- {
- this.primData.PathBegin = updatePacket.PathBegin;
- this.primData.PathEnd = updatePacket.PathEnd;
- this.primData.PathScaleX = updatePacket.PathScaleX;
- this.primData.PathScaleY = updatePacket.PathScaleY;
- this.primData.PathShearX = updatePacket.PathShearX;
- this.primData.PathShearY = updatePacket.PathShearY;
- this.primData.PathSkew = updatePacket.PathSkew;
- this.primData.ProfileBegin = updatePacket.ProfileBegin;
- this.primData.ProfileEnd = updatePacket.ProfileEnd;
- this.primData.PathCurve = updatePacket.PathCurve;
- this.primData.ProfileCurve = updatePacket.ProfileCurve;
- this.primData.ProfileHollow = updatePacket.ProfileHollow;
- this.primData.PathRadiusOffset = updatePacket.PathRadiusOffset;
- this.primData.PathRevolutions = updatePacket.PathRevolutions;
- this.primData.PathTaperX = updatePacket.PathTaperX;
- this.primData.PathTaperY = updatePacket.PathTaperY;
- this.primData.PathTwist = updatePacket.PathTwist;
- this.primData.PathTwistBegin = updatePacket.PathTwistBegin;
- }
-
- ///
- ///
- ///
- ///
- public void UpdateTexture(byte[] tex)
- {
- this.primData.Texture = tex;
- }
-
- ///
- ///
- ///
- ///
- public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
- {
-
- }
-
- ///
- ///
- ///
- ///
- public void AssignToParent(Primitive prim)
- {
-
- }
-
- #endregion
-
- # region Inventory Methods
- ///
- ///
- ///
- ///
- ///
- public bool AddToInventory(InventoryItem item)
- {
- return false;
- }
-
- ///
- ///
- ///
- ///
- ///
- public InventoryItem RemoveFromInventory(LLUUID itemID)
- {
- return null;
- }
-
- ///
- ///
- ///
- ///
- ///
- public void RequestInventoryInfo(IClientAPI simClient, RequestTaskInventoryPacket packet)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void RequestXferInventory(IClientAPI simClient, ulong xferID)
- {
- //will only currently work if the total size of the inventory data array is under about 1000 bytes
- SendXferPacketPacket send = new SendXferPacketPacket();
-
- send.XferID.ID = xferID;
- send.XferID.Packet = 1 + 2147483648;
- send.DataPacket.Data = this.ConvertInventoryToBytes();
-
- simClient.OutPacket(send);
- }
-
- ///
- ///
- ///
- ///
- public byte[] ConvertInventoryToBytes()
- {
- System.Text.Encoding enc = System.Text.Encoding.ASCII;
- byte[] result = new byte[0];
- List inventoryData = new List();
- int totallength = 0;
- foreach (InventoryItem invItem in inventoryItems.Values)
- {
- byte[] data = enc.GetBytes(invItem.ExportString());
- inventoryData.Add(data);
- totallength += data.Length;
- }
- //TODO: copy arrays into the single result array
-
- return result;
- }
-
- ///
- ///
- ///
- ///
- public void CreateInventoryFromBytes(byte[] data)
- {
-
- }
-
- #endregion
-
- #region Update viewers Methods
-
- ///
- ///
- ///
- ///
- public void SendFullUpdateForAllChildren(IClientAPI remoteClient)
- {
- this.SendFullUpdateToClient(remoteClient);
- for (int i = 0; i < this.children.Count; i++)
- {
- if (this.children[i] is Primitive)
- {
- ((Primitive)this.children[i]).SendFullUpdateForAllChildren(remoteClient);
- }
- }
- }
-
- ///
- ///
- ///
- ///
- public void SendFullUpdateToClient(IClientAPI remoteClient)
- {
- LLVector3 lPos;
- if (this._physActor != null && this.physicsEnabled)
- {
- PhysicsVector pPos = this._physActor.Position;
- lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
- }
- else
- {
- lPos = this.Pos;
- }
-
- remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.localid, this.primData, lPos, new LLUUID("00000000-0000-0000-5005-000000000005"));
- }
-
- ///
- ///
- ///
- public void SendFullUpdateToAllClients()
- {
- List avatars = this.m_world.RequestAvatarList();
- for (int i = 0; i < avatars.Count; i++)
- {
- this.SendFullUpdateToClient(avatars[i].ControllingClient);
- }
- }
-
- ///
- ///
- ///
- ///
- public void SendTerseUpdateToClient(IClientAPI RemoteClient)
- {
- LLVector3 lPos;
- Axiom.MathLib.Quaternion lRot;
- if (this._physActor != null && this.physicsEnabled)
- {
- PhysicsVector pPos = this._physActor.Position;
- lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
- lRot = this._physActor.Orientation;
- }
- else
- {
- lPos = this.Pos;
- lRot = this.rotation;
- }
- }
-
- ///
- ///
- ///
- public void SendTerseUpdateToALLClients()
- {
- List avatars = this.m_world.RequestAvatarList();
- for (int i = 0; i < avatars.Count; i++)
- {
- this.SendTerseUpdateToClient(avatars[i].ControllingClient);
- }
- }
-
- #endregion
-
- #region Create Methods
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
- {
- PrimData PData = new PrimData();
- this.primData = PData;
- this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-
- PData.OwnerID = ownerID;
- PData.PCode = addPacket.ObjectData.PCode;
- PData.PathBegin = addPacket.ObjectData.PathBegin;
- PData.PathEnd = addPacket.ObjectData.PathEnd;
- PData.PathScaleX = addPacket.ObjectData.PathScaleX;
- PData.PathScaleY = addPacket.ObjectData.PathScaleY;
- PData.PathShearX = addPacket.ObjectData.PathShearX;
- PData.PathShearY = addPacket.ObjectData.PathShearY;
- PData.PathSkew = addPacket.ObjectData.PathSkew;
- PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
- PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
- PData.Scale = addPacket.ObjectData.Scale;
- PData.PathCurve = addPacket.ObjectData.PathCurve;
- PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
- PData.ParentID = 0;
- PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
- PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
- PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
- PData.PathTaperX = addPacket.ObjectData.PathTaperX;
- PData.PathTaperY = addPacket.ObjectData.PathTaperY;
- PData.PathTwist = addPacket.ObjectData.PathTwist;
- PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
- LLVector3 pos1 = addPacket.ObjectData.RayEnd;
- this.primData.FullID = this.uuid = LLUUID.Random();
- this.primData.LocalID = this.localid = (uint)(localID);
- this.primData.Position = this.Pos = pos1;
-
- this.updateFlag = 1;
- }
-
- ///
- ///
- ///
- ///
- public void CreateFromBytes(byte[] data)
- {
-
- }
-
- ///
- ///
- ///
- ///
- public void CreateFromPrimData(PrimData primData)
- {
- this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
- {
-
- }
-
- #endregion
-
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs b/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
deleted file mode 100644
index e15e871..0000000
--- a/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-
-namespace OpenSim.Region
-{
- public class SceneObject : Entity
- {
- private LLUUID rootUUID;
- //private Dictionary ChildPrimitives = new Dictionary();
- protected Primitive rootPrimitive;
- private Scene m_world;
- protected ulong regionHandle;
-
- ///
- ///
- ///
- public SceneObject()
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
- {
- this.rootPrimitive = new Primitive( this.regionHandle, this.m_world, addPacket, agentID, localID);
- }
-
- ///
- ///
- ///
- ///
- public void CreateFromBytes(byte[] data)
- {
-
- }
-
- ///
- ///
- ///
- public override void update()
- {
-
- }
-
- ///
- ///
- ///
- public override void BackUp()
- {
-
- }
-
- ///
- ///
- ///
- ///
- public void GetProperites(IClientAPI client)
- {
- //needs changing
- ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
- proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
- proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
- proper.ObjectData[0].ItemID = LLUUID.Zero;
- proper.ObjectData[0].CreationDate = (ulong)this.rootPrimitive.primData.CreationDate;
- proper.ObjectData[0].CreatorID = this.rootPrimitive.primData.OwnerID;
- proper.ObjectData[0].FolderID = LLUUID.Zero;
- proper.ObjectData[0].FromTaskID = LLUUID.Zero;
- proper.ObjectData[0].GroupID = LLUUID.Zero;
- proper.ObjectData[0].InventorySerial = 0;
- proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
- proper.ObjectData[0].ObjectID = this.uuid;
- proper.ObjectData[0].OwnerID = this.rootPrimitive.primData.OwnerID;
- proper.ObjectData[0].TouchName = new byte[0];
- proper.ObjectData[0].TextureID = new byte[0];
- proper.ObjectData[0].SitName = new byte[0];
- proper.ObjectData[0].Name = new byte[0];
- proper.ObjectData[0].Description = new byte[0];
- proper.ObjectData[0].OwnerMask = this.rootPrimitive.primData.OwnerMask;
- proper.ObjectData[0].NextOwnerMask = this.rootPrimitive.primData.NextOwnerMask;
- proper.ObjectData[0].GroupMask = this.rootPrimitive.primData.GroupMask;
- proper.ObjectData[0].EveryoneMask = this.rootPrimitive.primData.EveryoneMask;
- proper.ObjectData[0].BaseMask = this.rootPrimitive.primData.BaseMask;
-
- client.OutPacket(proper);
-
- }
-
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs b/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
deleted file mode 100644
index 1c6fbcd..0000000
--- a/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-
-namespace OpenSim.Region
-{
- public partial class Scene
- {
- ///
- ///
- ///
- ///
- ///
- ///
- public void ModifyTerrain(byte action, float north, float west)
- {
- switch (action)
- {
- case 1:
- // raise terrain
- Terrain.raise(north, west, 10.0, 0.001);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
- case 2:
- //lower terrain
- Terrain.lower(north, west, 10.0, 0.001);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
- }
- return;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
- {
- Console.WriteLine("Chat message");
- Avatar avatar = null;
- foreach (IClientAPI client in m_clientThreads.Values)
- {
- int dis = -1000;
- if (this.Avatars.ContainsKey(client.AgentId))
- {
-
- avatar = this.Avatars[client.AgentId];
- // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
- dis= (int)avatar.Pos.GetDistanceTo(fromPos);
- Console.WriteLine("found avatar at " +dis);
-
- }
-
- switch (type)
- {
- case 0: // Whisper
- if ((dis < 10) && (dis > -10))
- {
- //should change so the message is sent through the avatar rather than direct to the ClientView
- client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
- }
- break;
- case 1: // Say
- if ((dis < 30) && (dis > -30))
- {
- Console.WriteLine("sending chat");
- client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
- }
- break;
- case 2: // Shout
- if ((dis < 100) && (dis > -100))
- {
- client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
- }
- break;
-
- case 0xff: // Broadcast
- client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
- break;
- }
-
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- public void RezObject(AssetBase primAsset, LLVector3 pos)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void DeRezObject(Packet packet, IClientAPI simClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- public void SendAvatarsToClient(IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void LinkObjects(uint parentPrim, List childPrims)
- {
-
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimPosition(uint localID, LLVector3 pos, IClientAPI remoteClient)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == localID)
- {
- ((OpenSim.Region.Primitive)ent).UpdatePosition(pos);
- break;
- }
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimScale(uint localID, LLVector3 scale, IClientAPI remoteClient)
- {
- }
-
- ///
- /// Sends prims to a client
- ///
- /// Client to send to
- public void GetInitialPrims(IClientAPI RemoteClient)
- {
-
- }
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs b/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
deleted file mode 100644
index df5ca9b..0000000
--- a/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Reflection;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using libsecondlife;
-
-namespace OpenSim.Region
-{
- public partial class Scene
- {
- private Dictionary scriptEngines = new Dictionary();
-
- ///
- ///
- ///
- private void LoadScriptEngines()
- {
- this.LoadScriptPlugins();
- }
-
- ///
- ///
- ///
- public void LoadScriptPlugins()
- {
- string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines");
- string[] pluginFiles = Directory.GetFiles(path, "*.dll");
-
-
- for (int i = 0; i < pluginFiles.Length; i++)
- {
- this.AddPlugin(pluginFiles[i]);
- }
- }
-
- ///
- ///
- ///
- ///
- private void AddPlugin(string FileName)
- {
- Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-
- foreach (Type pluginType in pluginAssembly.GetTypes())
- {
- if (pluginType.IsPublic)
- {
- if (!pluginType.IsAbstract)
- {
- Type typeInterface = pluginType.GetInterface("IScriptEngine", true);
-
- if (typeInterface != null)
- {
- IScriptEngine plug = (IScriptEngine)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
- plug.Init(this);
- this.scriptEngines.Add(plug.GetName(), plug);
-
- }
-
- typeInterface = null;
- }
- }
- }
-
- pluginAssembly = null;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void LoadScript(string scriptType, string scriptName, string script, Entity ent)
- {
- if(this.scriptEngines.ContainsKey(scriptType))
- {
- this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.localid);
- }
- }
-
- #region IScriptAPI Methods
-
- ///
- ///
- ///
- ///
- ///
- public LLVector3 GetEntityPosition(uint localID)
- {
- LLVector3 res = new LLVector3();
- // Console.WriteLine("script- getting entity " + localID + " position");
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity.localid == localID)
- {
- res.X = entity.Pos.X;
- res.Y = entity.Pos.Y;
- res.Z = entity.Pos.Z;
- }
- }
- return res;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void SetEntityPosition(uint localID, float x , float y, float z)
- {
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity.localid == localID && entity is Primitive)
- {
- LLVector3 pos = entity.Pos;
- pos.X = x;
- pos.Y = y;
- Primitive prim = entity as Primitive;
- // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
- //prim.UpdatePosition(pos);
- // Console.WriteLine("script- setting entity " + localID + " positon");
- }
- }
-
- }
-
- ///
- ///
- ///
- ///
- public uint GetRandomAvatarID()
- {
- //Console.WriteLine("script- getting random avatar id");
- uint res = 0;
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity is Avatar)
- {
- res = entity.localid;
- }
- }
- return res;
- }
-
- #endregion
-
-
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/Scene.cs b/OpenSim/OpenSim.Region/Scene/Scene.cs
deleted file mode 100644
index 040414a..0000000
--- a/OpenSim/OpenSim.Region/Scene/Scene.cs
+++ /dev/null
@@ -1,718 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using libsecondlife;
-using libsecondlife.Packets;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework;
-using OpenSim.Region.Scripting;
-using OpenSim.Terrain;
-using OpenGrid.Framework.Communications;
-
-
-namespace OpenSim.Region
-{
- public delegate bool FilterAvatarList(Avatar avatar);
-
- public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
- {
- protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
- protected Dictionary Avatars;
- protected Dictionary Prims;
- private PhysicsScene phyScene;
- private float timeStep = 0.1f;
- public ILocalStorage localStorage;
- private Random Rand = new Random();
- private uint _primCount = 702000;
- private int storageCount;
- private Dictionary m_scriptHandlers;
- private Dictionary m_scripts;
- private Mutex updateLock;
- public string m_datastore;
- protected AuthenticateSessionsBase authenticateHandler;
- protected RegionCommsHostBase regionCommsHost;
- protected RegionServerCommsManager commsManager;
-
- public ParcelManager parcelManager;
- public EstateManager estateManager;
-
- #region Properties
- ///
- ///
- ///
- public PhysicsScene PhysScene
- {
- set
- {
- this.phyScene = value;
- }
- get
- {
- return (this.phyScene);
- }
- }
-
- #endregion
-
- #region Constructors
- ///
- /// Creates a new World class, and a region to go with it.
- ///
- /// Dictionary to contain client threads
- /// Region Handle for this region
- /// Region Name for this region
- public Scene(Dictionary clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)
- {
- try
- {
- updateLock = new Mutex(false);
- this.authenticateHandler = authen;
- this.commsManager = commsMan;
- m_clientThreads = clientThreads;
- m_regInfo = regInfo;
- m_regionHandle = m_regInfo.RegionHandle;
- m_regionName = m_regInfo.RegionName;
- this.m_datastore = m_regInfo.DataStore;
- this.RegisterRegionWithComms();
-
- parcelManager = new ParcelManager(this, this.m_regInfo);
- estateManager = new EstateManager(this, this.m_regInfo);
-
- m_scriptHandlers = new Dictionary();
- m_scripts = new Dictionary();
-
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance");
- Entities = new Dictionary();
- Avatars = new Dictionary();
- Prims = new Dictionary();
-
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap");
- TerrainManager = new TerrainManager(new SecondLife());
- Terrain = new TerrainEngine();
- Avatar.SetupTemplate("avatar-texture.dat");
-
- Avatar.LoadAnims();
-
- //this.SetDefaultScripts();
- //this.LoadScriptEngines();
-
-
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString());
- }
- }
- #endregion
-
- ///
- ///
- ///
- public void StartTimer()
- {
- m_heartbeatTimer.Enabled = true;
- m_heartbeatTimer.Interval = 100;
- m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
- }
-
-
- #region Update Methods
-
-
- ///
- /// Performs per-frame updates regularly
- ///
- ///
- ///
- void Heartbeat(object sender, System.EventArgs e)
- {
- this.Update();
- }
-
- ///
- /// Performs per-frame updates on the world, this should be the central world loop
- ///
- public override void Update()
- {
- updateLock.WaitOne();
- try
- {
- if (this.phyScene.IsThreaded)
- {
- this.phyScene.GetResults();
-
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].addForces();
- }
-
- lock (this.m_syncRoot)
- {
- this.phyScene.Simulate(timeStep);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].update();
- }
-
- foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
- {
- scriptHandler.OnFrame();
- }
- foreach (IScriptEngine scripteng in this.scriptEngines.Values)
- {
- scripteng.OnFrame();
- }
- //backup world data
- this.storageCount++;
- if (storageCount > 1200) //set to how often you want to backup
- {
- this.Backup();
- storageCount = 0;
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString());
- }
- updateLock.ReleaseMutex();
-
- }
-
- ///
- ///
- ///
- ///
- public bool Backup()
- {
- /*
- try
- {
- // Terrain backup routines
- if (Terrain.tainted > 0)
- {
- Terrain.tainted = 0;
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");
- localStorage.SaveMap(Terrain.getHeights1D());
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");
- lock (this.m_syncRoot)
- {
- phyScene.SetTerrain(Terrain.getHeights1D());
- }
- }
-
- // Primitive backup routines
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives");
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].BackUp();
- }
-
- //Parcel backup routines
- ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
- int i = 0;
- foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
- {
- parcels[i] = parcel.parcelData;
- i++;
- }
- localStorage.SaveParcels(parcels);
-
- // Backup successful
- return true;
- }
- catch (Exception e)
- {
- // Backup failed
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
- return false;
- }
- */
- return true;
- }
- #endregion
-
- #region Setup Methods
- ///
- /// Loads a new storage subsystem from a named library
- ///
- /// Storage Library
- /// Successful or not
- public bool LoadStorageDLL(string dllName)
- {
- try
- {
- Assembly pluginAssembly = Assembly.LoadFrom(dllName);
- ILocalStorage store = null;
-
- foreach (Type pluginType in pluginAssembly.GetTypes())
- {
- if (pluginType.IsPublic)
- {
- if (!pluginType.IsAbstract)
- {
- Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
-
- if (typeInterface != null)
- {
- ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
- store = plug;
-
- store.Initialise(this.m_datastore);
- break;
- }
-
- typeInterface = null;
- }
- }
- }
- pluginAssembly = null;
- this.localStorage = store;
- return (store == null);
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
- return false;
- }
- }
-
- #endregion
-
- #region Regenerate Terrain
-
- ///
- /// Rebuilds the terrain using a procedural algorithm
- ///
- public void RegenerateTerrain()
- {
- try
- {
- Terrain.hills();
-
- lock (this.m_syncRoot)
- {
- this.phyScene.SetTerrain(Terrain.getHeights1D());
- }
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
-
- foreach (IClientAPI client in m_clientThreads.Values)
- {
- this.SendLayerData(client);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].LandRenegerated();
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Rebuilds the terrain using a 2D float array
- ///
- /// 256,256 float array containing heights
- public void RegenerateTerrain(float[,] newMap)
- {
- try
- {
- this.Terrain.setHeights2D(newMap);
- lock (this.m_syncRoot)
- {
- this.phyScene.SetTerrain(this.Terrain.getHeights1D());
- }
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
-
- foreach (IClientAPI client in m_clientThreads.Values)
- {
- this.SendLayerData(client);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].LandRenegerated();
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Rebuilds the terrain assuming changes occured at a specified point[?]
- ///
- /// ???
- /// ???
- /// ???
- public void RegenerateTerrain(bool changes, int pointx, int pointy)
- {
- try
- {
- if (changes)
- {
- /* Dont save here, rely on tainting system instead */
-
- foreach (IClientAPI client in m_clientThreads.Values)
- {
- this.SendLayerData(pointx, pointy, client);
- }
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
- }
- }
-
- #endregion
-
- #region Load Terrain
- ///
- /// Loads the World heightmap
- ///
- public override void LoadWorldMap()
- {
- try
- {
- float[] map = this.localStorage.LoadWorld();
- if (map == null)
- {
- Console.WriteLine("creating new terrain");
- this.Terrain.hills();
-
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
- }
- else
- {
- this.Terrain.setHeights1D(map);
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
- }
- }
- #endregion
-
- #region Primitives Methods
-
-
- ///
- /// Loads the World's objects
- ///
- public void LoadPrimsFromStorage()
- {
- try
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives");
- this.localStorage.LoadPrimitives(this);
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Loads a specific object from storage
- ///
- /// The object to load
- public void PrimFromStorage(PrimData prim)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void AddNewPrim(Packet addPacket, IClientAPI agentClient)
- {
- AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentId);
- }
-
- ///
- ///
- ///
- ///
- ///
- public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
- {
- try
- {
- // MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
- Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
-
- this.Entities.Add(prim.uuid, prim);
- this._primCount++;
- }
- catch (Exception e)
- {
- // MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
- }
- }
-
- #endregion
-
- #region Add/Remove Avatar Methods
-
- ///
- ///
- ///
- ///
- ///
- public override void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)
- {
- remoteClient.OnRegionHandShakeReply += new GenericCall(this.SendLayerData);
- //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
- remoteClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);
- remoteClient.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours);
- remoteClient.OnAddPrim += new GenericCall4(this.AddNewPrim);
- remoteClient.OnUpdatePrimPosition += new UpdatePrimVector(this.UpdatePrimPosition);
-
- /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
- remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
- remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
- remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
- remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
- */
-
- Avatar newAvatar = null;
- try
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
- newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
-
- //newAvatar.SendRegionHandshake();
- this.estateManager.sendRegionHandshake(remoteClient);
-
- PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
- lock (this.m_syncRoot)
- {
- newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
- }
-
- lock (Entities)
- {
- if (!Entities.ContainsKey(agentID))
- {
- this.Entities.Add(agentID, newAvatar);
- }
- else
- {
- Entities[agentID] = newAvatar;
- }
- }
- lock (Avatars)
- {
- if (Avatars.ContainsKey(agentID))
- {
- Avatars[agentID] = newAvatar;
- }
- else
- {
- this.Avatars.Add(agentID, newAvatar);
- }
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
- }
- return;
- }
-
- ///
- ///
- ///
- protected void InformClientOfNeighbours(IClientAPI remoteClient)
- {
- // Console.WriteLine("informing client of neighbouring regions");
- List neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo);
-
- //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
- if (neighbours != null)
- {
- for (int i = 0; i < neighbours.Count; i++)
- {
- // Console.WriteLine("sending neighbours data");
- AgentCircuitData agent = remoteClient.RequestClientInfo();
- agent.BaseFolder = LLUUID.Zero;
- agent.InventoryFolder = LLUUID.Zero;
- agent.startpos = new LLVector3(128, 128, 70);
- this.commsManager.InterSims.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
- remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
- }
- }
- }
-
- ///
- ///
- ///
- ///
- public override void RemoveAvatar(LLUUID agentID)
- {
- return;
- }
- #endregion
-
- #region Request Avatars List Methods
- //The idea is to have a group of method that return a list of avatars meeting some requirement
- // ie it could be all Avatars within a certain range of the calling prim/avatar.
-
- ///
- /// Request a List of all Avatars in this World
- ///
- ///
- public List RequestAvatarList()
- {
- List result = new List();
-
- foreach (Avatar avatar in Avatars.Values)
- {
- result.Add(avatar);
- }
-
- return result;
- }
-
- ///
- /// Request a filtered list of Avatars in this World
- ///
- ///
- public List RequestAvatarList(FilterAvatarList filter)
- {
- List result = new List();
-
- foreach (Avatar avatar in Avatars.Values)
- {
- if (filter(avatar))
- {
- result.Add(avatar);
- }
- }
-
- return result;
- }
-
- ///
- /// Request a Avatar by UUID
- ///
- ///
- ///
- public Avatar RequestAvatar(LLUUID avatarID)
- {
- if (this.Avatars.ContainsKey(avatarID))
- {
- return Avatars[avatarID];
- }
- return null;
- }
- #endregion
-
- #region ShutDown
- ///
- /// Tidy before shutdown
- ///
- public override void Close()
- {
- try
- {
- this.localStorage.ShutDown();
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
- }
- }
- #endregion
-
- #region RegionCommsHost
-
- ///
- ///
- ///
- public void RegisterRegionWithComms()
- {
- this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo);
- if (this.regionCommsHost != null)
- {
- this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
- {
- // Console.WriteLine("World.cs - add new user connection");
- //should just check that its meant for this region
- if (regionHandle == this.m_regInfo.RegionHandle)
- {
- this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
- }
- }
-
- #endregion
-
- ///
- ///
- ///
- ///
- ///
- ///
- public override void SendLayerData(int px, int py, IClientAPI RemoteClient)
- {
- RemoteClient.SendLayerData( Terrain.getHeights1D() );
- }
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/SceneBase.cs b/OpenSim/OpenSim.Region/Scene/SceneBase.cs
deleted file mode 100644
index 114b6a3..0000000
--- a/OpenSim/OpenSim.Region/Scene/SceneBase.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using libsecondlife;
-using libsecondlife.Packets;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
-using System.Threading;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Region.Scripting;
-using OpenSim.Terrain;
-
-namespace OpenSim.Region
-{
- public abstract class SceneBase : IWorld
- {
- public Dictionary Entities;
- protected Dictionary m_clientThreads;
- protected ulong m_regionHandle;
- protected string m_regionName;
- protected RegionInfo m_regInfo;
-
- public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
- protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine
- protected object m_syncRoot = new object();
- private uint m_nextLocalId = 8880000;
-
- #region Update Methods
- ///
- /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
- ///
- public abstract void Update();
-
- #endregion
-
- #region Terrain Methods
-
- ///
- /// Loads the World heightmap
- ///
- public abstract void LoadWorldMap();
-
- ///
- /// Send the region heightmap to the client
- ///
- /// Client to send to
- public virtual void SendLayerData(IClientAPI RemoteClient)
- {
- RemoteClient.SendLayerData(Terrain.getHeights1D());
- }
-
- ///
- /// Sends a specified patch to a client
- ///
- /// Patch coordinate (x) 0..16
- /// Patch coordinate (y) 0..16
- /// The client to send to
- public abstract void SendLayerData(int px, int py, IClientAPI RemoteClient);
-
- #endregion
-
- #region Add/Remove Agent/Avatar
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
-
- ///
- ///
- ///
- ///
- public abstract void RemoveAvatar(LLUUID agentID);
-
- #endregion
-
- ///
- ///
- ///
- ///
- public virtual RegionInfo RegionInfo
- {
- get { return null; }
- }
-
- public object SyncRoot
- {
- get { return m_syncRoot; }
- }
-
- public uint NextLocalId
- {
- get { return m_nextLocalId++; }
- }
-
- #region Shutdown
- ///
- /// Tidy before shutdown
- ///
- public abstract void Close();
-
- #endregion
-
-
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/scripting/IScriptContext.cs b/OpenSim/OpenSim.Region/Scene/scripting/IScriptContext.cs
deleted file mode 100644
index daa1b92..0000000
--- a/OpenSim/OpenSim.Region/Scene/scripting/IScriptContext.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Scripting
-{
- public interface IScriptContext
- {
- IScriptEntity Entity { get; }
- bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/scripting/IScriptEntity.cs b/OpenSim/OpenSim.Region/Scene/scripting/IScriptEntity.cs
deleted file mode 100644
index 44b886f..0000000
--- a/OpenSim/OpenSim.Region/Scene/scripting/IScriptEntity.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Scripting
-{
- public interface IScriptReadonlyEntity
- {
- LLVector3 Pos { get; }
- string Name { get; }
- }
-
- public interface IScriptEntity
- {
- LLVector3 Pos { get; set; }
- string Name { get; }
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs b/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
deleted file mode 100644
index e45473b..0000000
--- a/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Physics.Manager;
-using OpenSim.Region;
-using Avatar=OpenSim.Region.Avatar;
-using Primitive = OpenSim.Region.Primitive;
-
-namespace OpenSim.Region.Scripting
-{
- public delegate void ScriptEventHandler(IScriptContext context);
-
- public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
- {
- private Scene m_world;
- private Script m_script;
- private Entity m_entity;
-
- public LLUUID ScriptId
- {
- get
- {
- return m_script.ScriptId;
- }
- }
-
- public void OnFrame()
- {
- m_script.OnFrame(this);
- }
-
- public ScriptHandler(Script script, Entity entity, Scene world)
- {
- m_script = script;
- m_entity = entity;
- m_world = world;
- }
-
- #region IScriptContext Members
-
- IScriptEntity IScriptContext.Entity
- {
- get
- {
- return this;
- }
- }
-
- bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
- {
- foreach (Entity entity in m_world.Entities.Values )
- {
- if( entity is Avatar )
- {
- avatar = entity;
- return true;
- }
- }
-
- avatar = null;
- return false;
- }
-
- #endregion
-
- #region IScriptEntity and IScriptReadonlyEntity Members
-
- public string Name
- {
- get
- {
- return m_entity.Name;
- }
- }
-
- public LLVector3 Pos
- {
- get
- {
- return m_entity.Pos;
- }
-
- set
- {
- if (m_entity is Primitive)
- {
- Primitive prim = m_entity as Primitive;
- // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
- // prim.UpdatePosition( value );
- }
- }
- }
-
- #endregion
- }
-
-}
diff --git a/OpenSim/OpenSim.Region/Scene/scripting/Script.cs b/OpenSim/OpenSim.Region/Scene/scripting/Script.cs
deleted file mode 100644
index 1d01f3c..0000000
--- a/OpenSim/OpenSim.Region/Scene/scripting/Script.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Scripting
-{
- public class Script
- {
- private LLUUID m_scriptId;
- public virtual LLUUID ScriptId
- {
- get
- {
- return m_scriptId;
- }
- }
-
- public Script( LLUUID scriptId )
- {
- m_scriptId = scriptId;
- }
-
- public ScriptEventHandler OnFrame;
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/scripting/ScriptFactory.cs b/OpenSim/OpenSim.Region/Scene/scripting/ScriptFactory.cs
deleted file mode 100644
index 32ef046..0000000
--- a/OpenSim/OpenSim.Region/Scene/scripting/ScriptFactory.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Region.Scripting
-{
- public delegate Script ScriptFactory();
-}
diff --git a/OpenSim/OpenSim.Region/Scene/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.Region/Scene/scripting/Scripts/FollowRandomAvatar.cs
deleted file mode 100644
index 21f07a8..0000000
--- a/OpenSim/OpenSim.Region/Scene/scripting/Scripts/FollowRandomAvatar.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Scripting
-{
- public class FollowRandomAvatar : Script
- {
- public FollowRandomAvatar()
- : base(LLUUID.Random())
- {
- OnFrame += MyOnFrame;
- }
-
- private void MyOnFrame(IScriptContext context)
- {
- LLVector3 pos = context.Entity.Pos;
-
- IScriptReadonlyEntity avatar;
-
- if (context.TryGetRandomAvatar(out avatar))
- {
- LLVector3 avatarPos = avatar.Pos;
-
- float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
- float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
-
- LLVector3 newPos = new LLVector3(x, y, pos.Z);
-
- context.Entity.Pos = newPos;
- }
- }
- }
-
-
-}
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs
index 6cee9fd..1886984 100644
--- a/OpenSim/OpenSim/Application.cs
+++ b/OpenSim/OpenSim/Application.cs
@@ -109,7 +109,7 @@ namespace OpenSim
sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts;
sim.gridLocalAsset = gridLocalAsset;
- OpenSim.Region.Avatar.PhysicsEngineFlying = allowFlying;
+ OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = allowFlying;
sim.StartUp();
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index b419101..ea71330 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -39,6 +39,7 @@ using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Region;
+using OpenSim.Region.Scenes;
using OpenSim.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
@@ -349,23 +350,23 @@ namespace OpenSim
case "":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.Region.Avatar.PhysicsEngineFlying = false;
+ OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = false;
break;
case "basicphysics":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.Region.Avatar.PhysicsEngineFlying = false;
+ OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = false;
break;
case "RealPhysX":
this.m_physicsEngine = "RealPhysX";
- OpenSim.Region.Avatar.PhysicsEngineFlying = true;
+ OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = true;
break;
case "OpenDynamicsEngine":
this.m_physicsEngine = "OpenDynamicsEngine";
- OpenSim.Region.Avatar.PhysicsEngineFlying = true;
+ OpenSim.Region.Scenes.Avatar.PhysicsEngineFlying = true;
break;
}
@@ -451,7 +452,7 @@ namespace OpenSim
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "That is " + (DateTime.Now - startuptime).ToString());
break;
case "users":
- OpenSim.Region.Avatar TempAv;
+ OpenSim.Region.Scenes.Avatar TempAv;
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
/* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
{
--
cgit v1.1