From 0232f01a58a3c0a88e95c22589efec21f502f081 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 19:43:46 +0000
Subject: *Moved all the classes into their own file from LLSDHelpers.cs *Some
folder renaming to follow project Name *Updated prebuild.xml
---
OpenSim/Region/Application/OpenSim.csproj | 2 +-
OpenSim/Region/Capabilities/Caps.cs | 279 +++++++
OpenSim/Region/Capabilities/LLSDArray.cs | 45 ++
OpenSim/Region/Capabilities/LLSDCapEvent.cs | 45 ++
OpenSim/Region/Capabilities/LLSDCapsDetails.cs | 19 +
OpenSim/Region/Capabilities/LLSDEmpty.cs | 42 +
OpenSim/Region/Capabilities/LLSDHelpers.cs | 163 ++++
OpenSim/Region/Capabilities/LLSDMapLayer.cs | 50 ++
.../Region/Capabilities/LLSDMapLayerResponse.cs | 45 ++
OpenSim/Region/Capabilities/LLSDMapRequest.cs | 17 +
OpenSim/Region/Capabilities/LLSDTest.cs | 45 ++
OpenSim/Region/Capabilities/LLSDType.cs | 53 ++
OpenSim/Region/Capabilities/LLSDUploadReply.cs | 47 ++
.../OpenSim.Region.Capabilities.csproj | 151 ++++
OpenSim/Region/Caps/Caps.cs | 258 ------
OpenSim/Region/Caps/LLSDHelpers.cs | 246 ------
.../ClientStack/OpenSim.Region.ClientStack.csproj | 4 -
OpenSim/Region/Environment/EstateManager.cs | 301 +++++++
.../Environment/OpenSim.Region.Environment.csproj | 214 +++++
OpenSim/Region/Environment/ParcelManager.cs | 892 +++++++++++++++++++++
OpenSim/Region/Environment/RegionManager.cs | 31 +
OpenSim/Region/Environment/Scenes/Entity.cs | 194 +++++
.../Environment/Scenes/IScenePresenceBody.cs | 19 +
OpenSim/Region/Environment/Scenes/Primitive.cs | 582 ++++++++++++++
.../Environment/Scenes/Scene.PacketHandlers.cs | 305 +++++++
.../Region/Environment/Scenes/Scene.Scripting.cs | 184 +++++
OpenSim/Region/Environment/Scenes/Scene.cs | 795 ++++++++++++++++++
OpenSim/Region/Environment/Scenes/SceneBase.cs | 201 +++++
OpenSim/Region/Environment/Scenes/SceneEvents.cs | 52 ++
OpenSim/Region/Environment/Scenes/SceneObject.cs | 128 +++
.../Environment/Scenes/ScenePresence.Animations.cs | 76 ++
.../Environment/Scenes/ScenePresence.Body.cs | 90 +++
OpenSim/Region/Environment/Scenes/ScenePresence.cs | 525 ++++++++++++
.../Environment/Scenes/scripting/IScriptContext.cs | 40 +
.../Environment/Scenes/scripting/IScriptEntity.cs | 46 ++
.../Environment/Scenes/scripting/IScriptHandler.cs | 126 +++
.../Region/Environment/Scenes/scripting/Script.cs | 53 ++
.../Environment/Scenes/scripting/ScriptFactory.cs | 35 +
.../Scenes/scripting/Scripts/FollowRandomAvatar.cs | 64 ++
OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj | 2 +-
OpenSim/Region/Simulation/Caps.cs | 258 ------
OpenSim/Region/Simulation/EstateManager.cs | 301 -------
.../Simulation/OpenSim.Region.Environment.csproj | 211 -----
OpenSim/Region/Simulation/ParcelManager.cs | 892 ---------------------
OpenSim/Region/Simulation/RegionManager.cs | 30 -
OpenSim/Region/Simulation/Scenes/Entity.cs | 194 -----
.../Region/Simulation/Scenes/IScenePresenceBody.cs | 19 -
OpenSim/Region/Simulation/Scenes/Primitive.cs | 582 --------------
.../Simulation/Scenes/Scene.PacketHandlers.cs | 305 -------
.../Region/Simulation/Scenes/Scene.Scripting.cs | 184 -----
OpenSim/Region/Simulation/Scenes/Scene.cs | 795 ------------------
OpenSim/Region/Simulation/Scenes/SceneBase.cs | 201 -----
OpenSim/Region/Simulation/Scenes/SceneEvents.cs | 52 --
OpenSim/Region/Simulation/Scenes/SceneObject.cs | 128 ---
.../Simulation/Scenes/ScenePresence.Animations.cs | 76 --
.../Region/Simulation/Scenes/ScenePresence.Body.cs | 90 ---
OpenSim/Region/Simulation/Scenes/ScenePresence.cs | 525 ------------
.../Simulation/Scenes/scripting/IScriptContext.cs | 40 -
.../Simulation/Scenes/scripting/IScriptEntity.cs | 46 --
.../Simulation/Scenes/scripting/IScriptHandler.cs | 126 ---
.../Region/Simulation/Scenes/scripting/Script.cs | 53 --
.../Simulation/Scenes/scripting/ScriptFactory.cs | 35 -
.../Scenes/scripting/Scripts/FollowRandomAvatar.cs | 64 --
63 files changed, 5956 insertions(+), 5717 deletions(-)
create mode 100644 OpenSim/Region/Capabilities/Caps.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDArray.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDCapEvent.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDCapsDetails.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDEmpty.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDHelpers.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDMapLayer.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDMapRequest.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDTest.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDType.cs
create mode 100644 OpenSim/Region/Capabilities/LLSDUploadReply.cs
create mode 100644 OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
delete mode 100644 OpenSim/Region/Caps/Caps.cs
delete mode 100644 OpenSim/Region/Caps/LLSDHelpers.cs
create mode 100644 OpenSim/Region/Environment/EstateManager.cs
create mode 100644 OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
create mode 100644 OpenSim/Region/Environment/ParcelManager.cs
create mode 100644 OpenSim/Region/Environment/RegionManager.cs
create mode 100644 OpenSim/Region/Environment/Scenes/Entity.cs
create mode 100644 OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
create mode 100644 OpenSim/Region/Environment/Scenes/Primitive.cs
create mode 100644 OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
create mode 100644 OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
create mode 100644 OpenSim/Region/Environment/Scenes/Scene.cs
create mode 100644 OpenSim/Region/Environment/Scenes/SceneBase.cs
create mode 100644 OpenSim/Region/Environment/Scenes/SceneEvents.cs
create mode 100644 OpenSim/Region/Environment/Scenes/SceneObject.cs
create mode 100644 OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
create mode 100644 OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
create mode 100644 OpenSim/Region/Environment/Scenes/ScenePresence.cs
create mode 100644 OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
create mode 100644 OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
create mode 100644 OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
create mode 100644 OpenSim/Region/Environment/Scenes/scripting/Script.cs
create mode 100644 OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
create mode 100644 OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
delete mode 100644 OpenSim/Region/Simulation/Caps.cs
delete mode 100644 OpenSim/Region/Simulation/EstateManager.cs
delete mode 100644 OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
delete mode 100644 OpenSim/Region/Simulation/ParcelManager.cs
delete mode 100644 OpenSim/Region/Simulation/RegionManager.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/Entity.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/Primitive.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/Scene.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/SceneBase.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/SceneEvents.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/SceneObject.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/ScenePresence.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/Script.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 8960664..3801067 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -144,7 +144,7 @@
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Region.Environment
{DCBA491C-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
new file mode 100644
index 0000000..416a6bc
--- /dev/null
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -0,0 +1,279 @@
+/*
+* 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;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Xml;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Types;
+using OpenSim.Region.Caches;
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+ public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
+
+ public class Caps
+ {
+ private string httpListenerAddress;
+ private uint httpListenPort;
+ private string capsObjectPath = "00001-";
+ private string requestPath = "0000/";
+ private string mapLayerPath = "0001/";
+ private string newInventory = "0002/";
+ private string requestTexture = "0003/";
+ private string eventQueue = "0100/";
+ private BaseHttpServer httpListener;
+ private LLUUID agentID;
+ private AssetCache assetCache;
+ private int eventQueueCount = 1;
+ private Queue CapsEventQueue = new Queue();
+
+ public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
+ {
+ assetCache = assetCach;
+ capsObjectPath = capsPath;
+ httpListener = httpServer;
+ httpListenerAddress = httpListen;
+ httpListenPort = httpPort;
+ agentID = agent;
+ }
+
+ ///
+ ///
+ ///
+ public void RegisterHandlers()
+ {
+ Console.WriteLine("registering CAPS handlers");
+ httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
+ httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
+ httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
+ httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public string CapsRequest(string request, string path, string param)
+ {
+ // Console.WriteLine("Caps Request " + request);
+ string result = "";
+ result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
+ return result;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ protected LLSDCapsDetails GetCapabilities()
+ {
+ /* string capURLS = "";
+ capURLS += "MapLayerhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "";
+ capURLS += "NewFileAgentInventoryhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "";
+ //capURLS += "RequestTextureDownloadhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "";
+ //capURLS += "EventQueueGethttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "";
+ return capURLS;*/
+
+ LLSDCapsDetails caps = new LLSDCapsDetails();
+ caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath;
+ caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory;
+ return caps;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public string MapLayer(string request, string path, string param)
+ {
+ Encoding _enc = System.Text.Encoding.UTF8;
+ Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
+ LLSDMapRequest mapReq = new LLSDMapRequest();
+ LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
+
+ LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
+ mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
+ string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
+
+ //Console.WriteLine(" Maplayer response is " + res);
+
+ return res;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ protected LLSDMapLayer BuildLLSDMapLayerResponse()
+ {
+ LLSDMapLayer mapLayer = new LLSDMapLayer();
+ mapLayer.Right = 5000;
+ mapLayer.Top = 5000;
+ mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+
+ return mapLayer;
+ }
+
+ public string ProcessEventQueue(string request, string path, string param)
+ {
+ string res = "";
+
+ if (this.CapsEventQueue.Count > 0)
+ {
+ lock (this.CapsEventQueue)
+ {
+ string item = CapsEventQueue.Dequeue();
+ res = item;
+ }
+ }
+ else
+ {
+ res = this.CreateEmptyEventResponse();
+ }
+ return res;
+ }
+
+ public string CreateEstablishAgentComms(string caps, string ipAddressPort)
+ {
+ string res = "";
+ eventQueueCount++;
+ this.CapsEventQueue.Enqueue(res);
+ return res;
+ }
+
+ public string CreateEmptyEventResponse()
+ {
+ string res = "id" + eventQueueCount + "";
+ res += "events";
+ res += "";
+ res += "";
+ eventQueueCount++;
+ return res;
+ }
+
+ public string NewAgentInventory(string request, string path, string param)
+ {
+ //Console.WriteLine("received upload request:"+ request);
+ string res = "";
+ LLUUID newAsset = LLUUID.Random();
+ LLUUID newInvItem = LLUUID.Random();
+ string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
+ AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
+ httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
+ string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
+ //Console.WriteLine("uploader url is " + uploaderURL);
+ res += "";
+ res += "uploader" + uploaderURL + "";
+ //res += "successtrue";
+ res += "stateupload";
+ res += "";
+ uploader.OnUpLoad += this.UploadHandler;
+ return res;
+ }
+
+ public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
+ {
+ // Console.WriteLine("upload handler called");
+ AssetBase asset;
+ asset = new AssetBase();
+ asset.FullID = assetID;
+ asset.Type = 0;
+ asset.InvType = 0;
+ asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
+ asset.Data = data;
+ this.assetCache.AddAsset(asset);
+ }
+
+ public class AssetUploader
+ {
+ public event UpLoadedTexture OnUpLoad;
+
+ private string uploaderPath = "";
+ private LLUUID newAssetID;
+ private LLUUID inventoryItemID;
+ private BaseHttpServer httpListener;
+ public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
+ {
+ newAssetID = assetID;
+ inventoryItemID = inventoryItem;
+ uploaderPath = path;
+ httpListener = httpServer;
+
+ }
+
+ public string uploaderCaps(string request, string path, string param)
+ {
+ Encoding _enc = System.Text.Encoding.UTF8;
+ byte[] data = _enc.GetBytes(request);
+ //Console.WriteLine("recieved upload " + Util.FieldToString(data));
+ LLUUID inv = this.inventoryItemID;
+ string res = "";
+ res += "";
+ res += "new_asset" + newAssetID.ToStringHyphenated() + "";
+ res += "new_inventory_item" + inv.ToStringHyphenated() + "";
+ res += "statecomplete";
+ res += "";
+
+ // Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
+ httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
+ if (OnUpLoad != null)
+ {
+ OnUpLoad(newAssetID, inv, data);
+ }
+
+ /*FileStream fs = File.Create("upload.jp2");
+ BinaryWriter bw = new BinaryWriter(fs);
+ bw.Write(data);
+ bw.Close();
+ fs.Close();*/
+ return res;
+ }
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDArray.cs b/OpenSim/Region/Capabilities/LLSDArray.cs
new file mode 100644
index 0000000..76d5a2c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDArray.cs
@@ -0,0 +1,45 @@
+/*
+* 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;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [LLSDType("ARRAY")]
+ public class LLSDArray
+ {
+ public ArrayList Array = new ArrayList();
+
+ public LLSDArray()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDCapEvent.cs b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
new file mode 100644
index 0000000..d47d25c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
@@ -0,0 +1,45 @@
+/*
+* 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.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDCapEvent
+ {
+ public int id = 0;
+ public LLSDArray events = new LLSDArray();
+
+ public LLSDCapEvent()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
new file mode 100644
index 0000000..d6db606
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDCapsDetails
+ {
+ public string MapLayer = "";
+ public string NewFileAgentInventory = "";
+ //public string EventQueueGet = "";
+
+ public LLSDCapsDetails()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDEmpty.cs b/OpenSim/Region/Capabilities/LLSDEmpty.cs
new file mode 100644
index 0000000..68f1ce9
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDEmpty.cs
@@ -0,0 +1,42 @@
+/*
+* 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.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDEmpty
+ {
+ public LLSDEmpty()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDHelpers.cs b/OpenSim/Region/Capabilities/LLSDHelpers.cs
new file mode 100644
index 0000000..80916b4
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDHelpers.cs
@@ -0,0 +1,163 @@
+/*
+* 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;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Xml;
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+ public class LLSDHelpers
+ {
+ public static string SerialiseLLSDReply(object obj)
+ {
+ StringWriter sw = new StringWriter();
+ XmlTextWriter writer = new XmlTextWriter(sw);
+ writer.Formatting = Formatting.None;
+ writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+ LLSDHelpers.SerializeLLSDType(writer, obj);
+ writer.WriteEndElement();
+ writer.Close();
+ return sw.ToString();
+ }
+
+ public static void SerializeLLSDType(XmlTextWriter writer, object obj)
+ {
+ Type myType = obj.GetType();
+ LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+ if (llsdattributes.Length > 0)
+ {
+ switch (llsdattributes[0].ObjectType)
+ {
+ case "MAP":
+ writer.WriteStartElement(String.Empty, "map", String.Empty);
+ System.Reflection.FieldInfo[] fields = myType.GetFields();
+ for (int i = 0; i < fields.Length; i++)
+ {
+ object fieldValue = fields[i].GetValue(obj);
+ LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
+ if (fieldAttributes.Length > 0)
+ {
+ writer.WriteStartElement(String.Empty, "key", String.Empty);
+ writer.WriteString(fields[i].Name);
+ writer.WriteEndElement();
+ SerializeLLSDType(writer, fieldValue);
+ }
+ else
+ {
+ //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
+ writer.WriteStartElement(String.Empty, "key", String.Empty);
+ writer.WriteString(fields[i].Name);
+ writer.WriteEndElement();
+ LLSD.LLSDWriteOne(writer, fieldValue);
+ }
+ }
+ writer.WriteEndElement();
+ break;
+ case "ARRAY":
+ // LLSDArray arrayObject = obj as LLSDArray;
+ // ArrayList a = arrayObject.Array;
+ ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
+ writer.WriteStartElement(String.Empty, "array", String.Empty);
+ foreach (object item in a)
+ {
+ SerializeLLSDType(writer, item);
+ }
+ writer.WriteEndElement();
+ break;
+ }
+ }
+ else
+ {
+ LLSD.LLSDWriteOne(writer, obj);
+ }
+ }
+
+ public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
+ {
+ Type myType = obj.GetType();
+ LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+ if (llsdattributes.Length > 0)
+ {
+ switch (llsdattributes[0].ObjectType)
+ {
+ case "MAP":
+ IDictionaryEnumerator enumerator = llsd.GetEnumerator();
+ while (enumerator.MoveNext())
+ {
+ System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
+ if (field != null)
+ {
+ if (enumerator.Value is Hashtable)
+ {
+ object fieldValue = field.GetValue(obj);
+ DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
+ }
+ else if (enumerator.Value is ArrayList)
+ {
+ object fieldValue = field.GetValue(obj);
+ fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
+ //TODO
+ // the LLSD map/array types in the array need to be deserialised
+ // but first we need to know the right class to deserialise them into.
+ }
+ else
+ {
+ field.SetValue(obj, enumerator.Value);
+ }
+ }
+ }
+ break;
+ }
+ }
+ return obj;
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayer.cs b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
new file mode 100644
index 0000000..b097ec3
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
@@ -0,0 +1,50 @@
+/*
+* 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.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDMapLayer
+ {
+ public int Left = 0;
+ public int Right = 0;
+ public int Top = 0;
+ public int Bottom = 0;
+ public LLUUID ImageID = LLUUID.Zero;
+
+ public LLSDMapLayer()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
new file mode 100644
index 0000000..ee37a5b
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
@@ -0,0 +1,45 @@
+/*
+* 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.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDMapLayerResponse
+ {
+ public LLSDMapRequest AgentData = new LLSDMapRequest();
+ public LLSDArray LayerData = new LLSDArray();
+
+ public LLSDMapLayerResponse()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapRequest.cs b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
new file mode 100644
index 0000000..b15f1be
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDMapRequest
+ {
+ public int Flags = 0;
+
+ public LLSDMapRequest()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDTest.cs b/OpenSim/Region/Capabilities/LLSDTest.cs
new file mode 100644
index 0000000..3948f2c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDTest.cs
@@ -0,0 +1,45 @@
+/*
+* 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.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDTest
+ {
+ public int Test1 = 20;
+ public int Test2 = 10;
+
+ public LLSDTest()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDType.cs b/OpenSim/Region/Capabilities/LLSDType.cs
new file mode 100644
index 0000000..7da5861
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDType.cs
@@ -0,0 +1,53 @@
+/*
+* 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.Capabilities
+{
+ [AttributeUsage(AttributeTargets.Class)]
+ public class LLSDType : Attribute
+ {
+ private string myType;
+
+ public LLSDType(string type)
+ {
+ myType = type;
+
+ }
+
+ public string ObjectType
+ {
+ get
+ {
+ return myType;
+ }
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDUploadReply.cs b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
new file mode 100644
index 0000000..83cf166
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
@@ -0,0 +1,47 @@
+/*
+* 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.Capabilities
+{
+ [LLSDType("MAP")]
+ public class LLSDUploadReply
+ {
+ public string new_asset = "";
+ public LLUUID new_inventory_item = LLUUID.Zero;
+ public string state = "";
+
+ public LLSDUploadReply()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
new file mode 100644
index 0000000..0d8fac5
--- /dev/null
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -0,0 +1,151 @@
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {39038E85-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ OpenSim.Region.Capabilities
+ JScript
+ Grid
+ IE50
+ false
+ Library
+
+ OpenSim.Region.Capabilities
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ ..\..\..\bin\libsecondlife.dll
+ False
+
+
+ OpenSim.Framework.Types.dll
+ False
+
+
+ OpenSim.Framework.Utilities.dll
+ False
+
+
+ System.dll
+ False
+
+
+ System.Xml.dll
+ False
+
+
+ ..\..\..\bin\XMLRPC.dll
+ False
+
+
+
+
+ OpenSim.Framework
+ {8ACA2445-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Caches
+ {61FCCDB3-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/Region/Caps/Caps.cs b/OpenSim/Region/Caps/Caps.cs
deleted file mode 100644
index 414828a..0000000
--- a/OpenSim/Region/Caps/Caps.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Xml;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Types;
-using OpenSim.Region.Caches;
-using libsecondlife;
-
-namespace OpenSim.Region
-{
- public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
-
- public class Caps
- {
- private string httpListenerAddress;
- private uint httpListenPort;
- private string capsObjectPath = "00001-";
- private string requestPath = "0000/";
- private string mapLayerPath = "0001/";
- private string newInventory = "0002/";
- private string requestTexture = "0003/";
- private string eventQueue = "0100/";
- private BaseHttpServer httpListener;
- private LLUUID agentID;
- private AssetCache assetCache;
- private int eventQueueCount = 1;
- private Queue CapsEventQueue = new Queue();
-
- public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
- {
- assetCache = assetCach;
- capsObjectPath = capsPath;
- httpListener = httpServer;
- httpListenerAddress = httpListen;
- httpListenPort = httpPort;
- agentID = agent;
- }
-
- ///
- ///
- ///
- public void RegisterHandlers()
- {
- Console.WriteLine("registering CAPS handlers");
- httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
- httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
- httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
- httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public string CapsRequest(string request, string path, string param)
- {
- // Console.WriteLine("Caps Request " + request);
- string result = "";
- result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
- return result;
- }
-
- ///
- ///
- ///
- ///
- protected LLSDCapsDetails GetCapabilities()
- {
- /* string capURLS = "";
- capURLS += "MapLayerhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "";
- capURLS += "NewFileAgentInventoryhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "";
- //capURLS += "RequestTextureDownloadhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "";
- //capURLS += "EventQueueGethttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "";
- return capURLS;*/
-
- LLSDCapsDetails caps = new LLSDCapsDetails();
- caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath;
- caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory;
- return caps;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public string MapLayer(string request, string path, string param)
- {
- Encoding _enc = System.Text.Encoding.UTF8;
- Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
- LLSDMapRequest mapReq = new LLSDMapRequest();
- LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
-
- LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
- mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
- string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
-
- //Console.WriteLine(" Maplayer response is " + res);
-
- return res;
- }
-
- ///
- ///
- ///
- ///
- protected LLSDMapLayer BuildLLSDMapLayerResponse()
- {
- LLSDMapLayer mapLayer = new LLSDMapLayer();
- mapLayer.Right = 5000;
- mapLayer.Top = 5000;
- mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
-
- return mapLayer;
- }
-
- public string ProcessEventQueue(string request, string path, string param)
- {
- // Console.WriteLine("event queue request " + request);
- string res = "";
- int timer = 0;
-
- /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
- {
- timer++;
- }*/
- if (this.CapsEventQueue.Count > 0)
- {
- lock (this.CapsEventQueue)
- {
- string item = CapsEventQueue.Dequeue();
- res = item;
- }
- }
- else
- {
- res = this.CreateEmptyEventResponse();
- }
- return res;
- }
-
- public string CreateEstablishAgentComms(string caps, string ipAddressPort)
- {
- string res = "id" + eventQueueCount + "";
- res += "events";
- res += "messageEstablishAgentCommunication";
- res += "body";
- res += "sim-ip-and-port" + ipAddressPort + "";
- res += "seed-capability" + caps + "";
- res += "agent-id" + this.agentID.ToStringHyphenated() + "";
- res += "";
- res += "";
- res += "";
- eventQueueCount++;
- this.CapsEventQueue.Enqueue(res);
- return res;
- }
-
- public string CreateEmptyEventResponse()
- {
- string res = "id" + eventQueueCount + "";
- res += "events";
- res += "";
- res += "";
- eventQueueCount++;
- return res;
- }
-
- public string NewAgentInventory(string request, string path, string param)
- {
- //Console.WriteLine("received upload request:"+ request);
- string res = "";
- LLUUID newAsset = LLUUID.Random();
- LLUUID newInvItem = LLUUID.Random();
- string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
- AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
- httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
- string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
- //Console.WriteLine("uploader url is " + uploaderURL);
- res += "";
- res += "uploader" + uploaderURL + "";
- //res += "successtrue";
- res += "stateupload";
- res += "";
- uploader.OnUpLoad += this.UploadHandler;
- return res;
- }
-
- public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
- {
- // Console.WriteLine("upload handler called");
- AssetBase asset;
- asset = new AssetBase();
- asset.FullID = assetID;
- asset.Type = 0;
- asset.InvType = 0;
- asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
- asset.Data = data;
- this.assetCache.AddAsset(asset);
- }
-
- public class AssetUploader
- {
- public event UpLoadedTexture OnUpLoad;
-
- private string uploaderPath = "";
- private LLUUID newAssetID;
- private LLUUID inventoryItemID;
- private BaseHttpServer httpListener;
- public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
- {
- newAssetID = assetID;
- inventoryItemID = inventoryItem;
- uploaderPath = path;
- httpListener = httpServer;
-
- }
-
- public string uploaderCaps(string request, string path, string param)
- {
- Encoding _enc = System.Text.Encoding.UTF8;
- byte[] data = _enc.GetBytes(request);
- //Console.WriteLine("recieved upload " + Util.FieldToString(data));
- LLUUID inv = this.inventoryItemID;
- string res = "";
- res += "";
- res += "new_asset" + newAssetID.ToStringHyphenated() + "";
- res += "new_inventory_item" + inv.ToStringHyphenated() + "";
- res += "statecomplete";
- res += "";
-
- // Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
- httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
- if (OnUpLoad != null)
- {
- OnUpLoad(newAssetID, inv, data);
- }
-
- /*FileStream fs = File.Create("upload.jp2");
- BinaryWriter bw = new BinaryWriter(fs);
- bw.Write(data);
- bw.Close();
- fs.Close();*/
- return res;
- }
- }
- }
-}
diff --git a/OpenSim/Region/Caps/LLSDHelpers.cs b/OpenSim/Region/Caps/LLSDHelpers.cs
deleted file mode 100644
index 051520c..0000000
--- a/OpenSim/Region/Caps/LLSDHelpers.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Xml;
-using libsecondlife;
-
-namespace OpenSim.Framework
-{
- public class LLSDHelpers
- {
- public static string SerialiseLLSDReply(object obj)
- {
- StringWriter sw = new StringWriter();
- XmlTextWriter writer = new XmlTextWriter(sw);
- writer.Formatting = Formatting.None;
- writer.WriteStartElement(String.Empty, "llsd", String.Empty);
- LLSDHelpers.SerializeLLSDType(writer, obj);
- writer.WriteEndElement();
- writer.Close();
- return sw.ToString();
- }
-
- public static void SerializeLLSDType(XmlTextWriter writer, object obj)
- {
- Type myType = obj.GetType();
- LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
- if (llsdattributes.Length > 0)
- {
- switch (llsdattributes[0].ObjectType)
- {
- case "MAP":
- writer.WriteStartElement(String.Empty, "map", String.Empty);
- System.Reflection.FieldInfo[] fields = myType.GetFields();
- for (int i = 0; i < fields.Length; i++)
- {
- object fieldValue = fields[i].GetValue(obj);
- LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
- if (fieldAttributes.Length > 0)
- {
- writer.WriteStartElement(String.Empty, "key", String.Empty);
- writer.WriteString(fields[i].Name);
- writer.WriteEndElement();
- SerializeLLSDType(writer, fieldValue);
- }
- else
- {
- //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
- writer.WriteStartElement(String.Empty, "key", String.Empty);
- writer.WriteString(fields[i].Name);
- writer.WriteEndElement();
- LLSD.LLSDWriteOne(writer, fieldValue);
- }
- }
- writer.WriteEndElement();
- break;
- case "ARRAY":
- // LLSDArray arrayObject = obj as LLSDArray;
- // ArrayList a = arrayObject.Array;
- ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
- writer.WriteStartElement(String.Empty, "array", String.Empty);
- foreach (object item in a)
- {
- SerializeLLSDType(writer, item);
- }
- writer.WriteEndElement();
- break;
- }
- }
- else
- {
- LLSD.LLSDWriteOne(writer, obj);
- }
- }
-
- public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
- {
- Type myType = obj.GetType();
- LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
- if (llsdattributes.Length > 0)
- {
- switch (llsdattributes[0].ObjectType)
- {
- case "MAP":
- IDictionaryEnumerator enumerator = llsd.GetEnumerator();
- while (enumerator.MoveNext())
- {
- System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
- if (field != null)
- {
- if (enumerator.Value is Hashtable)
- {
- object fieldValue = field.GetValue(obj);
- DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
- }
- else if (enumerator.Value is ArrayList)
- {
- object fieldValue = field.GetValue(obj);
- fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
- //TODO
- // the LLSD map/array types in the array need to be deserialised
- // but first we need to know the right class to deserialise them into.
- }
- else
- {
- field.SetValue(obj, enumerator.Value);
- }
- }
- }
- break;
- }
- }
- return obj;
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDMapLayerResponse
- {
- public LLSDMapRequest AgentData = new LLSDMapRequest();
- public LLSDArray LayerData = new LLSDArray();
-
- public LLSDMapLayerResponse()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDCapsDetails
- {
- public string MapLayer = "";
- public string NewFileAgentInventory = "";
- //public string EventQueueGet = "";
-
- public LLSDCapsDetails()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDMapLayer
- {
- public int Left = 0;
- public int Right = 0;
- public int Top = 0;
- public int Bottom = 0;
- public LLUUID ImageID = LLUUID.Zero;
-
- public LLSDMapLayer()
- {
-
- }
- }
-
- [LLSDType("ARRAY")]
- public class LLSDArray
- {
- public ArrayList Array = new ArrayList();
-
- public LLSDArray()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDMapRequest
- {
- public int Flags = 0;
-
- public LLSDMapRequest()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDUploadReply
- {
- public string new_asset = "";
- public LLUUID new_inventory_item = LLUUID.Zero;
- public string state = "";
-
- public LLSDUploadReply()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDCapEvent
- {
- public int id = 0;
- public LLSDArray events = new LLSDArray();
-
- public LLSDCapEvent()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDEmpty
- {
- public LLSDEmpty()
- {
-
- }
- }
-
- [LLSDType("MAP")]
- public class LLSDTest
- {
- public int Test1 = 20;
- public int Test2 = 10;
-
- public LLSDTest()
- {
-
- }
- }
-
-
- [AttributeUsage(AttributeTargets.Class)]
- public class LLSDType : Attribute
- {
- private string myType;
-
- public LLSDType(string type)
- {
- myType = type;
-
- }
-
- public string ObjectType
- {
- get
- {
- return myType;
- }
- }
- }
-}
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index cca7c71..40cd4f0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -70,10 +70,6 @@
..\..\..\bin\libsecondlife.dll
False
-
- OpenSim.FrameworkGenericConfig.Xml.dll
- False
-
System.dll
False
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
new file mode 100644
index 0000000..c2c1ecf
--- /dev/null
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -0,0 +1,301 @@
+/*
+* 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 OpenSim.Framework.Types;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
+using OpenSim;
+using libsecondlife;
+using libsecondlife.Packets;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
+
+
+namespace OpenSim.Region.Environment
+{
+
+ ///
+ /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
+ ///
+ public class EstateManager
+ {
+ private Scene m_world;
+ private RegionInfo m_regInfo;
+
+ public EstateManager(Scene world,RegionInfo reginfo)
+ {
+ m_world = world; //Estate settings found at world.m_regInfo.estateSettings
+ m_regInfo = reginfo;
+ }
+
+ private bool convertParamStringToBool(byte[] field)
+ {
+ string s = Helpers.FieldToUTF8String(field);
+ if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true")
+ {
+ return true;
+ }
+ return false;
+ }
+
+ public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, IClientAPI remote_client)
+ {
+ if (remote_client.AgentId == m_regInfo.MasterAvatarAssignedUUID)
+ {
+ switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
+ {
+ case "getinfo":
+ Console.WriteLine("GETINFO Requested");
+ this.sendRegionInfoPacketToAll();
+
+ break;
+ case "setregioninfo":
+ if (packet.ParamList.Length != 9)
+ {
+ OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
+ }
+ else
+ {
+ m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;
+
+ if (convertParamStringToBool(packet.ParamList[0].Parameter))
+ {
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;
+ }
+
+ if (convertParamStringToBool(packet.ParamList[1].Parameter))
+ {
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;
+ }
+
+ if (convertParamStringToBool(packet.ParamList[2].Parameter))
+ {
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;
+ }
+
+ if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
+ {
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;
+ }
+
+
+ int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter)));
+ m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents;
+
+ float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+ m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
+
+ int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
+ m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;
+
+
+ if (convertParamStringToBool(packet.ParamList[7].Parameter))
+ {
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;
+ }
+
+ if (convertParamStringToBool(packet.ParamList[8].Parameter))
+ {
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;
+ }
+
+ sendRegionInfoPacketToAll();
+
+ }
+ break;
+ case "texturebase":
+ foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+ {
+ string s = Helpers.FieldToUTF8String(block.Parameter);
+ string[] splitField = s.Split(' ');
+ if (splitField.Length == 2)
+ {
+ LLUUID tempUUID = new LLUUID(splitField[1]);
+ switch (Convert.ToInt16(splitField[0]))
+ {
+ case 0:
+ m_regInfo.estateSettings.terrainBase0 = tempUUID;
+ break;
+ case 1:
+ m_regInfo.estateSettings.terrainBase1 = tempUUID;
+ break;
+ case 2:
+ m_regInfo.estateSettings.terrainBase2 = tempUUID;
+ break;
+ case 3:
+ m_regInfo.estateSettings.terrainBase3 = tempUUID;
+ break;
+ }
+ }
+ }
+ break;
+ case "texturedetail":
+ foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+ {
+
+ string s = Helpers.FieldToUTF8String(block.Parameter);
+ string[] splitField = s.Split(' ');
+ if (splitField.Length == 2)
+ {
+ LLUUID tempUUID = new LLUUID(splitField[1]);
+ switch (Convert.ToInt16(splitField[0]))
+ {
+ case 0:
+ m_regInfo.estateSettings.terrainDetail0 = tempUUID;
+ break;
+ case 1:
+ m_regInfo.estateSettings.terrainDetail1 = tempUUID;
+ break;
+ case 2:
+ m_regInfo.estateSettings.terrainDetail2 = tempUUID;
+ break;
+ case 3:
+ m_regInfo.estateSettings.terrainDetail3 = tempUUID;
+ break;
+ }
+ }
+ }
+ break;
+ case "textureheights":
+ foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+ {
+
+ string s = Helpers.FieldToUTF8String(block.Parameter);
+ string[] splitField = s.Split(' ');
+ if (splitField.Length == 3)
+ {
+
+ float tempHeightLow = (float)Convert.ToDecimal(splitField[1]);
+ float tempHeightHigh = (float)Convert.ToDecimal(splitField[2]);
+
+ switch (Convert.ToInt16(splitField[0]))
+ {
+ case 0:
+ m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow;
+ m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh;
+ break;
+ case 1:
+ m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow;
+ m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh;
+ break;
+ case 2:
+ m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow;
+ m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh;
+ break;
+ case 3:
+ m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow;
+ m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh;
+ break;
+ }
+ }
+ }
+ break;
+ case "texturecommit":
+ sendRegionHandshakeToAll();
+ break;
+ case "setregionterrain":
+ if (packet.ParamList.Length != 9)
+ {
+ OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
+ }
+ else
+ {
+ m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter));
+ m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter));
+ m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter));
+ m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter);
+ m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+
+ sendRegionInfoPacketToAll();
+ }
+ break;
+ default:
+ OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
+ break;
+ }
+ }
+ }
+
+ public void sendRegionInfoPacketToAll()
+ {
+ List avatars = m_world.RequestAvatarList();
+
+ for (int i = 0; i < avatars.Count; i++)
+ {
+ this.sendRegionInfoPacket(avatars[i].ControllingClient);
+ }
+ }
+
+ public void sendRegionHandshakeToAll()
+ {
+ List avatars = m_world.RequestAvatarList();
+
+ for (int i = 0; i < avatars.Count; i++)
+ {
+ this.sendRegionHandshake(avatars[i].ControllingClient);
+ }
+ }
+
+ public void sendRegionInfoPacket(IClientAPI remote_client)
+ {
+ Encoding _enc = System.Text.Encoding.ASCII;
+
+ AgentCircuitData circuitData = remote_client.RequestClientInfo();
+
+ RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
+ regionInfoPacket.AgentData.AgentID = circuitData.AgentID;
+ regionInfoPacket.AgentData.SessionID = circuitData.SessionID;
+ regionInfoPacket.RegionInfo.BillableFactor = m_regInfo.estateSettings.billableFactor;
+ regionInfoPacket.RegionInfo.EstateID = m_regInfo.estateSettings.estateID;
+ regionInfoPacket.RegionInfo.MaxAgents = m_regInfo.estateSettings.maxAgents;
+ regionInfoPacket.RegionInfo.ObjectBonusFactor = m_regInfo.estateSettings.objectBonusFactor;
+ regionInfoPacket.RegionInfo.ParentEstateID = m_regInfo.estateSettings.parentEstateID;
+ regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.estateSettings.pricePerMeter;
+ regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.estateSettings.redirectGridX;
+ regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.estateSettings.redirectGridY;
+ regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags;
+ regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess;
+ regionInfoPacket.RegionInfo.SimName = _enc.GetBytes( m_regInfo.RegionName);
+ regionInfoPacket.RegionInfo.SunHour = m_regInfo.estateSettings.sunHour;
+ regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.estateSettings.terrainLowerLimit;
+ regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.estateSettings.terrainRaiseLimit;
+ regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.estateSettings.useFixedSun;
+ regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.estateSettings.waterHeight;
+
+ remote_client.OutPacket(regionInfoPacket);
+ }
+
+ public void sendRegionHandshake(IClientAPI remoteClient)
+ {
+ remoteClient.SendRegionHandshake(m_regInfo);
+ }
+
+ }
+}
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
new file mode 100644
index 0000000..6f07969
--- /dev/null
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -0,0 +1,214 @@
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {DCBA491C-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ OpenSim.Region.Environment
+ JScript
+ Grid
+ IE50
+ false
+ Library
+
+ OpenSim.Region.Environment
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ ..\..\..\bin\Axiom.MathLib.dll
+ False
+
+
+ ..\..\..\bin\Db4objects.Db4o.dll
+ False
+
+
+ ..\..\..\bin\libsecondlife.dll
+ False
+
+
+ System.dll
+ False
+
+
+ System.Xml.dll
+ False
+
+
+ ..\..\..\bin\XMLRPC.dll
+ False
+
+
+
+
+ OpenSim.Framework
+ {8ACA2445-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Communications
+ {CB52B7E7-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Console
+ {A7CD0630-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.GenericConfig.Xml
+ {C74E4A30-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Servers
+ {2CC71860-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Caches
+ {61FCCDB3-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Capabilities
+ {39038E85-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Physics.Manager
+ {F4FF31EB-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Region.Terrain.BasicTerrain
+ {C9E0F891-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
new file mode 100644
index 0000000..1cab4ab
--- /dev/null
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -0,0 +1,892 @@
+/*
+* 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.Framework.Types;
+using OpenSim.Region.Environment.Scenes;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
+
+namespace OpenSim.Region.Environment
+{
+
+
+ #region ParcelManager Class
+ ///
+ /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
+ ///
+ public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver
+ {
+
+ #region Constants
+ //Parcel types set with flags in ParcelOverlay.
+ //Only one of these can be used.
+ public const byte PARCEL_TYPE_PUBLIC = (byte)0; //Equals 00000000
+ public const byte PARCEL_TYPE_OWNED_BY_OTHER = (byte)1; //Equals 00000001
+ public const byte PARCEL_TYPE_OWNED_BY_GROUP = (byte)2; //Equals 00000010
+ public const byte PARCEL_TYPE_OWNED_BY_REQUESTER = (byte)3; //Equals 00000011
+ public const byte PARCEL_TYPE_IS_FOR_SALE = (byte)4; //Equals 00000100
+ public const byte PARCEL_TYPE_IS_BEING_AUCTIONED = (byte)5; //Equals 00000101
+
+
+ //Flags that when set, a border on the given side will be placed
+ //NOTE: North and East is assumable by the west and south sides (if parcel to east has a west border, then I have an east border; etc)
+ //This took forever to figure out -- jeesh. /blame LL for even having to send these
+ public const byte PARCEL_FLAG_PROPERTY_BORDER_WEST = (byte)64; //Equals 01000000
+ public const byte PARCEL_FLAG_PROPERTY_BORDER_SOUTH = (byte)128; //Equals 10000000
+
+ //RequestResults (I think these are right, they seem to work):
+ public const int PARCEL_RESULT_ONE_PARCEL = 0; // The request they made contained only one parcel
+ public const int PARCEL_RESULT_MULTIPLE_PARCELS = 1; // The request they made contained more than one parcel
+
+ //These are other constants. Yay!
+ public const int START_PARCEL_LOCAL_ID = 1;
+ #endregion
+
+ #region Member Variables
+ public Dictionary parcelList = new Dictionary();
+ private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+ private int[,] parcelIDList = new int[64, 64];
+
+ private Scene m_world;
+ private RegionInfo m_regInfo;
+
+ #endregion
+
+ #region Constructors
+ public ParcelManager(Scene world, RegionInfo reginfo)
+ {
+
+ m_world = world;
+ m_regInfo = reginfo;
+ parcelIDList.Initialize();
+
+ }
+ #endregion
+
+ #region Member Functions
+
+ #region Parcel From Storage Functions
+ public void ParcelFromStorage(ParcelData data)
+ {
+ Parcel new_parcel = new Parcel(data.ownerID, data.isGroupOwned, m_world);
+ new_parcel.parcelData = data.Copy();
+ new_parcel.setParcelBitmapFromByteArray();
+ addParcel(new_parcel);
+
+ }
+
+ public void NoParcelDataFromStorage()
+ {
+ resetSimParcels();
+ }
+ #endregion
+
+ #region Parcel Add/Remove/Get/Create
+ ///
+ /// Creates a basic Parcel object without an owner (a zeroed key)
+ ///
+ ///
+ public Parcel createBaseParcel()
+ {
+ return new Parcel(new LLUUID(), false, m_world);
+ }
+
+ ///
+ /// Adds a parcel to the stored list and adds them to the parcelIDList to what they own
+ ///
+ /// The parcel being added
+ public void addParcel(Parcel new_parcel)
+ {
+ lastParcelLocalID++;
+ new_parcel.parcelData.localID = lastParcelLocalID;
+ parcelList.Add(lastParcelLocalID, new_parcel.Copy());
+
+
+ bool[,] parcelBitmap = new_parcel.getParcelBitmap();
+ int x, y;
+ for (x = 0; x < 64; x++)
+ {
+ for (y = 0; y < 64; y++)
+ {
+ if (parcelBitmap[x, y])
+ {
+ parcelIDList[x, y] = lastParcelLocalID;
+ }
+ }
+ }
+ parcelList[lastParcelLocalID].forceUpdateParcelInfo();
+
+
+ }
+ ///
+ /// Removes a parcel from the list. Will not remove if local_id is still owning an area in parcelIDList
+ ///
+ /// Parcel.localID of the parcel to remove.
+ public void removeParcel(int local_id)
+ {
+ int x, y;
+ for (x = 0; x < 64; x++)
+ {
+ for (y = 0; y < 64; y++)
+ {
+ if (parcelIDList[x, y] == local_id)
+ {
+ throw new Exception("Could not remove parcel. Still being used at " + x + ", " + y);
+ }
+ }
+ }
+ m_world.localStorage.RemoveParcel(parcelList[local_id].parcelData);
+ parcelList.Remove(local_id);
+ }
+
+ private void performFinalParcelJoin(Parcel master, Parcel slave)
+ {
+ int x, y;
+ bool[,] parcelBitmapSlave = slave.getParcelBitmap();
+ for (x = 0; x < 64; x++)
+ {
+ for (y = 0; y < 64; y++)
+ {
+ if (parcelBitmapSlave[x, y])
+ {
+ parcelIDList[x, y] = master.parcelData.localID;
+ }
+ }
+ }
+ removeParcel(slave.parcelData.localID);
+ }
+ ///
+ /// Get the parcel at the specified point
+ ///
+ /// Value between 0 - 256 on the x axis of the point
+ /// Value between 0 - 256 on the y axis of the point
+ /// Parcel at the point supplied
+ public Parcel getParcel(int x, int y)
+ {
+ if (x > 256 || y > 256 || x < 0 || y < 0)
+ {
+ throw new Exception("Error: Parcel not found at point " + x + ", " + y);
+ }
+ else
+ {
+ return parcelList[parcelIDList[x / 4, y / 4]];
+ }
+
+ }
+ #endregion
+
+ #region Parcel Modification
+ ///
+ /// Subdivides a parcel
+ ///
+ /// West Point
+ /// South Point
+ /// East Point
+ /// North Point
+ /// LLUUID of user who is trying to subdivide
+ /// Returns true if successful
+ private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+ {
+ //First, lets loop through the points and make sure they are all in the same parcel
+ //Get the parcel at start
+ Parcel startParcel = getParcel(start_x, start_y);
+ if (startParcel == null) return false; //No such parcel at the beginning
+
+ //Loop through the points
+ try
+ {
+ int totalX = end_x - start_x;
+ int totalY = end_y - start_y;
+ int x, y;
+ for (y = 0; y < totalY; y++)
+ {
+ for (x = 0; x < totalX; x++)
+ {
+ Parcel tempParcel = getParcel(start_x + x, start_y + y);
+ if (tempParcel == null) return false; //No such parcel at that point
+ if (tempParcel != startParcel) return false; //Subdividing over 2 parcels; no-no
+ }
+ }
+ }
+ catch (Exception)
+ {
+ return false; //Exception. For now, lets skip subdivision
+ }
+
+ //If we are still here, then they are subdividing within one parcel
+ //Check owner
+ if (startParcel.parcelData.ownerID != attempting_user_id)
+ {
+ return false; //They cant do this!
+ }
+
+ //Lets create a new parcel with bitmap activated at that point (keeping the old parcels info)
+ Parcel newParcel = startParcel.Copy();
+ newParcel.parcelData.parcelName = "Subdivision of " + newParcel.parcelData.parcelName;
+ newParcel.parcelData.globalID = LLUUID.Random();
+
+ newParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(start_x, start_y, end_x, end_y));
+
+ //Now, lets set the subdivision area of the original to false
+ int startParcelIndex = startParcel.parcelData.localID;
+ parcelList[startParcelIndex].setParcelBitmap(Parcel.modifyParcelBitmapSquare(startParcel.getParcelBitmap(), start_x, start_y, end_x, end_y, false));
+ parcelList[startParcelIndex].forceUpdateParcelInfo();
+
+
+ //Now add the new parcel
+ addParcel(newParcel);
+
+
+
+
+
+ return true;
+ }
+ ///
+ /// Join 2 parcels together
+ ///
+ /// x value in first parcel
+ /// y value in first parcel
+ /// x value in second parcel
+ /// y value in second parcel
+ /// LLUUID of the avatar trying to join the parcels
+ /// Returns true if successful
+ private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+ {
+ end_x -= 4;
+ end_y -= 4;
+
+ //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
+ //This should be fixed later -- somewhat "incomplete code" --Ming
+ Parcel startParcel, endParcel;
+
+ try
+ {
+ startParcel = getParcel(start_x, start_y);
+ endParcel = getParcel(end_x, end_y);
+ }
+ catch (Exception)
+ {
+ return false; //Error occured when trying to get the start and end parcels
+ }
+ if (startParcel == endParcel)
+ {
+ return false; //Subdivision of the same parcel is not allowed
+ }
+
+ //Check the parcel owners:
+ if (startParcel.parcelData.ownerID != endParcel.parcelData.ownerID)
+ {
+ return false;
+ }
+ if (startParcel.parcelData.ownerID != attempting_user_id)
+ {
+ //TODO: Group editing stuff. Avatar owner support for now
+ return false;
+ }
+
+ //Same owners! Lets join them
+ //Merge them to startParcel
+ parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
+ performFinalParcelJoin(startParcel, endParcel);
+
+ return true;
+
+
+
+ }
+ #endregion
+
+ #region Parcel Updating
+ ///
+ /// Where we send the ParcelOverlay packet to the client
+ ///
+ /// The object representing the client
+ public void sendParcelOverlay(IClientAPI remote_client)
+ {
+ const int PARCEL_BLOCKS_PER_PACKET = 1024;
+ int x, y = 0;
+ byte[] byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+ int byteArrayCount = 0;
+ int sequenceID = 0;
+ ParcelOverlayPacket packet;
+
+ for (y = 0; y < 64; y++)
+ {
+ for (x = 0; x < 64; x++)
+ {
+ byte tempByte = (byte)0; //This represents the byte for the current 4x4
+ Parcel currentParcelBlock = getParcel(x * 4, y * 4);
+
+ if (currentParcelBlock.parcelData.ownerID == remote_client.AgentId)
+ {
+ //Owner Flag
+ tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_REQUESTER);
+ }
+ else if (currentParcelBlock.parcelData.salePrice > 0 && (currentParcelBlock.parcelData.authBuyerID == LLUUID.Zero || currentParcelBlock.parcelData.authBuyerID == remote_client.AgentId))
+ {
+ //Sale Flag
+ tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);
+ }
+ else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)
+ {
+ //Public Flag
+ tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
+ }
+ else
+ {
+ //Other Flag
+ tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_OTHER);
+ }
+
+
+ //Now for border control
+ if (x == 0)
+ {
+ tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+ }
+ else if (getParcel((x - 1) * 4, y * 4) != currentParcelBlock)
+ {
+ tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+ }
+
+ if (y == 0)
+ {
+ tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+ }
+ else if (getParcel(x * 4, (y - 1) * 4) != currentParcelBlock)
+ {
+ tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+ }
+
+ byteArray[byteArrayCount] = tempByte;
+ byteArrayCount++;
+ if (byteArrayCount >= PARCEL_BLOCKS_PER_PACKET)
+ {
+ byteArrayCount = 0;
+ packet = new ParcelOverlayPacket();
+ packet.ParcelData.Data = byteArray;
+ packet.ParcelData.SequenceID = sequenceID;
+ remote_client.OutPacket((Packet)packet);
+ sequenceID++;
+ byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+ }
+ }
+ }
+
+ packet = new ParcelOverlayPacket();
+ packet.ParcelData.Data = byteArray;
+ packet.ParcelData.SequenceID = sequenceID; //Eh?
+ remote_client.OutPacket((Packet)packet);
+ }
+
+ public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)
+ {
+ //Get the parcels within the bounds
+ List temp = new List();
+ int x, y, i;
+ int inc_x = end_x - start_x;
+ int inc_y = end_y - start_y;
+ for (x = 0; x < inc_x; x++)
+ {
+ for (y = 0; y < inc_y; y++)
+ {
+ OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);
+ if (!temp.Contains(currentParcel))
+ {
+ currentParcel.forceUpdateParcelInfo();
+ temp.Add(currentParcel);
+ }
+ }
+ }
+
+ int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL;
+ if (temp.Count > 1)
+ {
+ requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;
+ }
+
+ for (i = 0; i < temp.Count; i++)
+ {
+ temp[i].sendParcelProperties(sequence_id, snap_selection, requestResult, remote_client);
+ }
+
+
+ sendParcelOverlay(remote_client);
+ }
+
+ public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+ {
+ if (parcelList.ContainsKey(packet.ParcelData.LocalID))
+ {
+ parcelList[packet.ParcelData.LocalID].updateParcelProperties(packet, remote_client);
+ }
+ }
+ public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
+ {
+ subdivide(west, south, east, north, remote_client.AgentId);
+ }
+ public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
+ {
+ join(west, south, east, north, remote_client.AgentId);
+
+ }
+ #endregion
+
+ ///
+ /// Resets the sim to the default parcel (full sim parcel owned by the default user)
+ ///
+ public void resetSimParcels()
+ {
+ //Remove all the parcels in the sim and add a blank, full sim parcel set to public
+ parcelList.Clear();
+ lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+ parcelIDList.Initialize();
+
+ Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world);
+
+ fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
+ fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
+ fullSimParcel.parcelData.parcelDesc = "";
+
+ fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
+ fullSimParcel.parcelData.salePrice = 1;
+ fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
+ fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
+
+ addParcel(fullSimParcel);
+
+ }
+ #endregion
+ }
+ #endregion
+
+
+ #region Parcel Class
+ ///
+ /// Keeps track of a specific parcel's information
+ ///
+ public class Parcel
+ {
+ #region Member Variables
+ public ParcelData parcelData = new ParcelData();
+ public Scene m_world;
+
+ private bool[,] parcelBitmap = new bool[64, 64];
+
+ #endregion
+
+
+ #region Constructors
+ public Parcel(LLUUID owner_id, bool is_group_owned, Scene world)
+ {
+ m_world = world;
+ parcelData.ownerID = owner_id;
+ parcelData.isGroupOwned = is_group_owned;
+
+ }
+ #endregion
+
+
+ #region Member Functions
+
+ #region General Functions
+ ///
+ /// Checks to see if this parcel contains a point
+ ///
+ ///
+ ///
+ /// Returns true if the parcel contains the specified point
+ public bool containsPoint(int x, int y)
+ {
+ if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
+ {
+ return (parcelBitmap[x / 4, y / 4] == true);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ public Parcel Copy()
+ {
+ Parcel newParcel = new Parcel(this.parcelData.ownerID, this.parcelData.isGroupOwned, m_world);
+
+ //Place all new variables here!
+ newParcel.parcelBitmap = (bool[,])(this.parcelBitmap.Clone());
+ newParcel.parcelData = parcelData.Copy();
+
+ return newParcel;
+ }
+
+ #endregion
+
+
+ #region Packet Request Handling
+ ///
+ /// Sends parcel properties as requested
+ ///
+ /// ID sent by client for them to keep track of
+ /// Bool sent by client for them to use
+ /// Object representing the client
+ public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
+ {
+
+ ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();
+ updatePacket.ParcelData.AABBMax = parcelData.AABBMax;
+ updatePacket.ParcelData.AABBMin = parcelData.AABBMin;
+ updatePacket.ParcelData.Area = parcelData.area;
+ updatePacket.ParcelData.AuctionID = parcelData.auctionID;
+ updatePacket.ParcelData.AuthBuyerID = parcelData.authBuyerID; //unemplemented
+
+ updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
+
+ updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);
+ updatePacket.ParcelData.Category = (byte)parcelData.category;
+ updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
+ updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
+ updatePacket.ParcelData.GroupID = parcelData.groupID;
+ updatePacket.ParcelData.GroupPrims = parcelData.groupPrims;
+ updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;
+ updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;
+ updatePacket.ParcelData.LocalID = parcelData.localID;
+ updatePacket.ParcelData.MaxPrims = 1000; //unemplemented
+ updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;
+ updatePacket.ParcelData.MediaID = parcelData.mediaID;
+ updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);
+ updatePacket.ParcelData.MusicURL = Helpers.StringToField(parcelData.musicURL);
+ updatePacket.ParcelData.Name = Helpers.StringToField(parcelData.parcelName);
+ updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
+ updatePacket.ParcelData.OtherCount = 0; //unemplemented
+ updatePacket.ParcelData.OtherPrims = 0; //unemplented
+ updatePacket.ParcelData.OwnerID = parcelData.ownerID;
+ updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
+ updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented
+ updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented
+ updatePacket.ParcelData.PassHours = parcelData.passHours;
+ updatePacket.ParcelData.PassPrice = parcelData.passPrice;
+ updatePacket.ParcelData.PublicCount = 0; //unemplemented
+ updatePacket.ParcelData.RegionDenyAnonymous = false; //unemplemented
+ updatePacket.ParcelData.RegionDenyIdentified = false; //unemplemented
+ updatePacket.ParcelData.RegionDenyTransacted = false; //unemplemented
+ updatePacket.ParcelData.RegionPushOverride = true; //unemplemented
+ updatePacket.ParcelData.RentPrice = 0; //??
+ updatePacket.ParcelData.RequestResult = request_result;
+ updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented
+ updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented
+ updatePacket.ParcelData.SelfCount = 0;//unemplemented
+ updatePacket.ParcelData.SequenceID = sequence_id;
+ updatePacket.ParcelData.SimWideMaxPrims = 15000; //unemplemented
+ updatePacket.ParcelData.SimWideTotalPrims = 0; //unemplemented
+ updatePacket.ParcelData.SnapSelection = snap_selection;
+ updatePacket.ParcelData.SnapshotID = parcelData.snapshotID;
+ updatePacket.ParcelData.Status = (byte)parcelData.parcelStatus;
+ updatePacket.ParcelData.TotalPrims = 0; //unemplemented
+ updatePacket.ParcelData.UserLocation = parcelData.userLocation;
+ updatePacket.ParcelData.UserLookAt = parcelData.userLookAt;
+ remote_client.OutPacket((Packet)updatePacket);
+ }
+
+ public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+ {
+ if (remote_client.AgentId == parcelData.ownerID)
+ {
+ //Needs later group support
+ parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
+ parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
+ parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
+ parcelData.groupID = packet.ParcelData.GroupID;
+ parcelData.landingType = packet.ParcelData.LandingType;
+ parcelData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
+ parcelData.mediaID = packet.ParcelData.MediaID;
+ parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
+ parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
+ parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);
+ parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
+ parcelData.passHours = packet.ParcelData.PassHours;
+ parcelData.passPrice = packet.ParcelData.PassPrice;
+ parcelData.salePrice = packet.ParcelData.SalePrice;
+ parcelData.snapshotID = packet.ParcelData.SnapshotID;
+ parcelData.userLocation = packet.ParcelData.UserLocation;
+ parcelData.userLookAt = packet.ParcelData.UserLookAt;
+
+ List avatars = m_world.RequestAvatarList();
+
+ for (int i = 0; i < avatars.Count; i++)
+ {
+ Parcel over = m_world.parcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));
+ if (over == this)
+ {
+ sendParcelProperties(0, false, 0, avatars[i].ControllingClient);
+ }
+ }
+
+ }
+ }
+ #endregion
+
+
+ #region Update Functions
+ ///
+ /// Updates the AABBMin and AABBMax values after area/shape modification of parcel
+ ///
+ private void updateAABBAndAreaValues()
+ {
+ int min_x = 64;
+ int min_y = 64;
+ int max_x = 0;
+ int max_y = 0;
+ int tempArea = 0;
+ int x, y;
+ for (x = 0; x < 64; x++)
+ {
+ for (y = 0; y < 64; y++)
+ {
+ if (parcelBitmap[x, y] == true)
+ {
+ if (min_x > x) min_x = x;
+ if (min_y > y) min_y = y;
+ if (max_x < x) max_x = x;
+ if (max_y < y) max_y = y;
+ tempArea += 16; //16sqm parcel
+ }
+ }
+ }
+ parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);
+ parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);
+ parcelData.area = tempArea;
+ }
+
+ public void updateParcelBitmapByteArray()
+ {
+ parcelData.parcelBitmapByteArray = convertParcelBitmapToBytes();
+ }
+
+ ///
+ /// Update all settings in parcel such as area, bitmap byte array, etc
+ ///
+ public void forceUpdateParcelInfo()
+ {
+ this.updateAABBAndAreaValues();
+ this.updateParcelBitmapByteArray();
+ }
+
+ public void setParcelBitmapFromByteArray()
+ {
+ parcelBitmap = convertBytesToParcelBitmap();
+ }
+ #endregion
+
+
+ #region Parcel Bitmap Functions
+ ///
+ /// Sets the parcel's bitmap manually
+ ///
+ /// 64x64 block representing where this parcel is on a map
+ public void setParcelBitmap(bool[,] bitmap)
+ {
+ if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
+ {
+ //Throw an exception - The bitmap is not 64x64
+ throw new Exception("Error: Invalid Parcel Bitmap");
+ }
+ else
+ {
+ //Valid: Lets set it
+ parcelBitmap = bitmap;
+ forceUpdateParcelInfo();
+
+ }
+ }
+ ///
+ /// Gets the parcels bitmap manually
+ ///
+ ///
+ public bool[,] getParcelBitmap()
+ {
+ return parcelBitmap;
+ }
+ ///
+ /// Converts the parcel bitmap to a packet friendly byte array
+ ///
+ ///
+ private byte[] convertParcelBitmapToBytes()
+ {
+ byte[] tempConvertArr = new byte[512];
+ byte tempByte = 0;
+ int x, y, i, byteNum = 0;
+ i = 0;
+ for (y = 0; y < 64; y++)
+ {
+ for (x = 0; x < 64; x++)
+ {
+ tempByte = Convert.ToByte(tempByte | Convert.ToByte(parcelBitmap[x, y]) << (i++ % 8));
+ if (i % 8 == 0)
+ {
+ tempConvertArr[byteNum] = tempByte;
+ tempByte = (byte)0;
+ i = 0;
+ byteNum++;
+ }
+ }
+ }
+ return tempConvertArr;
+ }
+
+ private bool[,] convertBytesToParcelBitmap()
+ {
+ bool[,] tempConvertMap = new bool[64, 64];
+ tempConvertMap.Initialize();
+ byte tempByte = 0;
+ int x = 0, y = 0, i = 0, bitNum = 0;
+ for (i = 0; i < 512; i++)
+ {
+ tempByte = parcelData.parcelBitmapByteArray[i];
+ for (bitNum = 0; bitNum < 8; bitNum++)
+ {
+ bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);
+ tempConvertMap[x, y] = bit;
+ x++;
+ if (x > 63)
+ {
+ x = 0;
+ y++;
+ }
+
+ }
+
+ }
+ return tempConvertMap;
+ }
+ ///
+ /// Full sim parcel creation
+ ///
+ ///
+ public static bool[,] basicFullRegionParcelBitmap()
+ {
+ return getSquareParcelBitmap(0, 0, 256, 256);
+ }
+
+ ///
+ /// Used to modify the bitmap between the x and y points. Points use 64 scale
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static bool[,] getSquareParcelBitmap(int start_x, int start_y, int end_x, int end_y)
+ {
+
+ bool[,] tempBitmap = new bool[64, 64];
+ tempBitmap.Initialize();
+
+ tempBitmap = modifyParcelBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+ return tempBitmap;
+ }
+
+ ///
+ /// Change a parcel's bitmap at within a square and set those points to a specific value
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static bool[,] modifyParcelBitmapSquare(bool[,] parcel_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)
+ {
+ if (parcel_bitmap.GetLength(0) != 64 || parcel_bitmap.GetLength(1) != 64 || parcel_bitmap.Rank != 2)
+ {
+ //Throw an exception - The bitmap is not 64x64
+ throw new Exception("Error: Invalid Parcel Bitmap in modifyParcelBitmapSquare()");
+ }
+
+ int x, y;
+ for (y = 0; y < 64; y++)
+ {
+ for (x = 0; x < 64; x++)
+ {
+ if (x >= start_x / 4 && x < end_x / 4
+ && y >= start_y / 4 && y < end_y / 4)
+ {
+ parcel_bitmap[x, y] = set_value;
+ }
+ }
+ }
+ return parcel_bitmap;
+ }
+ ///
+ /// Join the true values of 2 bitmaps together
+ ///
+ ///
+ ///
+ ///
+ public static bool[,] mergeParcelBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
+ {
+ if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
+ {
+ //Throw an exception - The bitmap is not 64x64
+ throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeParcelBitmaps");
+ }
+ if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
+ {
+ //Throw an exception - The bitmap is not 64x64
+ throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeParcelBitmaps");
+
+ }
+
+ int x, y;
+ for (y = 0; y < 64; y++)
+ {
+ for (x = 0; x < 64; x++)
+ {
+ if (bitmap_add[x, y])
+ {
+ bitmap_base[x, y] = true;
+ }
+ }
+ }
+ return bitmap_base;
+ }
+ #endregion
+
+ #endregion
+
+
+ }
+ #endregion
+
+
+}
diff --git a/OpenSim/Region/Environment/RegionManager.cs b/OpenSim/Region/Environment/RegionManager.cs
new file mode 100644
index 0000000..4ff55a8
--- /dev/null
+++ b/OpenSim/Region/Environment/RegionManager.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Servers;
+using OpenSim.Region.Capabilities;
+
+namespace OpenSim.Region.Environment
+{
+ public class RegionManager //needs renaming , but first we need to rename the namespace
+ {
+ protected AuthenticateSessionsBase authenticateHandler;
+ protected RegionCommsListener regionCommsHost;
+ protected CommunicationsManager commsManager;
+ protected List capsHandlers = new List();
+ protected BaseHttpServer httpListener;
+
+ protected Scenes.Scene m_Scene;
+
+ public ParcelManager parcelManager;
+ public EstateManager estateManager;
+
+ public RegionManager()
+ {
+
+ }
+
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
new file mode 100644
index 0000000..bbba34d
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -0,0 +1,194 @@
+/*
+* 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.Environment.Scripting;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ public abstract class Entity : IScriptReadonlyEntity
+ {
+ public libsecondlife.LLUUID uuid;
+ public Quaternion rotation;
+ protected List children;
+
+ protected PhysicsActor _physActor;
+ protected Scene m_world;
+ protected string m_name;
+
+ ///
+ ///
+ ///
+ public virtual string Name
+ {
+ get { return m_name; }
+ }
+
+ protected LLVector3 m_pos;
+ ///
+ ///
+ ///
+ 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;
+ }
+ }
+
+ public LLVector3 velocity;
+
+ ///
+ ///
+ ///
+ public virtual LLVector3 Velocity
+ {
+ get
+ {
+ if (this._physActor != null)
+ {
+ velocity.X = _physActor.Velocity.X;
+ velocity.Y = _physActor.Velocity.Y;
+ velocity.Z = _physActor.Velocity.Z;
+ }
+
+ return velocity;
+ }
+ set
+ {
+ if (this._physActor != null)
+ {
+ try
+ {
+ lock (this.m_world.SyncRoot)
+ {
+
+ this._physActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z);
+ }
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e.Message);
+ }
+ }
+
+ velocity = value;
+ }
+ }
+
+ protected uint m_localId;
+
+ public uint LocalId
+ {
+ get { return m_localId; }
+ }
+
+ ///
+ /// Creates a new Entity (should not occur on it's own)
+ ///
+ public Entity()
+ {
+ uuid = new libsecondlife.LLUUID();
+
+ m_pos = new LLVector3();
+ velocity = new LLVector3();
+ rotation = new Quaternion();
+ m_name = "(basic entity)";
+ children = new List();
+ }
+
+ ///
+ ///
+ ///
+ public virtual void updateMovement()
+ {
+ foreach (Entity child in children)
+ {
+ child.updateMovement();
+ }
+ }
+
+ ///
+ /// 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/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
new file mode 100644
index 0000000..36023d0
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
@@ -0,0 +1,19 @@
+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;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ public interface IScenePresenceBody
+ {
+ void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
+ void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
+ void SendOurAppearance(IClientAPI OurClient);
+ void SendAppearanceToOtherAgent(ScenePresence avatarInfo);
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
new file mode 100644
index 0000000..0f649b2
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -0,0 +1,582 @@
+
+/*
+* 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.Environment.Scenes
+{
+ 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 uint flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
+
+ 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 = m_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 = m_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.Environment.Scenes.Primitive)
+ {
+ dataArrays.Add(((OpenSim.Region.Environment.Scenes.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.TextureEntry = 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-9999-000000000005"), this.flags);
+ }
+
+ ///
+ ///
+ ///
+ 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) //is this needed ? doesn't the property fields do this for us?
+ {
+ 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;
+ }
+ LLQuaternion mRot = new LLQuaternion(lRot.x, lRot.y, lRot.z, lRot.w);
+ RemoteClient.SendPrimTerseUpdate(this.m_regionHandle, 64096, this.LocalId, lPos, mRot);
+ }
+
+ ///
+ ///
+ ///
+ 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 = m_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)
+ {
+
+ }
+
+ public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
+ {
+ // Console.WriteLine("moving prim to new location " + pos.X + " , " + pos.Y + " , " + pos.Z);
+ this.Pos = pos;
+ this.SendTerseUpdateToALLClients();
+ }
+
+ 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)primData.CreationDate;
+ proper.ObjectData[0].CreatorID = 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 = 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 = primData.OwnerMask;
+ proper.ObjectData[0].NextOwnerMask = primData.NextOwnerMask;
+ proper.ObjectData[0].GroupMask = primData.GroupMask;
+ proper.ObjectData[0].EveryoneMask = primData.EveryoneMask;
+ proper.ObjectData[0].BaseMask = primData.BaseMask;
+
+ client.OutPacket(proper);
+
+ }
+
+ #endregion
+
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
new file mode 100644
index 0000000..1d55c4d
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -0,0 +1,305 @@
+/*
+* 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.Environment.Scenes
+{
+ public partial class Scene
+ {
+ ///
+ /// Modifies terrain using the specified information
+ ///
+ /// The height at which the user started modifying the terrain
+ /// The number of seconds the modify button was pressed
+ /// The size of the brush used
+ /// The action to be performed
+ /// Distance from the north border where the cursor is located
+ /// Distance from the west border where the cursor is located
+ public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west)
+ {
+ // Shiny.
+ double size = (double)(1 << brushsize);
+
+ switch (action)
+ {
+ case 0:
+ // flatten terrain
+ Terrain.flatten(north, west, size, (double)seconds / 100.0);
+ RegenerateTerrain(true, (int)north, (int)west);
+ break;
+ case 1:
+ // raise terrain
+ Terrain.raise(north, west, size, (double)seconds / 100.0);
+ RegenerateTerrain(true, (int)north, (int)west);
+ break;
+ case 2:
+ //lower terrain
+ Terrain.lower(north, west, size, (double)seconds / 100.0);
+ RegenerateTerrain(true, (int)north, (int)west);
+ break;
+ case 3:
+ // smooth terrain
+ Terrain.smooth(north, west, size, (double)seconds / 100.0);
+ RegenerateTerrain(true, (int)north, (int)west);
+ break;
+ case 4:
+ // noise
+ Terrain.noise(north, west, size, (double)seconds / 100.0);
+ RegenerateTerrain(true, (int)north, (int)west);
+ break;
+ case 5:
+ // revert
+ Terrain.revert(north, west, size, (double)seconds / 100.0);
+ RegenerateTerrain(true, (int)north, (int)west);
+ break;
+
+ // CLIENT EXTENSIONS GO HERE
+ case 128:
+ // erode-thermal
+ break;
+ case 129:
+ // erode-aerobic
+ break;
+ case 130:
+ // erode-hydraulic
+ break;
+ }
+ return;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+ {
+ Console.WriteLine("Chat message");
+ ScenePresence 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)
+ {
+ foreach (Entity ent in Entities.Values)
+ {
+ if (ent.LocalId == primLocalID)
+ {
+ ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);
+ break;
+ }
+ }
+ }
+
+ public void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
+ {
+ if (this.Entities.ContainsKey(objectID))
+ {
+ ((Primitive)this.Entities[objectID]).GrapMovement(offset, pos, 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.Environment.Scenes.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/Region/Environment/Scenes/Scene.Scripting.cs b/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
new file mode 100644
index 0000000..2249c3d
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
@@ -0,0 +1,184 @@
+/*
+* 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.Environment.Scenes
+{
+ 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 ScenePresence)
+ {
+ res = entity.LocalId;
+ }
+ }
+ return res;
+ }
+
+ #endregion
+
+
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
new file mode 100644
index 0000000..ff54efa
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -0,0 +1,795 @@
+/*
+* 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.Environment.Scripting;
+using OpenSim.Region.Terrain;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Caches;
+using OpenSim.Region.Environment;
+using OpenSim.Framework.Servers;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ public delegate bool FilterAvatarList(ScenePresence 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;
+ private Random Rand = new Random();
+ private uint _primCount = 702000;
+ private int storageCount;
+ private Dictionary m_scriptHandlers;
+ private Dictionary m_scripts;
+ private Mutex updateLock;
+
+ protected AuthenticateSessionsBase authenticateHandler;
+ protected RegionCommsListener regionCommsHost;
+ protected CommunicationsManager commsManager;
+
+ protected Dictionary capsHandlers = new Dictionary();
+ protected BaseHttpServer httpListener;
+
+ public ParcelManager parcelManager;
+ public EstateManager estateManager;
+ public EventManager eventManager;
+
+ #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, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
+ {
+ try
+ {
+ updateLock = new Mutex(false);
+ this.authenticateHandler = authen;
+ this.commsManager = commsMan;
+ this.assetCache = assetCach;
+ 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);
+
+ eventManager = new EventManager();
+
+ m_scriptHandlers = new Dictionary();
+ m_scripts = new Dictionary();
+
+ OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
+ Entities = new Dictionary();
+ Avatars = new Dictionary();
+ Prims = new Dictionary();
+
+ OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap");
+ Terrain = new TerrainEngine();
+
+ ScenePresence.LoadAnims();
+ this.httpListener = httpServer;
+
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainLog.Instance.Error( "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].updateMovement();
+ }
+
+ lock (this.m_syncRoot)
+ {
+ this.phyScene.Simulate(timeStep);
+ }
+
+ foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ {
+ Entities[UUID].update();
+ }
+
+ // New
+ eventManager.TriggerOnFrame();
+
+ // TODO: Obsolete - Phase out
+ 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.MainLog.Instance.Warn("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.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain tainted, saving.");
+ localStorage.SaveMap(Terrain.getHeights1D());
+ OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain saved, informing Physics.");
+ lock (this.m_syncRoot)
+ {
+ phyScene.SetTerrain(Terrain.getHeights1D());
+ }
+ }
+
+ // Primitive backup routines
+ OpenSim.Framework.Console.MainLog.Instance.Verbose( "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.Environment.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.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
+ return false;
+ }
+ */
+ return true;
+ }
+ #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.MainLog.Instance.Warn("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.MainLog.Instance.Warn("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.MainLog.Instance.Warn("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)
+ {
+ if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
+ {
+ Console.WriteLine("No default terrain, procedurally generating...");
+ this.Terrain.hills();
+
+ this.localStorage.SaveMap(this.Terrain.getHeights1D());
+ }
+ else
+ {
+ try
+ {
+ this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);
+ this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;
+ }
+ catch
+ {
+ Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
+ Terrain.hills();
+ }
+ this.localStorage.SaveMap(this.Terrain.getHeights1D());
+ }
+ }
+ else
+ {
+ this.Terrain.setHeights1D(map);
+ }
+
+ CreateTerrainTexture();
+
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
+ }
+ }
+
+ ///
+ ///
+ ///
+ private void CreateTerrainTexture()
+ {
+ //create a texture asset of the terrain
+ byte[] data = this.Terrain.exportJpegImage("defaultstripe.png");
+ this.m_regInfo.estateSettings.terrainImageID = LLUUID.Random();
+ AssetBase asset = new AssetBase();
+ asset.FullID = this.m_regInfo.estateSettings.terrainImageID;
+ asset.Data = data;
+ asset.Name = "terrainImage";
+ asset.Type = 0;
+ this.assetCache.AddAsset(asset);
+ }
+ #endregion
+
+ #region Primitives Methods
+
+
+ ///
+ /// Loads the World's objects
+ ///
+ public void LoadPrimsFromStorage()
+ {
+ try
+ {
+ OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: LoadPrimsFromStorage() - Loading primitives");
+ this.localStorage.LoadPrimitives(this);
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainLog.Instance.Warn("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
+ {
+ Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
+
+ this.Entities.Add(prim.uuid, prim);
+ this._primCount++;
+
+ // Trigger event for listeners
+ eventManager.TriggerOnNewPrimitive(prim);
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
+ }
+ }
+
+ #endregion
+
+ #region Add/Remove Avatar Methods
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child)
+ {
+ remoteClient.OnRegionHandShakeReply += this.SendLayerData;
+ //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
+ remoteClient.OnChatFromViewer += this.SimChat;
+ remoteClient.OnRequestWearables += this.InformClientOfNeighbours;
+ remoteClient.OnAddPrim += this.AddNewPrim;
+ remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;
+ remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;
+ remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
+ //remoteClient.OnObjectSelect += this.SelectPrim;
+ remoteClient.OnGrapUpdate += this.MoveObject;
+
+ /* 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);
+ */
+
+ ScenePresence newAvatar = null;
+ try
+ {
+
+ OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
+ newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo);
+ OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
+ OpenSim.Framework.Console.MainLog.Instance.Verbose( "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.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
+ }
+ return;
+ }
+
+
+
+ ///
+ ///
+ ///
+ ///
+ public override void RemoveClient(LLUUID agentID)
+ {
+ eventManager.TriggerOnRemovePresence(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 (ScenePresence 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 (ScenePresence avatar in Avatars.Values)
+ {
+ if (filter(avatar))
+ {
+ result.Add(avatar);
+ }
+ }
+
+ return result;
+ }
+
+ ///
+ /// Request a Avatar by UUID
+ ///
+ ///
+ ///
+ public ScenePresence RequestAvatar(LLUUID avatarID)
+ {
+ if (this.Avatars.ContainsKey(avatarID))
+ {
+ return Avatars[avatarID];
+ }
+ return null;
+ }
+ #endregion
+
+
+ #region RegionCommsHost
+
+ ///
+ ///
+ ///
+ public void RegisterRegionWithComms()
+ {
+ GridInfo gridSettings = new GridInfo();
+ this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings);
+ if (this.regionCommsHost != null)
+ {
+ this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
+ this.regionCommsHost.OnAvatarCrossingIntoRegion += new AgentCrossing(this.AgentCrossing);
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ 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)
+ {
+ if (agent.CapsPath != "")
+ {
+ //Console.WriteLine("new user, so creating caps handler for it");
+ Capabilities.Caps cap = new Capabilities.Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
+ cap.RegisterHandlers();
+ this.capsHandlers.Add(agent.AgentID, cap);
+ }
+ this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+ }
+ }
+
+ public void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+ {
+ if (regionHandle == this.m_regInfo.RegionHandle)
+ {
+ if (this.Avatars.ContainsKey(agentID))
+ {
+ this.Avatars[agentID].MakeAvatar(position);
+ }
+ }
+ }
+
+ ///
+ ///
+ ///
+ public 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);
+ agent.child = true;
+ this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent);
+ remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr), (ushort)neighbours[i].CommsIPListenPort);
+ //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort);
+ }
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
+ {
+ return this.commsManager.GridServer.RequestNeighbourInfo(regionHandle);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
+ {
+ List mapBlocks;
+ mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
+ remoteClient.SendMapBlock(mapBlocks);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags)
+ {
+ if (regionHandle == this.m_regionHandle)
+ {
+ if (this.Avatars.ContainsKey(remoteClient.AgentId))
+ {
+ remoteClient.SendTeleportLocationStart();
+ remoteClient.SendLocalTeleport(position, lookAt, flags);
+ this.Avatars[remoteClient.AgentId].Teleport(position);
+ }
+ }
+ else
+ {
+ RegionInfo reg = this.RequestNeighbouringRegionInfo(regionHandle);
+ if (reg != null)
+ {
+ remoteClient.SendTeleportLocationStart();
+ AgentCircuitData agent = remoteClient.RequestClientInfo();
+ agent.BaseFolder = LLUUID.Zero;
+ agent.InventoryFolder = LLUUID.Zero;
+ agent.startpos = new LLVector3(128, 128, 70);
+ agent.child = true;
+ this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
+ this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position);
+ remoteClient.SendRegionTeleport(regionHandle, 13, reg.CommsIPListenAddr, (ushort)reg.CommsIPListenPort, 4, (1 << 4));
+ }
+ //remoteClient.SendTeleportCancel();
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public bool InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position)
+ {
+ return this.commsManager.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position);
+ }
+
+ #endregion
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
new file mode 100644
index 0000000..3d8f522
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -0,0 +1,201 @@
+/*
+* 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.Environment.Scripting;
+using OpenSim.Region.Terrain;
+using OpenSim.Region.Caches;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ 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;
+
+ public string m_datastore;
+ public ILocalStorage localStorage;
+
+ protected object m_syncRoot = new object();
+ private uint m_nextLocalId = 8880000;
+ protected AssetCache assetCache;
+
+ #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();
+
+ ///
+ /// 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.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
+ return false;
+ }
+ }
+
+
+ ///
+ /// 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 virtual void SendLayerData(int px, int py, IClientAPI RemoteClient)
+ {
+ RemoteClient.SendLayerData(px, py, Terrain.getHeights1D());
+ }
+
+ #endregion
+
+ #region Add/Remove Agent/Avatar
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
+
+ ///
+ ///
+ ///
+ ///
+ public abstract void RemoveClient(LLUUID agentID);
+
+ #endregion
+
+ ///
+ ///
+ ///
+ ///
+ public virtual RegionInfo RegionInfo
+ {
+ get { return this.m_regInfo; }
+ }
+
+ public object SyncRoot
+ {
+ get { return m_syncRoot; }
+ }
+
+ public uint NextLocalId
+ {
+ get { return m_nextLocalId++; }
+ }
+
+ #region Shutdown
+ ///
+ /// Tidy before shutdown
+ ///
+ public virtual void Close()
+ {
+ try
+ {
+ this.localStorage.ShutDown();
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
+ }
+ }
+
+ #endregion
+
+
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
new file mode 100644
index 0000000..fa1bacb
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ ///
+ /// A class for triggering remote scene events.
+ ///
+ public class EventManager
+ {
+ public delegate void OnFrameDelegate();
+ public event OnFrameDelegate OnFrame;
+
+ public delegate void OnNewPresenceDelegate(ScenePresence presence);
+ public event OnNewPresenceDelegate OnNewPresence;
+
+ public delegate void OnNewPrimitiveDelegate(Primitive prim);
+ public event OnNewPrimitiveDelegate OnNewPrimitive;
+
+ public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
+ public event OnRemovePresenceDelegate OnRemovePresence;
+
+ public void TriggerOnFrame()
+ {
+ if (OnFrame != null)
+ {
+ OnFrame();
+ }
+ }
+
+ public void TriggerOnNewPrimitive(Primitive prim)
+ {
+ if (OnNewPrimitive != null)
+ OnNewPrimitive(prim);
+ }
+
+ public void TriggerOnNewPresence(ScenePresence presence)
+ {
+ if (OnNewPresence != null)
+ OnNewPresence(presence);
+ }
+
+ public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
+ {
+ if (OnRemovePresence != null)
+ {
+ OnRemovePresence(uuid);
+ }
+ }
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
new file mode 100644
index 0000000..88fb160
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -0,0 +1,128 @@
+/*
+* 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.Environment.Scenes
+{
+ 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/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
new file mode 100644
index 0000000..2caabc2
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -0,0 +1,76 @@
+/*
+* 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.Environment.Scenes
+{
+ partial class ScenePresence
+ {
+ public class AvatarAnimations
+ {
+
+ public Dictionary AnimsLLUUID = new Dictionary();
+ public Dictionary AnimsNames = new Dictionary();
+
+ public AvatarAnimations()
+ {
+ }
+
+ public void LoadAnims()
+ {
+ //OpenSim.Framework.Console.MainLog.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.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+
+ foreach (KeyValuePair kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
+ {
+ AnimsNames.Add(kp.Value, kp.Key);
+ }
+ }
+ }
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
new file mode 100644
index 0000000..2c81d2a
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
@@ -0,0 +1,90 @@
+/*
+* 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;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ partial class ScenePresence
+ {
+ public class Avatar : IScenePresenceBody
+ {
+ public Avatar()
+ {
+
+ }
+
+ public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
+ {
+ }
+
+ public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+ {
+ }
+
+ public void SendOurAppearance(IClientAPI OurClient)
+ {
+ }
+
+ public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
+ {
+ }
+ }
+
+ public class ChildAgent : IScenePresenceBody //is a ghost
+ {
+ public ChildAgent()
+ {
+
+ }
+
+ public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
+ {
+ }
+
+ public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+ {
+ }
+
+ public void SendOurAppearance(IClientAPI OurClient)
+ {
+ }
+
+ public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
+ {
+ }
+ }
+ }
+
+}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
new file mode 100644
index 0000000..96e5c94
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -0,0 +1,525 @@
+/*
+* 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.Environment.Scenes
+{
+ public partial class ScenePresence : Entity
+ {
+ public static bool PhysicsEngineFlying = false;
+ public static AvatarAnimations Animations;
+ public static byte[] DefaultTexture;
+ public string firstname;
+ public string lastname;
+ public IClientAPI ControllingClient;
+ public LLUUID current_anim;
+ public int anim_seq;
+ 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 bool childAgent = false;
+ private bool newForce = false;
+ private bool newAvatar = false;
+ private IScenePresenceBody m_body;
+
+ protected RegionInfo m_regionInfo;
+
+ #region Properties
+ ///
+ ///
+ ///
+ public PhysicsActor PhysActor
+ {
+ set
+ {
+ this._physActor = value;
+ }
+ get
+ {
+ return _physActor;
+ }
+ }
+ #endregion
+
+ #region Constructor(s)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public ScenePresence(IClientAPI theClient, Scene world, RegionInfo reginfo)
+ {
+
+ m_world = world;
+ this.uuid = theClient.AgentId;
+
+ m_regionInfo = reginfo;
+ m_regionHandle = reginfo.RegionHandle;
+ OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");
+ ControllingClient = theClient;
+ this.firstname = ControllingClient.FirstName;
+ this.lastname = ControllingClient.LastName;
+ m_localId = 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 += this.SendOurAppearance;
+ //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
+ ControllingClient.OnCompleteMovementToRegion += this.CompleteMovement;
+ ControllingClient.OnCompleteMovementToRegion += this.SendInitialData;
+ ControllingClient.OnAgentUpdate += this.HandleAgentUpdate;
+ // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
+ // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
+ //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
+
+ }
+ #endregion
+
+ #region Status Methods
+ ///
+ /// Not Used, most likely can be deleted
+ ///
+ ///
+ public void ChildStatusChange(bool status)
+ {
+ this.childAgent = status;
+
+ if (this.childAgent == true)
+ {
+ this.Velocity = new LLVector3(0, 0, 0);
+ this.Pos = new LLVector3(128, 128, 70);
+
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public void MakeAvatar(LLVector3 pos)
+ {
+ //this.childAvatar = false;
+ this.Pos = pos;
+ this.newAvatar = true;
+ this.childAgent = false;
+ }
+
+ protected void MakeChildAgent()
+ {
+ this.Velocity = new LLVector3(0, 0, 0);
+ this.Pos = new LLVector3(128, 128, 70);
+ this.childAgent = true;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public void Teleport(LLVector3 pos)
+ {
+ this.Pos = pos;
+ this.SendTerseUpdateToALLClients();
+ }
+
+ ///
+ ///
+ ///
+ public void StopMovement()
+ {
+
+ }
+ #endregion
+
+ #region Event Handlers
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+ {
+
+ }
+
+ ///
+ /// Complete Avatar's movement into the region
+ ///
+ public void CompleteMovement()
+ {
+ LLVector3 look = this.Velocity;
+ if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
+ {
+ look = new LLVector3(0.99f, 0.042f, 0);
+ }
+ this.ControllingClient.MoveAgentIntoRegion(m_regionInfo, Pos, look);
+ if (this.childAgent)
+ {
+ this.childAgent = false;
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
+ {
+ if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
+ {
+ Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+ if (((movementflag & 1) == 0) || (q != this.bodyRot))
+ {
+ Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
+ this.AddNewMovement(v3, q);
+ movementflag = 1;
+ this.bodyRot = q;
+ }
+ }
+ else if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
+ {
+ Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+ if (((movementflag & 2) == 0) || (q != this.bodyRot))
+ {
+ Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
+ this.AddNewMovement(v3, q);
+ movementflag = 2;
+ this.bodyRot = q;
+ }
+ }
+ else
+ {
+ if ((movementflag) != 0)
+ {
+ NewForce newVelocity = new NewForce();
+ newVelocity.X = 0;
+ newVelocity.Y = 0;
+ newVelocity.Z = 0;
+ this.forcesList.Add(newVelocity);
+ movementflag = 0;
+ }
+ }
+
+ }
+
+ protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation)
+ {
+ NewForce newVelocity = new NewForce();
+ Axiom.MathLib.Vector3 direc = rotation * vec;
+ direc.Normalize();
+
+ direc = direc * ((0.03f) * 128f);
+ if (this._physActor.Flying)
+ direc *= 4;
+
+ newVelocity.X = direc.x;
+ newVelocity.Y = direc.y;
+ newVelocity.Z = direc.z;
+ this.forcesList.Add(newVelocity);
+ }
+
+ #endregion
+
+ #region Overridden Methods
+ ///
+ ///
+ ///
+ public override void LandRenegerated()
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ public override void update()
+ {
+ if (this.childAgent == false)
+ {
+ if (this.newForce)
+ {
+ this.SendTerseUpdateToALLClients();
+ _updateCount = 0;
+ }
+ else if (movementflag != 0)
+ {
+ _updateCount++;
+ if (_updateCount > 3)
+ {
+ this.SendTerseUpdateToALLClients();
+ _updateCount = 0;
+ }
+ }
+
+ this.CheckForBorderCrossing();
+ }
+ }
+ #endregion
+
+ #region Update Client(s)
+ ///
+ ///
+ ///
+ ///
+ public void SendTerseUpdateToClient(IClientAPI RemoteClient)
+ {
+ LLVector3 pos = this.Pos;
+ LLVector3 vel = this.Velocity;
+ RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z));
+ }
+
+ ///
+ ///
+ ///
+ public void SendTerseUpdateToALLClients()
+ {
+ List avatars = this.m_world.RequestAvatarList();
+ for (int i = 0; i < avatars.Count; i++)
+ {
+ this.SendTerseUpdateToClient(avatars[i].ControllingClient);
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
+ {
+ remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
+ }
+
+ ///
+ ///
+ ///
+ public void SendInitialData()
+ {
+ this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
+ if (this.newAvatar)
+ {
+ this.m_world.InformClientOfNeighbours(this.ControllingClient);
+ this.newAvatar = false;
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public void SendOurAppearance(IClientAPI OurClient)
+ {
+ this.ControllingClient.SendWearables(this.Wearables);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SendAnimPack(LLUUID animID, int seq)
+ {
+
+
+ }
+
+ ///
+ ///
+ ///
+ public void SendAnimPack()
+ {
+
+ }
+ #endregion
+
+ #region Border Crossing Methods
+ ///
+ ///
+ ///
+ protected void CheckForBorderCrossing()
+ {
+ LLVector3 pos2 = this.Pos;
+ LLVector3 vel = this.Velocity;
+
+ float timeStep = 0.2f;
+ pos2.X = pos2.X + (vel.X * timeStep);
+ pos2.Y = pos2.Y + (vel.Y * timeStep);
+ pos2.Z = pos2.Z + (vel.Z * timeStep);
+
+ if ((pos2.X < 0) || (pos2.X > 256))
+ {
+ this.CrossToNewRegion();
+ }
+
+ if ((pos2.Y < 0) || (pos2.Y > 256))
+ {
+ this.CrossToNewRegion();
+ }
+ }
+
+ ///
+ ///
+ ///
+ protected void CrossToNewRegion()
+ {
+ LLVector3 pos = this.Pos;
+ LLVector3 newpos = new LLVector3(pos.X, pos.Y, pos.Z);
+ uint neighbourx = this.m_regionInfo.RegionLocX;
+ uint neighboury = this.m_regionInfo.RegionLocY;
+
+ if (pos.X < 2)
+ {
+ neighbourx -= 1;
+ newpos.X = 254;
+ }
+ if (pos.X > 253)
+ {
+ neighbourx += 1;
+ newpos.X = 1;
+ }
+ if (pos.Y < 2)
+ {
+ neighboury -= 1;
+ newpos.Y = 254;
+ }
+ if (pos.Y > 253)
+ {
+ neighboury += 1;
+ newpos.Y = 1;
+ }
+
+ LLVector3 vel = this.velocity;
+ ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * 256), (uint)(neighboury * 256));
+ RegionInfo neighbourRegion = this.m_world.RequestNeighbouringRegionInfo(neighbourHandle);
+ if (neighbourRegion != null)
+ {
+ bool res = this.m_world.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos);
+ if (res)
+ {
+ this.MakeChildAgent();
+ this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.CommsIPListenAddr), (ushort)neighbourRegion.CommsIPListenPort);
+ }
+ }
+ }
+ #endregion
+
+ ///
+ ///
+ ///
+ public static void LoadAnims()
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ public override void updateMovement()
+ {
+ newForce = false;
+ lock (this.forcesList)
+ {
+ if (this.forcesList.Count > 0)
+ {
+ for (int i = 0; i < this.forcesList.Count; i++)
+ {
+ NewForce force = this.forcesList[i];
+
+ this.updateflag = true;
+ this.Velocity = new LLVector3(force.X, force.Y, force.Z);
+ this.newForce = true;
+ }
+ for (int i = 0; i < this.forcesList.Count; i++)
+ {
+ this.forcesList.RemoveAt(0);
+ }
+ }
+ }
+ }
+
+ public static void LoadTextureFile(string name)
+ {
+ FileInfo fInfo = new FileInfo(name);
+ long numBytes = fInfo.Length;
+ FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
+ BinaryReader br = new BinaryReader(fStream);
+ byte[] data1 = br.ReadBytes((int)numBytes);
+ br.Close();
+ fStream.Close();
+ DefaultTexture = data1;
+ }
+
+ public class NewForce
+ {
+ public float X;
+ public float Y;
+ public float Z;
+
+ public NewForce()
+ {
+
+ }
+ }
+ }
+
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
new file mode 100644
index 0000000..eb8a117
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
@@ -0,0 +1,40 @@
+/*
+* 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.Environment.Scripting
+{
+ public interface IScriptContext
+ {
+ IScriptEntity Entity { get; }
+ bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
new file mode 100644
index 0000000..e813626
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
@@ -0,0 +1,46 @@
+/*
+* 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.Environment.Scripting
+{
+ public interface IScriptReadonlyEntity
+ {
+ LLVector3 Pos { get; }
+ string Name { get; }
+ }
+
+ public interface IScriptEntity
+ {
+ LLVector3 Pos { get; set; }
+ string Name { get; }
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
new file mode 100644
index 0000000..115b4f4
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
@@ -0,0 +1,126 @@
+/*
+* 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.Environment;
+using OpenSim.Region.Environment.Scenes;
+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
+using Primitive = OpenSim.Region.Environment.Scenes.Primitive;
+
+namespace OpenSim.Region.Environment.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/Region/Environment/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
new file mode 100644
index 0000000..5d398b0
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -0,0 +1,53 @@
+/*
+* 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.Environment.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/Region/Environment/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
new file mode 100644
index 0000000..0ce65ea
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
@@ -0,0 +1,35 @@
+/*
+* 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.Environment.Scripting
+{
+ public delegate Script ScriptFactory();
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
new file mode 100644
index 0000000..90c79e3
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
@@ -0,0 +1,64 @@
+/*
+* 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.Environment.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/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 2eb5ac0..0a82172 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -122,7 +122,7 @@
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
False
-
+
OpenSim.Region.Environment
{DCBA491C-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
diff --git a/OpenSim/Region/Simulation/Caps.cs b/OpenSim/Region/Simulation/Caps.cs
deleted file mode 100644
index 9edbd54..0000000
--- a/OpenSim/Region/Simulation/Caps.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Xml;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Types;
-using OpenSim.Region.Caches;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment
-{
- public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
-
- public class Caps
- {
- private string httpListenerAddress;
- private uint httpListenPort;
- private string capsObjectPath = "00001-";
- private string requestPath = "0000/";
- private string mapLayerPath = "0001/";
- private string newInventory = "0002/";
- private string requestTexture = "0003/";
- private string eventQueue = "0100/";
- private BaseHttpServer httpListener;
- private LLUUID agentID;
- private AssetCache assetCache;
- private int eventQueueCount = 1;
- private Queue CapsEventQueue = new Queue();
-
- public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
- {
- assetCache = assetCach;
- capsObjectPath = capsPath;
- httpListener = httpServer;
- httpListenerAddress = httpListen;
- httpListenPort = httpPort;
- agentID = agent;
- }
-
- ///
- ///
- ///
- public void RegisterHandlers()
- {
- Console.WriteLine("registering CAPS handlers");
- httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
- httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
- httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
- httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public string CapsRequest(string request, string path, string param)
- {
- // Console.WriteLine("Caps Request " + request);
- string result = "";
- result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
- return result;
- }
-
- ///
- ///
- ///
- ///
- protected LLSDCapsDetails GetCapabilities()
- {
- /* string capURLS = "";
- capURLS += "MapLayerhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "";
- capURLS += "NewFileAgentInventoryhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "";
- //capURLS += "RequestTextureDownloadhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "";
- //capURLS += "EventQueueGethttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "";
- return capURLS;*/
-
- LLSDCapsDetails caps = new LLSDCapsDetails();
- caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath;
- caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory;
- return caps;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public string MapLayer(string request, string path, string param)
- {
- Encoding _enc = System.Text.Encoding.UTF8;
- Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
- LLSDMapRequest mapReq = new LLSDMapRequest();
- LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
-
- LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
- mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
- string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
-
- //Console.WriteLine(" Maplayer response is " + res);
-
- return res;
- }
-
- ///
- ///
- ///
- ///
- protected LLSDMapLayer BuildLLSDMapLayerResponse()
- {
- LLSDMapLayer mapLayer = new LLSDMapLayer();
- mapLayer.Right = 5000;
- mapLayer.Top = 5000;
- mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
-
- return mapLayer;
- }
-
- public string ProcessEventQueue(string request, string path, string param)
- {
- // Console.WriteLine("event queue request " + request);
- string res = "";
- int timer = 0;
-
- /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
- {
- timer++;
- }*/
- if (this.CapsEventQueue.Count > 0)
- {
- lock (this.CapsEventQueue)
- {
- string item = CapsEventQueue.Dequeue();
- res = item;
- }
- }
- else
- {
- res = this.CreateEmptyEventResponse();
- }
- return res;
- }
-
- public string CreateEstablishAgentComms(string caps, string ipAddressPort)
- {
- string res = "id" + eventQueueCount + "";
- res += "events";
- res += "messageEstablishAgentCommunication";
- res += "body";
- res += "sim-ip-and-port" + ipAddressPort + "";
- res += "seed-capability" + caps + "";
- res += "agent-id" + this.agentID.ToStringHyphenated() + "";
- res += "";
- res += "";
- res += "";
- eventQueueCount++;
- this.CapsEventQueue.Enqueue(res);
- return res;
- }
-
- public string CreateEmptyEventResponse()
- {
- string res = "id" + eventQueueCount + "";
- res += "events";
- res += "";
- res += "";
- eventQueueCount++;
- return res;
- }
-
- public string NewAgentInventory(string request, string path, string param)
- {
- //Console.WriteLine("received upload request:"+ request);
- string res = "";
- LLUUID newAsset = LLUUID.Random();
- LLUUID newInvItem = LLUUID.Random();
- string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
- AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
- httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
- string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
- //Console.WriteLine("uploader url is " + uploaderURL);
- res += "";
- res += "uploader" + uploaderURL + "";
- //res += "successtrue";
- res += "stateupload";
- res += "";
- uploader.OnUpLoad += this.UploadHandler;
- return res;
- }
-
- public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
- {
- // Console.WriteLine("upload handler called");
- AssetBase asset;
- asset = new AssetBase();
- asset.FullID = assetID;
- asset.Type = 0;
- asset.InvType = 0;
- asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
- asset.Data = data;
- this.assetCache.AddAsset(asset);
- }
-
- public class AssetUploader
- {
- public event UpLoadedTexture OnUpLoad;
-
- private string uploaderPath = "";
- private LLUUID newAssetID;
- private LLUUID inventoryItemID;
- private BaseHttpServer httpListener;
- public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
- {
- newAssetID = assetID;
- inventoryItemID = inventoryItem;
- uploaderPath = path;
- httpListener = httpServer;
-
- }
-
- public string uploaderCaps(string request, string path, string param)
- {
- Encoding _enc = System.Text.Encoding.UTF8;
- byte[] data = _enc.GetBytes(request);
- //Console.WriteLine("recieved upload " + Util.FieldToString(data));
- LLUUID inv = this.inventoryItemID;
- string res = "";
- res += "";
- res += "new_asset" + newAssetID.ToStringHyphenated() + "";
- res += "new_inventory_item" + inv.ToStringHyphenated() + "";
- res += "statecomplete";
- res += "";
-
- // Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
- httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
- if (OnUpLoad != null)
- {
- OnUpLoad(newAssetID, inv, data);
- }
-
- /*FileStream fs = File.Create("upload.jp2");
- BinaryWriter bw = new BinaryWriter(fs);
- bw.Write(data);
- bw.Close();
- fs.Close();*/
- return res;
- }
- }
- }
-}
diff --git a/OpenSim/Region/Simulation/EstateManager.cs b/OpenSim/Region/Simulation/EstateManager.cs
deleted file mode 100644
index c2c1ecf..0000000
--- a/OpenSim/Region/Simulation/EstateManager.cs
+++ /dev/null
@@ -1,301 +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 OpenSim.Framework.Types;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim;
-using libsecondlife;
-using libsecondlife.Packets;
-using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
-
-
-namespace OpenSim.Region.Environment
-{
-
- ///
- /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
- ///
- public class EstateManager
- {
- private Scene m_world;
- private RegionInfo m_regInfo;
-
- public EstateManager(Scene world,RegionInfo reginfo)
- {
- m_world = world; //Estate settings found at world.m_regInfo.estateSettings
- m_regInfo = reginfo;
- }
-
- private bool convertParamStringToBool(byte[] field)
- {
- string s = Helpers.FieldToUTF8String(field);
- if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true")
- {
- return true;
- }
- return false;
- }
-
- public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, IClientAPI remote_client)
- {
- if (remote_client.AgentId == m_regInfo.MasterAvatarAssignedUUID)
- {
- switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
- {
- case "getinfo":
- Console.WriteLine("GETINFO Requested");
- this.sendRegionInfoPacketToAll();
-
- break;
- case "setregioninfo":
- if (packet.ParamList.Length != 9)
- {
- OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
- }
- else
- {
- m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;
-
- if (convertParamStringToBool(packet.ParamList[0].Parameter))
- {
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;
- }
-
- if (convertParamStringToBool(packet.ParamList[1].Parameter))
- {
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;
- }
-
- if (convertParamStringToBool(packet.ParamList[2].Parameter))
- {
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;
- }
-
- if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
- {
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;
- }
-
-
- int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter)));
- m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents;
-
- float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
- m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
-
- int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
- m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;
-
-
- if (convertParamStringToBool(packet.ParamList[7].Parameter))
- {
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;
- }
-
- if (convertParamStringToBool(packet.ParamList[8].Parameter))
- {
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;
- }
-
- sendRegionInfoPacketToAll();
-
- }
- break;
- case "texturebase":
- foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
- {
- string s = Helpers.FieldToUTF8String(block.Parameter);
- string[] splitField = s.Split(' ');
- if (splitField.Length == 2)
- {
- LLUUID tempUUID = new LLUUID(splitField[1]);
- switch (Convert.ToInt16(splitField[0]))
- {
- case 0:
- m_regInfo.estateSettings.terrainBase0 = tempUUID;
- break;
- case 1:
- m_regInfo.estateSettings.terrainBase1 = tempUUID;
- break;
- case 2:
- m_regInfo.estateSettings.terrainBase2 = tempUUID;
- break;
- case 3:
- m_regInfo.estateSettings.terrainBase3 = tempUUID;
- break;
- }
- }
- }
- break;
- case "texturedetail":
- foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
- {
-
- string s = Helpers.FieldToUTF8String(block.Parameter);
- string[] splitField = s.Split(' ');
- if (splitField.Length == 2)
- {
- LLUUID tempUUID = new LLUUID(splitField[1]);
- switch (Convert.ToInt16(splitField[0]))
- {
- case 0:
- m_regInfo.estateSettings.terrainDetail0 = tempUUID;
- break;
- case 1:
- m_regInfo.estateSettings.terrainDetail1 = tempUUID;
- break;
- case 2:
- m_regInfo.estateSettings.terrainDetail2 = tempUUID;
- break;
- case 3:
- m_regInfo.estateSettings.terrainDetail3 = tempUUID;
- break;
- }
- }
- }
- break;
- case "textureheights":
- foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
- {
-
- string s = Helpers.FieldToUTF8String(block.Parameter);
- string[] splitField = s.Split(' ');
- if (splitField.Length == 3)
- {
-
- float tempHeightLow = (float)Convert.ToDecimal(splitField[1]);
- float tempHeightHigh = (float)Convert.ToDecimal(splitField[2]);
-
- switch (Convert.ToInt16(splitField[0]))
- {
- case 0:
- m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow;
- m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh;
- break;
- case 1:
- m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow;
- m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh;
- break;
- case 2:
- m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow;
- m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh;
- break;
- case 3:
- m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow;
- m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh;
- break;
- }
- }
- }
- break;
- case "texturecommit":
- sendRegionHandshakeToAll();
- break;
- case "setregionterrain":
- if (packet.ParamList.Length != 9)
- {
- OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
- }
- else
- {
- m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter));
- m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter));
- m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter));
- m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter);
- m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
-
- sendRegionInfoPacketToAll();
- }
- break;
- default:
- OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
- break;
- }
- }
- }
-
- public void sendRegionInfoPacketToAll()
- {
- List avatars = m_world.RequestAvatarList();
-
- for (int i = 0; i < avatars.Count; i++)
- {
- this.sendRegionInfoPacket(avatars[i].ControllingClient);
- }
- }
-
- public void sendRegionHandshakeToAll()
- {
- List avatars = m_world.RequestAvatarList();
-
- for (int i = 0; i < avatars.Count; i++)
- {
- this.sendRegionHandshake(avatars[i].ControllingClient);
- }
- }
-
- public void sendRegionInfoPacket(IClientAPI remote_client)
- {
- Encoding _enc = System.Text.Encoding.ASCII;
-
- AgentCircuitData circuitData = remote_client.RequestClientInfo();
-
- RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
- regionInfoPacket.AgentData.AgentID = circuitData.AgentID;
- regionInfoPacket.AgentData.SessionID = circuitData.SessionID;
- regionInfoPacket.RegionInfo.BillableFactor = m_regInfo.estateSettings.billableFactor;
- regionInfoPacket.RegionInfo.EstateID = m_regInfo.estateSettings.estateID;
- regionInfoPacket.RegionInfo.MaxAgents = m_regInfo.estateSettings.maxAgents;
- regionInfoPacket.RegionInfo.ObjectBonusFactor = m_regInfo.estateSettings.objectBonusFactor;
- regionInfoPacket.RegionInfo.ParentEstateID = m_regInfo.estateSettings.parentEstateID;
- regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.estateSettings.pricePerMeter;
- regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.estateSettings.redirectGridX;
- regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.estateSettings.redirectGridY;
- regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags;
- regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess;
- regionInfoPacket.RegionInfo.SimName = _enc.GetBytes( m_regInfo.RegionName);
- regionInfoPacket.RegionInfo.SunHour = m_regInfo.estateSettings.sunHour;
- regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.estateSettings.terrainLowerLimit;
- regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.estateSettings.terrainRaiseLimit;
- regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.estateSettings.useFixedSun;
- regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.estateSettings.waterHeight;
-
- remote_client.OutPacket(regionInfoPacket);
- }
-
- public void sendRegionHandshake(IClientAPI remoteClient)
- {
- remoteClient.SendRegionHandshake(m_regInfo);
- }
-
- }
-}
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
deleted file mode 100644
index 3f8b60d..0000000
--- a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {DCBA491C-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenSim.Region.Environment
- JScript
- Grid
- IE50
- false
- Library
-
- OpenSim.Region.Environment
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- ..\..\..\bin\Axiom.MathLib.dll
- False
-
-
- ..\..\..\bin\Db4objects.Db4o.dll
- False
-
-
- ..\..\..\bin\libsecondlife.dll
- False
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- ..\..\..\bin\XMLRPC.dll
- False
-
-
-
-
- OpenSim.Framework
- {8ACA2445-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.Communications
- {CB52B7E7-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.Console
- {A7CD0630-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.GenericConfig.Xml
- {C74E4A30-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.Servers
- {2CC71860-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Region.Caches
- {61FCCDB3-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Region.Physics.Manager
- {F4FF31EB-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Region.Terrain.BasicTerrain
- {C9E0F891-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim/Region/Simulation/ParcelManager.cs b/OpenSim/Region/Simulation/ParcelManager.cs
deleted file mode 100644
index 1cab4ab..0000000
--- a/OpenSim/Region/Simulation/ParcelManager.cs
+++ /dev/null
@@ -1,892 +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.Framework.Types;
-using OpenSim.Region.Environment.Scenes;
-using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
-
-namespace OpenSim.Region.Environment
-{
-
-
- #region ParcelManager Class
- ///
- /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
- ///
- public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver
- {
-
- #region Constants
- //Parcel types set with flags in ParcelOverlay.
- //Only one of these can be used.
- public const byte PARCEL_TYPE_PUBLIC = (byte)0; //Equals 00000000
- public const byte PARCEL_TYPE_OWNED_BY_OTHER = (byte)1; //Equals 00000001
- public const byte PARCEL_TYPE_OWNED_BY_GROUP = (byte)2; //Equals 00000010
- public const byte PARCEL_TYPE_OWNED_BY_REQUESTER = (byte)3; //Equals 00000011
- public const byte PARCEL_TYPE_IS_FOR_SALE = (byte)4; //Equals 00000100
- public const byte PARCEL_TYPE_IS_BEING_AUCTIONED = (byte)5; //Equals 00000101
-
-
- //Flags that when set, a border on the given side will be placed
- //NOTE: North and East is assumable by the west and south sides (if parcel to east has a west border, then I have an east border; etc)
- //This took forever to figure out -- jeesh. /blame LL for even having to send these
- public const byte PARCEL_FLAG_PROPERTY_BORDER_WEST = (byte)64; //Equals 01000000
- public const byte PARCEL_FLAG_PROPERTY_BORDER_SOUTH = (byte)128; //Equals 10000000
-
- //RequestResults (I think these are right, they seem to work):
- public const int PARCEL_RESULT_ONE_PARCEL = 0; // The request they made contained only one parcel
- public const int PARCEL_RESULT_MULTIPLE_PARCELS = 1; // The request they made contained more than one parcel
-
- //These are other constants. Yay!
- public const int START_PARCEL_LOCAL_ID = 1;
- #endregion
-
- #region Member Variables
- public Dictionary parcelList = new Dictionary();
- private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
- private int[,] parcelIDList = new int[64, 64];
-
- private Scene m_world;
- private RegionInfo m_regInfo;
-
- #endregion
-
- #region Constructors
- public ParcelManager(Scene world, RegionInfo reginfo)
- {
-
- m_world = world;
- m_regInfo = reginfo;
- parcelIDList.Initialize();
-
- }
- #endregion
-
- #region Member Functions
-
- #region Parcel From Storage Functions
- public void ParcelFromStorage(ParcelData data)
- {
- Parcel new_parcel = new Parcel(data.ownerID, data.isGroupOwned, m_world);
- new_parcel.parcelData = data.Copy();
- new_parcel.setParcelBitmapFromByteArray();
- addParcel(new_parcel);
-
- }
-
- public void NoParcelDataFromStorage()
- {
- resetSimParcels();
- }
- #endregion
-
- #region Parcel Add/Remove/Get/Create
- ///
- /// Creates a basic Parcel object without an owner (a zeroed key)
- ///
- ///
- public Parcel createBaseParcel()
- {
- return new Parcel(new LLUUID(), false, m_world);
- }
-
- ///
- /// Adds a parcel to the stored list and adds them to the parcelIDList to what they own
- ///
- /// The parcel being added
- public void addParcel(Parcel new_parcel)
- {
- lastParcelLocalID++;
- new_parcel.parcelData.localID = lastParcelLocalID;
- parcelList.Add(lastParcelLocalID, new_parcel.Copy());
-
-
- bool[,] parcelBitmap = new_parcel.getParcelBitmap();
- int x, y;
- for (x = 0; x < 64; x++)
- {
- for (y = 0; y < 64; y++)
- {
- if (parcelBitmap[x, y])
- {
- parcelIDList[x, y] = lastParcelLocalID;
- }
- }
- }
- parcelList[lastParcelLocalID].forceUpdateParcelInfo();
-
-
- }
- ///
- /// Removes a parcel from the list. Will not remove if local_id is still owning an area in parcelIDList
- ///
- /// Parcel.localID of the parcel to remove.
- public void removeParcel(int local_id)
- {
- int x, y;
- for (x = 0; x < 64; x++)
- {
- for (y = 0; y < 64; y++)
- {
- if (parcelIDList[x, y] == local_id)
- {
- throw new Exception("Could not remove parcel. Still being used at " + x + ", " + y);
- }
- }
- }
- m_world.localStorage.RemoveParcel(parcelList[local_id].parcelData);
- parcelList.Remove(local_id);
- }
-
- private void performFinalParcelJoin(Parcel master, Parcel slave)
- {
- int x, y;
- bool[,] parcelBitmapSlave = slave.getParcelBitmap();
- for (x = 0; x < 64; x++)
- {
- for (y = 0; y < 64; y++)
- {
- if (parcelBitmapSlave[x, y])
- {
- parcelIDList[x, y] = master.parcelData.localID;
- }
- }
- }
- removeParcel(slave.parcelData.localID);
- }
- ///
- /// Get the parcel at the specified point
- ///
- /// Value between 0 - 256 on the x axis of the point
- /// Value between 0 - 256 on the y axis of the point
- /// Parcel at the point supplied
- public Parcel getParcel(int x, int y)
- {
- if (x > 256 || y > 256 || x < 0 || y < 0)
- {
- throw new Exception("Error: Parcel not found at point " + x + ", " + y);
- }
- else
- {
- return parcelList[parcelIDList[x / 4, y / 4]];
- }
-
- }
- #endregion
-
- #region Parcel Modification
- ///
- /// Subdivides a parcel
- ///
- /// West Point
- /// South Point
- /// East Point
- /// North Point
- /// LLUUID of user who is trying to subdivide
- /// Returns true if successful
- private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
- {
- //First, lets loop through the points and make sure they are all in the same parcel
- //Get the parcel at start
- Parcel startParcel = getParcel(start_x, start_y);
- if (startParcel == null) return false; //No such parcel at the beginning
-
- //Loop through the points
- try
- {
- int totalX = end_x - start_x;
- int totalY = end_y - start_y;
- int x, y;
- for (y = 0; y < totalY; y++)
- {
- for (x = 0; x < totalX; x++)
- {
- Parcel tempParcel = getParcel(start_x + x, start_y + y);
- if (tempParcel == null) return false; //No such parcel at that point
- if (tempParcel != startParcel) return false; //Subdividing over 2 parcels; no-no
- }
- }
- }
- catch (Exception)
- {
- return false; //Exception. For now, lets skip subdivision
- }
-
- //If we are still here, then they are subdividing within one parcel
- //Check owner
- if (startParcel.parcelData.ownerID != attempting_user_id)
- {
- return false; //They cant do this!
- }
-
- //Lets create a new parcel with bitmap activated at that point (keeping the old parcels info)
- Parcel newParcel = startParcel.Copy();
- newParcel.parcelData.parcelName = "Subdivision of " + newParcel.parcelData.parcelName;
- newParcel.parcelData.globalID = LLUUID.Random();
-
- newParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(start_x, start_y, end_x, end_y));
-
- //Now, lets set the subdivision area of the original to false
- int startParcelIndex = startParcel.parcelData.localID;
- parcelList[startParcelIndex].setParcelBitmap(Parcel.modifyParcelBitmapSquare(startParcel.getParcelBitmap(), start_x, start_y, end_x, end_y, false));
- parcelList[startParcelIndex].forceUpdateParcelInfo();
-
-
- //Now add the new parcel
- addParcel(newParcel);
-
-
-
-
-
- return true;
- }
- ///
- /// Join 2 parcels together
- ///
- /// x value in first parcel
- /// y value in first parcel
- /// x value in second parcel
- /// y value in second parcel
- /// LLUUID of the avatar trying to join the parcels
- /// Returns true if successful
- private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
- {
- end_x -= 4;
- end_y -= 4;
-
- //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
- //This should be fixed later -- somewhat "incomplete code" --Ming
- Parcel startParcel, endParcel;
-
- try
- {
- startParcel = getParcel(start_x, start_y);
- endParcel = getParcel(end_x, end_y);
- }
- catch (Exception)
- {
- return false; //Error occured when trying to get the start and end parcels
- }
- if (startParcel == endParcel)
- {
- return false; //Subdivision of the same parcel is not allowed
- }
-
- //Check the parcel owners:
- if (startParcel.parcelData.ownerID != endParcel.parcelData.ownerID)
- {
- return false;
- }
- if (startParcel.parcelData.ownerID != attempting_user_id)
- {
- //TODO: Group editing stuff. Avatar owner support for now
- return false;
- }
-
- //Same owners! Lets join them
- //Merge them to startParcel
- parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
- performFinalParcelJoin(startParcel, endParcel);
-
- return true;
-
-
-
- }
- #endregion
-
- #region Parcel Updating
- ///
- /// Where we send the ParcelOverlay packet to the client
- ///
- /// The object representing the client
- public void sendParcelOverlay(IClientAPI remote_client)
- {
- const int PARCEL_BLOCKS_PER_PACKET = 1024;
- int x, y = 0;
- byte[] byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
- int byteArrayCount = 0;
- int sequenceID = 0;
- ParcelOverlayPacket packet;
-
- for (y = 0; y < 64; y++)
- {
- for (x = 0; x < 64; x++)
- {
- byte tempByte = (byte)0; //This represents the byte for the current 4x4
- Parcel currentParcelBlock = getParcel(x * 4, y * 4);
-
- if (currentParcelBlock.parcelData.ownerID == remote_client.AgentId)
- {
- //Owner Flag
- tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_REQUESTER);
- }
- else if (currentParcelBlock.parcelData.salePrice > 0 && (currentParcelBlock.parcelData.authBuyerID == LLUUID.Zero || currentParcelBlock.parcelData.authBuyerID == remote_client.AgentId))
- {
- //Sale Flag
- tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);
- }
- else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)
- {
- //Public Flag
- tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
- }
- else
- {
- //Other Flag
- tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_OTHER);
- }
-
-
- //Now for border control
- if (x == 0)
- {
- tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
- }
- else if (getParcel((x - 1) * 4, y * 4) != currentParcelBlock)
- {
- tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
- }
-
- if (y == 0)
- {
- tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
- }
- else if (getParcel(x * 4, (y - 1) * 4) != currentParcelBlock)
- {
- tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
- }
-
- byteArray[byteArrayCount] = tempByte;
- byteArrayCount++;
- if (byteArrayCount >= PARCEL_BLOCKS_PER_PACKET)
- {
- byteArrayCount = 0;
- packet = new ParcelOverlayPacket();
- packet.ParcelData.Data = byteArray;
- packet.ParcelData.SequenceID = sequenceID;
- remote_client.OutPacket((Packet)packet);
- sequenceID++;
- byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
- }
- }
- }
-
- packet = new ParcelOverlayPacket();
- packet.ParcelData.Data = byteArray;
- packet.ParcelData.SequenceID = sequenceID; //Eh?
- remote_client.OutPacket((Packet)packet);
- }
-
- public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)
- {
- //Get the parcels within the bounds
- List temp = new List();
- int x, y, i;
- int inc_x = end_x - start_x;
- int inc_y = end_y - start_y;
- for (x = 0; x < inc_x; x++)
- {
- for (y = 0; y < inc_y; y++)
- {
- OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);
- if (!temp.Contains(currentParcel))
- {
- currentParcel.forceUpdateParcelInfo();
- temp.Add(currentParcel);
- }
- }
- }
-
- int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL;
- if (temp.Count > 1)
- {
- requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;
- }
-
- for (i = 0; i < temp.Count; i++)
- {
- temp[i].sendParcelProperties(sequence_id, snap_selection, requestResult, remote_client);
- }
-
-
- sendParcelOverlay(remote_client);
- }
-
- public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
- {
- if (parcelList.ContainsKey(packet.ParcelData.LocalID))
- {
- parcelList[packet.ParcelData.LocalID].updateParcelProperties(packet, remote_client);
- }
- }
- public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
- {
- subdivide(west, south, east, north, remote_client.AgentId);
- }
- public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
- {
- join(west, south, east, north, remote_client.AgentId);
-
- }
- #endregion
-
- ///
- /// Resets the sim to the default parcel (full sim parcel owned by the default user)
- ///
- public void resetSimParcels()
- {
- //Remove all the parcels in the sim and add a blank, full sim parcel set to public
- parcelList.Clear();
- lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
- parcelIDList.Initialize();
-
- Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world);
-
- fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
- fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
- fullSimParcel.parcelData.parcelDesc = "";
-
- fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
- fullSimParcel.parcelData.salePrice = 1;
- fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
- fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
-
- addParcel(fullSimParcel);
-
- }
- #endregion
- }
- #endregion
-
-
- #region Parcel Class
- ///
- /// Keeps track of a specific parcel's information
- ///
- public class Parcel
- {
- #region Member Variables
- public ParcelData parcelData = new ParcelData();
- public Scene m_world;
-
- private bool[,] parcelBitmap = new bool[64, 64];
-
- #endregion
-
-
- #region Constructors
- public Parcel(LLUUID owner_id, bool is_group_owned, Scene world)
- {
- m_world = world;
- parcelData.ownerID = owner_id;
- parcelData.isGroupOwned = is_group_owned;
-
- }
- #endregion
-
-
- #region Member Functions
-
- #region General Functions
- ///
- /// Checks to see if this parcel contains a point
- ///
- ///
- ///
- /// Returns true if the parcel contains the specified point
- public bool containsPoint(int x, int y)
- {
- if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
- {
- return (parcelBitmap[x / 4, y / 4] == true);
- }
- else
- {
- return false;
- }
- }
-
- public Parcel Copy()
- {
- Parcel newParcel = new Parcel(this.parcelData.ownerID, this.parcelData.isGroupOwned, m_world);
-
- //Place all new variables here!
- newParcel.parcelBitmap = (bool[,])(this.parcelBitmap.Clone());
- newParcel.parcelData = parcelData.Copy();
-
- return newParcel;
- }
-
- #endregion
-
-
- #region Packet Request Handling
- ///
- /// Sends parcel properties as requested
- ///
- /// ID sent by client for them to keep track of
- /// Bool sent by client for them to use
- /// Object representing the client
- public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
- {
-
- ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();
- updatePacket.ParcelData.AABBMax = parcelData.AABBMax;
- updatePacket.ParcelData.AABBMin = parcelData.AABBMin;
- updatePacket.ParcelData.Area = parcelData.area;
- updatePacket.ParcelData.AuctionID = parcelData.auctionID;
- updatePacket.ParcelData.AuthBuyerID = parcelData.authBuyerID; //unemplemented
-
- updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
-
- updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);
- updatePacket.ParcelData.Category = (byte)parcelData.category;
- updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
- updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
- updatePacket.ParcelData.GroupID = parcelData.groupID;
- updatePacket.ParcelData.GroupPrims = parcelData.groupPrims;
- updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;
- updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;
- updatePacket.ParcelData.LocalID = parcelData.localID;
- updatePacket.ParcelData.MaxPrims = 1000; //unemplemented
- updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;
- updatePacket.ParcelData.MediaID = parcelData.mediaID;
- updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);
- updatePacket.ParcelData.MusicURL = Helpers.StringToField(parcelData.musicURL);
- updatePacket.ParcelData.Name = Helpers.StringToField(parcelData.parcelName);
- updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
- updatePacket.ParcelData.OtherCount = 0; //unemplemented
- updatePacket.ParcelData.OtherPrims = 0; //unemplented
- updatePacket.ParcelData.OwnerID = parcelData.ownerID;
- updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
- updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented
- updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented
- updatePacket.ParcelData.PassHours = parcelData.passHours;
- updatePacket.ParcelData.PassPrice = parcelData.passPrice;
- updatePacket.ParcelData.PublicCount = 0; //unemplemented
- updatePacket.ParcelData.RegionDenyAnonymous = false; //unemplemented
- updatePacket.ParcelData.RegionDenyIdentified = false; //unemplemented
- updatePacket.ParcelData.RegionDenyTransacted = false; //unemplemented
- updatePacket.ParcelData.RegionPushOverride = true; //unemplemented
- updatePacket.ParcelData.RentPrice = 0; //??
- updatePacket.ParcelData.RequestResult = request_result;
- updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented
- updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented
- updatePacket.ParcelData.SelfCount = 0;//unemplemented
- updatePacket.ParcelData.SequenceID = sequence_id;
- updatePacket.ParcelData.SimWideMaxPrims = 15000; //unemplemented
- updatePacket.ParcelData.SimWideTotalPrims = 0; //unemplemented
- updatePacket.ParcelData.SnapSelection = snap_selection;
- updatePacket.ParcelData.SnapshotID = parcelData.snapshotID;
- updatePacket.ParcelData.Status = (byte)parcelData.parcelStatus;
- updatePacket.ParcelData.TotalPrims = 0; //unemplemented
- updatePacket.ParcelData.UserLocation = parcelData.userLocation;
- updatePacket.ParcelData.UserLookAt = parcelData.userLookAt;
- remote_client.OutPacket((Packet)updatePacket);
- }
-
- public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
- {
- if (remote_client.AgentId == parcelData.ownerID)
- {
- //Needs later group support
- parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
- parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
- parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
- parcelData.groupID = packet.ParcelData.GroupID;
- parcelData.landingType = packet.ParcelData.LandingType;
- parcelData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
- parcelData.mediaID = packet.ParcelData.MediaID;
- parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
- parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
- parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);
- parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
- parcelData.passHours = packet.ParcelData.PassHours;
- parcelData.passPrice = packet.ParcelData.PassPrice;
- parcelData.salePrice = packet.ParcelData.SalePrice;
- parcelData.snapshotID = packet.ParcelData.SnapshotID;
- parcelData.userLocation = packet.ParcelData.UserLocation;
- parcelData.userLookAt = packet.ParcelData.UserLookAt;
-
- List avatars = m_world.RequestAvatarList();
-
- for (int i = 0; i < avatars.Count; i++)
- {
- Parcel over = m_world.parcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));
- if (over == this)
- {
- sendParcelProperties(0, false, 0, avatars[i].ControllingClient);
- }
- }
-
- }
- }
- #endregion
-
-
- #region Update Functions
- ///
- /// Updates the AABBMin and AABBMax values after area/shape modification of parcel
- ///
- private void updateAABBAndAreaValues()
- {
- int min_x = 64;
- int min_y = 64;
- int max_x = 0;
- int max_y = 0;
- int tempArea = 0;
- int x, y;
- for (x = 0; x < 64; x++)
- {
- for (y = 0; y < 64; y++)
- {
- if (parcelBitmap[x, y] == true)
- {
- if (min_x > x) min_x = x;
- if (min_y > y) min_y = y;
- if (max_x < x) max_x = x;
- if (max_y < y) max_y = y;
- tempArea += 16; //16sqm parcel
- }
- }
- }
- parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);
- parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);
- parcelData.area = tempArea;
- }
-
- public void updateParcelBitmapByteArray()
- {
- parcelData.parcelBitmapByteArray = convertParcelBitmapToBytes();
- }
-
- ///
- /// Update all settings in parcel such as area, bitmap byte array, etc
- ///
- public void forceUpdateParcelInfo()
- {
- this.updateAABBAndAreaValues();
- this.updateParcelBitmapByteArray();
- }
-
- public void setParcelBitmapFromByteArray()
- {
- parcelBitmap = convertBytesToParcelBitmap();
- }
- #endregion
-
-
- #region Parcel Bitmap Functions
- ///
- /// Sets the parcel's bitmap manually
- ///
- /// 64x64 block representing where this parcel is on a map
- public void setParcelBitmap(bool[,] bitmap)
- {
- if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
- {
- //Throw an exception - The bitmap is not 64x64
- throw new Exception("Error: Invalid Parcel Bitmap");
- }
- else
- {
- //Valid: Lets set it
- parcelBitmap = bitmap;
- forceUpdateParcelInfo();
-
- }
- }
- ///
- /// Gets the parcels bitmap manually
- ///
- ///
- public bool[,] getParcelBitmap()
- {
- return parcelBitmap;
- }
- ///
- /// Converts the parcel bitmap to a packet friendly byte array
- ///
- ///
- private byte[] convertParcelBitmapToBytes()
- {
- byte[] tempConvertArr = new byte[512];
- byte tempByte = 0;
- int x, y, i, byteNum = 0;
- i = 0;
- for (y = 0; y < 64; y++)
- {
- for (x = 0; x < 64; x++)
- {
- tempByte = Convert.ToByte(tempByte | Convert.ToByte(parcelBitmap[x, y]) << (i++ % 8));
- if (i % 8 == 0)
- {
- tempConvertArr[byteNum] = tempByte;
- tempByte = (byte)0;
- i = 0;
- byteNum++;
- }
- }
- }
- return tempConvertArr;
- }
-
- private bool[,] convertBytesToParcelBitmap()
- {
- bool[,] tempConvertMap = new bool[64, 64];
- tempConvertMap.Initialize();
- byte tempByte = 0;
- int x = 0, y = 0, i = 0, bitNum = 0;
- for (i = 0; i < 512; i++)
- {
- tempByte = parcelData.parcelBitmapByteArray[i];
- for (bitNum = 0; bitNum < 8; bitNum++)
- {
- bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);
- tempConvertMap[x, y] = bit;
- x++;
- if (x > 63)
- {
- x = 0;
- y++;
- }
-
- }
-
- }
- return tempConvertMap;
- }
- ///
- /// Full sim parcel creation
- ///
- ///
- public static bool[,] basicFullRegionParcelBitmap()
- {
- return getSquareParcelBitmap(0, 0, 256, 256);
- }
-
- ///
- /// Used to modify the bitmap between the x and y points. Points use 64 scale
- ///
- ///
- ///
- ///
- ///
- ///
- public static bool[,] getSquareParcelBitmap(int start_x, int start_y, int end_x, int end_y)
- {
-
- bool[,] tempBitmap = new bool[64, 64];
- tempBitmap.Initialize();
-
- tempBitmap = modifyParcelBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
- return tempBitmap;
- }
-
- ///
- /// Change a parcel's bitmap at within a square and set those points to a specific value
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public static bool[,] modifyParcelBitmapSquare(bool[,] parcel_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)
- {
- if (parcel_bitmap.GetLength(0) != 64 || parcel_bitmap.GetLength(1) != 64 || parcel_bitmap.Rank != 2)
- {
- //Throw an exception - The bitmap is not 64x64
- throw new Exception("Error: Invalid Parcel Bitmap in modifyParcelBitmapSquare()");
- }
-
- int x, y;
- for (y = 0; y < 64; y++)
- {
- for (x = 0; x < 64; x++)
- {
- if (x >= start_x / 4 && x < end_x / 4
- && y >= start_y / 4 && y < end_y / 4)
- {
- parcel_bitmap[x, y] = set_value;
- }
- }
- }
- return parcel_bitmap;
- }
- ///
- /// Join the true values of 2 bitmaps together
- ///
- ///
- ///
- ///
- public static bool[,] mergeParcelBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
- {
- if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
- {
- //Throw an exception - The bitmap is not 64x64
- throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeParcelBitmaps");
- }
- if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
- {
- //Throw an exception - The bitmap is not 64x64
- throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeParcelBitmaps");
-
- }
-
- int x, y;
- for (y = 0; y < 64; y++)
- {
- for (x = 0; x < 64; x++)
- {
- if (bitmap_add[x, y])
- {
- bitmap_base[x, y] = true;
- }
- }
- }
- return bitmap_base;
- }
- #endregion
-
- #endregion
-
-
- }
- #endregion
-
-
-}
diff --git a/OpenSim/Region/Simulation/RegionManager.cs b/OpenSim/Region/Simulation/RegionManager.cs
deleted file mode 100644
index 17d9aad..0000000
--- a/OpenSim/Region/Simulation/RegionManager.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Servers;
-
-namespace OpenSim.Region.Environment
-{
- public class RegionManager //needs renaming , but first we need to rename the namespace
- {
- protected AuthenticateSessionsBase authenticateHandler;
- protected RegionCommsListener regionCommsHost;
- protected CommunicationsManager commsManager;
- protected List capsHandlers = new List();
- protected BaseHttpServer httpListener;
-
- protected Scenes.Scene m_Scene;
-
- public ParcelManager parcelManager;
- public EstateManager estateManager;
-
- public RegionManager()
- {
-
- }
-
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/Entity.cs b/OpenSim/Region/Simulation/Scenes/Entity.cs
deleted file mode 100644
index bbba34d..0000000
--- a/OpenSim/Region/Simulation/Scenes/Entity.cs
+++ /dev/null
@@ -1,194 +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.Environment.Scripting;
-
-namespace OpenSim.Region.Environment.Scenes
-{
- public abstract class Entity : IScriptReadonlyEntity
- {
- public libsecondlife.LLUUID uuid;
- public Quaternion rotation;
- protected List children;
-
- protected PhysicsActor _physActor;
- protected Scene m_world;
- protected string m_name;
-
- ///
- ///
- ///
- public virtual string Name
- {
- get { return m_name; }
- }
-
- protected LLVector3 m_pos;
- ///
- ///
- ///
- 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;
- }
- }
-
- public LLVector3 velocity;
-
- ///
- ///
- ///
- public virtual LLVector3 Velocity
- {
- get
- {
- if (this._physActor != null)
- {
- velocity.X = _physActor.Velocity.X;
- velocity.Y = _physActor.Velocity.Y;
- velocity.Z = _physActor.Velocity.Z;
- }
-
- return velocity;
- }
- set
- {
- if (this._physActor != null)
- {
- try
- {
- lock (this.m_world.SyncRoot)
- {
-
- this._physActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z);
- }
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
-
- velocity = value;
- }
- }
-
- protected uint m_localId;
-
- public uint LocalId
- {
- get { return m_localId; }
- }
-
- ///
- /// Creates a new Entity (should not occur on it's own)
- ///
- public Entity()
- {
- uuid = new libsecondlife.LLUUID();
-
- m_pos = new LLVector3();
- velocity = new LLVector3();
- rotation = new Quaternion();
- m_name = "(basic entity)";
- children = new List();
- }
-
- ///
- ///
- ///
- public virtual void updateMovement()
- {
- foreach (Entity child in children)
- {
- child.updateMovement();
- }
- }
-
- ///
- /// 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/Region/Simulation/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
deleted file mode 100644
index 36023d0..0000000
--- a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-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;
-
-namespace OpenSim.Region.Environment.Scenes
-{
- public interface IScenePresenceBody
- {
- void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
- void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
- void SendOurAppearance(IClientAPI OurClient);
- void SendAppearanceToOtherAgent(ScenePresence avatarInfo);
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/Primitive.cs b/OpenSim/Region/Simulation/Scenes/Primitive.cs
deleted file mode 100644
index 0f649b2..0000000
--- a/OpenSim/Region/Simulation/Scenes/Primitive.cs
+++ /dev/null
@@ -1,582 +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.Environment.Scenes
-{
- 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 uint flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
-
- 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 = m_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 = m_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.Environment.Scenes.Primitive)
- {
- dataArrays.Add(((OpenSim.Region.Environment.Scenes.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.TextureEntry = 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-9999-000000000005"), this.flags);
- }
-
- ///
- ///
- ///
- 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) //is this needed ? doesn't the property fields do this for us?
- {
- 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;
- }
- LLQuaternion mRot = new LLQuaternion(lRot.x, lRot.y, lRot.z, lRot.w);
- RemoteClient.SendPrimTerseUpdate(this.m_regionHandle, 64096, this.LocalId, lPos, mRot);
- }
-
- ///
- ///
- ///
- 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 = m_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)
- {
-
- }
-
- public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
- {
- // Console.WriteLine("moving prim to new location " + pos.X + " , " + pos.Y + " , " + pos.Z);
- this.Pos = pos;
- this.SendTerseUpdateToALLClients();
- }
-
- 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)primData.CreationDate;
- proper.ObjectData[0].CreatorID = 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 = 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 = primData.OwnerMask;
- proper.ObjectData[0].NextOwnerMask = primData.NextOwnerMask;
- proper.ObjectData[0].GroupMask = primData.GroupMask;
- proper.ObjectData[0].EveryoneMask = primData.EveryoneMask;
- proper.ObjectData[0].BaseMask = primData.BaseMask;
-
- client.OutPacket(proper);
-
- }
-
- #endregion
-
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
deleted file mode 100644
index 1d55c4d..0000000
--- a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
+++ /dev/null
@@ -1,305 +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.Environment.Scenes
-{
- public partial class Scene
- {
- ///
- /// Modifies terrain using the specified information
- ///
- /// The height at which the user started modifying the terrain
- /// The number of seconds the modify button was pressed
- /// The size of the brush used
- /// The action to be performed
- /// Distance from the north border where the cursor is located
- /// Distance from the west border where the cursor is located
- public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west)
- {
- // Shiny.
- double size = (double)(1 << brushsize);
-
- switch (action)
- {
- case 0:
- // flatten terrain
- Terrain.flatten(north, west, size, (double)seconds / 100.0);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
- case 1:
- // raise terrain
- Terrain.raise(north, west, size, (double)seconds / 100.0);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
- case 2:
- //lower terrain
- Terrain.lower(north, west, size, (double)seconds / 100.0);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
- case 3:
- // smooth terrain
- Terrain.smooth(north, west, size, (double)seconds / 100.0);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
- case 4:
- // noise
- Terrain.noise(north, west, size, (double)seconds / 100.0);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
- case 5:
- // revert
- Terrain.revert(north, west, size, (double)seconds / 100.0);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
-
- // CLIENT EXTENSIONS GO HERE
- case 128:
- // erode-thermal
- break;
- case 129:
- // erode-aerobic
- break;
- case 130:
- // erode-hydraulic
- break;
- }
- return;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
- {
- Console.WriteLine("Chat message");
- ScenePresence 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)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.LocalId == primLocalID)
- {
- ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);
- break;
- }
- }
- }
-
- public void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
- {
- if (this.Entities.ContainsKey(objectID))
- {
- ((Primitive)this.Entities[objectID]).GrapMovement(offset, pos, 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.Environment.Scenes.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/Region/Simulation/Scenes/Scene.Scripting.cs b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
deleted file mode 100644
index 2249c3d..0000000
--- a/OpenSim/Region/Simulation/Scenes/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.Environment.Scenes
-{
- 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 ScenePresence)
- {
- res = entity.LocalId;
- }
- }
- return res;
- }
-
- #endregion
-
-
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.cs b/OpenSim/Region/Simulation/Scenes/Scene.cs
deleted file mode 100644
index e71f601..0000000
--- a/OpenSim/Region/Simulation/Scenes/Scene.cs
+++ /dev/null
@@ -1,795 +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.Environment.Scripting;
-using OpenSim.Region.Terrain;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Caches;
-using OpenSim.Region.Environment;
-using OpenSim.Framework.Servers;
-
-namespace OpenSim.Region.Environment.Scenes
-{
- public delegate bool FilterAvatarList(ScenePresence 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;
- private Random Rand = new Random();
- private uint _primCount = 702000;
- private int storageCount;
- private Dictionary m_scriptHandlers;
- private Dictionary m_scripts;
- private Mutex updateLock;
-
- protected AuthenticateSessionsBase authenticateHandler;
- protected RegionCommsListener regionCommsHost;
- protected CommunicationsManager commsManager;
-
- protected Dictionary capsHandlers = new Dictionary();
- protected BaseHttpServer httpListener;
-
- public ParcelManager parcelManager;
- public EstateManager estateManager;
- public EventManager eventManager;
-
- #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, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
- {
- try
- {
- updateLock = new Mutex(false);
- this.authenticateHandler = authen;
- this.commsManager = commsMan;
- this.assetCache = assetCach;
- 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);
-
- eventManager = new EventManager();
-
- m_scriptHandlers = new Dictionary();
- m_scripts = new Dictionary();
-
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
- Entities = new Dictionary();
- Avatars = new Dictionary();
- Prims = new Dictionary();
-
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap");
- Terrain = new TerrainEngine();
-
- ScenePresence.LoadAnims();
- this.httpListener = httpServer;
-
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainLog.Instance.Error( "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].updateMovement();
- }
-
- lock (this.m_syncRoot)
- {
- this.phyScene.Simulate(timeStep);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].update();
- }
-
- // New
- eventManager.TriggerOnFrame();
-
- // TODO: Obsolete - Phase out
- 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.MainLog.Instance.Warn("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.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain tainted, saving.");
- localStorage.SaveMap(Terrain.getHeights1D());
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain saved, informing Physics.");
- lock (this.m_syncRoot)
- {
- phyScene.SetTerrain(Terrain.getHeights1D());
- }
- }
-
- // Primitive backup routines
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "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.Environment.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.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
- return false;
- }
- */
- return true;
- }
- #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.MainLog.Instance.Warn("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.MainLog.Instance.Warn("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.MainLog.Instance.Warn("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)
- {
- if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
- {
- Console.WriteLine("No default terrain, procedurally generating...");
- this.Terrain.hills();
-
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
- }
- else
- {
- try
- {
- this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);
- this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;
- }
- catch
- {
- Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
- Terrain.hills();
- }
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
- }
- }
- else
- {
- this.Terrain.setHeights1D(map);
- }
-
- CreateTerrainTexture();
-
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- ///
- ///
- private void CreateTerrainTexture()
- {
- //create a texture asset of the terrain
- byte[] data = this.Terrain.exportJpegImage("defaultstripe.png");
- this.m_regInfo.estateSettings.terrainImageID = LLUUID.Random();
- AssetBase asset = new AssetBase();
- asset.FullID = this.m_regInfo.estateSettings.terrainImageID;
- asset.Data = data;
- asset.Name = "terrainImage";
- asset.Type = 0;
- this.assetCache.AddAsset(asset);
- }
- #endregion
-
- #region Primitives Methods
-
-
- ///
- /// Loads the World's objects
- ///
- public void LoadPrimsFromStorage()
- {
- try
- {
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: LoadPrimsFromStorage() - Loading primitives");
- this.localStorage.LoadPrimitives(this);
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainLog.Instance.Warn("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
- {
- Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
-
- this.Entities.Add(prim.uuid, prim);
- this._primCount++;
-
- // Trigger event for listeners
- eventManager.TriggerOnNewPrimitive(prim);
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
- }
- }
-
- #endregion
-
- #region Add/Remove Avatar Methods
-
- ///
- ///
- ///
- ///
- ///
- public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child)
- {
- remoteClient.OnRegionHandShakeReply += this.SendLayerData;
- //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
- remoteClient.OnChatFromViewer += this.SimChat;
- remoteClient.OnRequestWearables += this.InformClientOfNeighbours;
- remoteClient.OnAddPrim += this.AddNewPrim;
- remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;
- remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;
- remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
- //remoteClient.OnObjectSelect += this.SelectPrim;
- remoteClient.OnGrapUpdate += this.MoveObject;
-
- /* 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);
- */
-
- ScenePresence newAvatar = null;
- try
- {
-
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
- newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo);
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "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.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
- }
- return;
- }
-
-
-
- ///
- ///
- ///
- ///
- public override void RemoveClient(LLUUID agentID)
- {
- eventManager.TriggerOnRemovePresence(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 (ScenePresence 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 (ScenePresence avatar in Avatars.Values)
- {
- if (filter(avatar))
- {
- result.Add(avatar);
- }
- }
-
- return result;
- }
-
- ///
- /// Request a Avatar by UUID
- ///
- ///
- ///
- public ScenePresence RequestAvatar(LLUUID avatarID)
- {
- if (this.Avatars.ContainsKey(avatarID))
- {
- return Avatars[avatarID];
- }
- return null;
- }
- #endregion
-
-
- #region RegionCommsHost
-
- ///
- ///
- ///
- public void RegisterRegionWithComms()
- {
- GridInfo gridSettings = new GridInfo();
- this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings);
- if (this.regionCommsHost != null)
- {
- this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
- this.regionCommsHost.OnAvatarCrossingIntoRegion += new AgentCrossing(this.AgentCrossing);
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- 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)
- {
- if (agent.CapsPath != "")
- {
- //Console.WriteLine("new user, so creating caps handler for it");
- Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
- cap.RegisterHandlers();
- this.capsHandlers.Add(agent.AgentID, cap);
- }
- this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
- }
- }
-
- public void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
- {
- if (regionHandle == this.m_regInfo.RegionHandle)
- {
- if (this.Avatars.ContainsKey(agentID))
- {
- this.Avatars[agentID].MakeAvatar(position);
- }
- }
- }
-
- ///
- ///
- ///
- public 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);
- agent.child = true;
- this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent);
- remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr), (ushort)neighbours[i].CommsIPListenPort);
- //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort);
- }
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
- {
- return this.commsManager.GridServer.RequestNeighbourInfo(regionHandle);
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
- {
- List mapBlocks;
- mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
- remoteClient.SendMapBlock(mapBlocks);
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags)
- {
- if (regionHandle == this.m_regionHandle)
- {
- if (this.Avatars.ContainsKey(remoteClient.AgentId))
- {
- remoteClient.SendTeleportLocationStart();
- remoteClient.SendLocalTeleport(position, lookAt, flags);
- this.Avatars[remoteClient.AgentId].Teleport(position);
- }
- }
- else
- {
- RegionInfo reg = this.RequestNeighbouringRegionInfo(regionHandle);
- if (reg != null)
- {
- remoteClient.SendTeleportLocationStart();
- AgentCircuitData agent = remoteClient.RequestClientInfo();
- agent.BaseFolder = LLUUID.Zero;
- agent.InventoryFolder = LLUUID.Zero;
- agent.startpos = new LLVector3(128, 128, 70);
- agent.child = true;
- this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
- this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position);
- remoteClient.SendRegionTeleport(regionHandle, 13, reg.CommsIPListenAddr, (ushort)reg.CommsIPListenPort, 4, (1 << 4));
- }
- //remoteClient.SendTeleportCancel();
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public bool InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position)
- {
- return this.commsManager.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position);
- }
-
- #endregion
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/SceneBase.cs b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
deleted file mode 100644
index 3d8f522..0000000
--- a/OpenSim/Region/Simulation/Scenes/SceneBase.cs
+++ /dev/null
@@ -1,201 +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.Environment.Scripting;
-using OpenSim.Region.Terrain;
-using OpenSim.Region.Caches;
-
-namespace OpenSim.Region.Environment.Scenes
-{
- 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;
-
- public string m_datastore;
- public ILocalStorage localStorage;
-
- protected object m_syncRoot = new object();
- private uint m_nextLocalId = 8880000;
- protected AssetCache assetCache;
-
- #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();
-
- ///
- /// 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.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
- return false;
- }
- }
-
-
- ///
- /// 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 virtual void SendLayerData(int px, int py, IClientAPI RemoteClient)
- {
- RemoteClient.SendLayerData(px, py, Terrain.getHeights1D());
- }
-
- #endregion
-
- #region Add/Remove Agent/Avatar
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
-
- ///
- ///
- ///
- ///
- public abstract void RemoveClient(LLUUID agentID);
-
- #endregion
-
- ///
- ///
- ///
- ///
- public virtual RegionInfo RegionInfo
- {
- get { return this.m_regInfo; }
- }
-
- public object SyncRoot
- {
- get { return m_syncRoot; }
- }
-
- public uint NextLocalId
- {
- get { return m_nextLocalId++; }
- }
-
- #region Shutdown
- ///
- /// Tidy before shutdown
- ///
- public virtual void Close()
- {
- try
- {
- this.localStorage.ShutDown();
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
- }
- }
-
- #endregion
-
-
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
deleted file mode 100644
index fa1bacb..0000000
--- a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Region.Environment.Scenes
-{
- ///
- /// A class for triggering remote scene events.
- ///
- public class EventManager
- {
- public delegate void OnFrameDelegate();
- public event OnFrameDelegate OnFrame;
-
- public delegate void OnNewPresenceDelegate(ScenePresence presence);
- public event OnNewPresenceDelegate OnNewPresence;
-
- public delegate void OnNewPrimitiveDelegate(Primitive prim);
- public event OnNewPrimitiveDelegate OnNewPrimitive;
-
- public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
- public event OnRemovePresenceDelegate OnRemovePresence;
-
- public void TriggerOnFrame()
- {
- if (OnFrame != null)
- {
- OnFrame();
- }
- }
-
- public void TriggerOnNewPrimitive(Primitive prim)
- {
- if (OnNewPrimitive != null)
- OnNewPrimitive(prim);
- }
-
- public void TriggerOnNewPresence(ScenePresence presence)
- {
- if (OnNewPresence != null)
- OnNewPresence(presence);
- }
-
- public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
- {
- if (OnRemovePresence != null)
- {
- OnRemovePresence(uuid);
- }
- }
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/SceneObject.cs b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
deleted file mode 100644
index 88fb160..0000000
--- a/OpenSim/Region/Simulation/Scenes/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.Environment.Scenes
-{
- 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/Region/Simulation/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
deleted file mode 100644
index 2caabc2..0000000
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.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.Environment.Scenes
-{
- partial class ScenePresence
- {
- public class AvatarAnimations
- {
-
- public Dictionary AnimsLLUUID = new Dictionary();
- public Dictionary AnimsNames = new Dictionary();
-
- public AvatarAnimations()
- {
- }
-
- public void LoadAnims()
- {
- //OpenSim.Framework.Console.MainLog.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.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-
- foreach (KeyValuePair kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
- {
- AnimsNames.Add(kp.Value, kp.Key);
- }
- }
- }
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
deleted file mode 100644
index 2c81d2a..0000000
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
+++ /dev/null
@@ -1,90 +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;
-
-namespace OpenSim.Region.Environment.Scenes
-{
- partial class ScenePresence
- {
- public class Avatar : IScenePresenceBody
- {
- public Avatar()
- {
-
- }
-
- public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
- {
- }
-
- public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
- {
- }
-
- public void SendOurAppearance(IClientAPI OurClient)
- {
- }
-
- public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
- {
- }
- }
-
- public class ChildAgent : IScenePresenceBody //is a ghost
- {
- public ChildAgent()
- {
-
- }
-
- public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
- {
- }
-
- public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
- {
- }
-
- public void SendOurAppearance(IClientAPI OurClient)
- {
- }
-
- public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
- {
- }
- }
- }
-
-}
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
deleted file mode 100644
index 96e5c94..0000000
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
+++ /dev/null
@@ -1,525 +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.Environment.Scenes
-{
- public partial class ScenePresence : Entity
- {
- public static bool PhysicsEngineFlying = false;
- public static AvatarAnimations Animations;
- public static byte[] DefaultTexture;
- public string firstname;
- public string lastname;
- public IClientAPI ControllingClient;
- public LLUUID current_anim;
- public int anim_seq;
- 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 bool childAgent = false;
- private bool newForce = false;
- private bool newAvatar = false;
- private IScenePresenceBody m_body;
-
- protected RegionInfo m_regionInfo;
-
- #region Properties
- ///
- ///
- ///
- public PhysicsActor PhysActor
- {
- set
- {
- this._physActor = value;
- }
- get
- {
- return _physActor;
- }
- }
- #endregion
-
- #region Constructor(s)
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public ScenePresence(IClientAPI theClient, Scene world, RegionInfo reginfo)
- {
-
- m_world = world;
- this.uuid = theClient.AgentId;
-
- m_regionInfo = reginfo;
- m_regionHandle = reginfo.RegionHandle;
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");
- ControllingClient = theClient;
- this.firstname = ControllingClient.FirstName;
- this.lastname = ControllingClient.LastName;
- m_localId = 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 += this.SendOurAppearance;
- //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
- ControllingClient.OnCompleteMovementToRegion += this.CompleteMovement;
- ControllingClient.OnCompleteMovementToRegion += this.SendInitialData;
- ControllingClient.OnAgentUpdate += this.HandleAgentUpdate;
- // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
- // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
- //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
-
- }
- #endregion
-
- #region Status Methods
- ///
- /// Not Used, most likely can be deleted
- ///
- ///
- public void ChildStatusChange(bool status)
- {
- this.childAgent = status;
-
- if (this.childAgent == true)
- {
- this.Velocity = new LLVector3(0, 0, 0);
- this.Pos = new LLVector3(128, 128, 70);
-
- }
- }
-
- ///
- ///
- ///
- ///
- public void MakeAvatar(LLVector3 pos)
- {
- //this.childAvatar = false;
- this.Pos = pos;
- this.newAvatar = true;
- this.childAgent = false;
- }
-
- protected void MakeChildAgent()
- {
- this.Velocity = new LLVector3(0, 0, 0);
- this.Pos = new LLVector3(128, 128, 70);
- this.childAgent = true;
- }
-
- ///
- ///
- ///
- ///
- public void Teleport(LLVector3 pos)
- {
- this.Pos = pos;
- this.SendTerseUpdateToALLClients();
- }
-
- ///
- ///
- ///
- public void StopMovement()
- {
-
- }
- #endregion
-
- #region Event Handlers
- ///
- ///
- ///
- ///
- ///
- public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
- {
-
- }
-
- ///
- /// Complete Avatar's movement into the region
- ///
- public void CompleteMovement()
- {
- LLVector3 look = this.Velocity;
- if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
- {
- look = new LLVector3(0.99f, 0.042f, 0);
- }
- this.ControllingClient.MoveAgentIntoRegion(m_regionInfo, Pos, look);
- if (this.childAgent)
- {
- this.childAgent = false;
- }
- }
-
- ///
- ///
- ///
- ///
- public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
- {
- if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
- {
- Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
- if (((movementflag & 1) == 0) || (q != this.bodyRot))
- {
- Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
- this.AddNewMovement(v3, q);
- movementflag = 1;
- this.bodyRot = q;
- }
- }
- else if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
- {
- Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
- if (((movementflag & 2) == 0) || (q != this.bodyRot))
- {
- Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
- this.AddNewMovement(v3, q);
- movementflag = 2;
- this.bodyRot = q;
- }
- }
- else
- {
- if ((movementflag) != 0)
- {
- NewForce newVelocity = new NewForce();
- newVelocity.X = 0;
- newVelocity.Y = 0;
- newVelocity.Z = 0;
- this.forcesList.Add(newVelocity);
- movementflag = 0;
- }
- }
-
- }
-
- protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation)
- {
- NewForce newVelocity = new NewForce();
- Axiom.MathLib.Vector3 direc = rotation * vec;
- direc.Normalize();
-
- direc = direc * ((0.03f) * 128f);
- if (this._physActor.Flying)
- direc *= 4;
-
- newVelocity.X = direc.x;
- newVelocity.Y = direc.y;
- newVelocity.Z = direc.z;
- this.forcesList.Add(newVelocity);
- }
-
- #endregion
-
- #region Overridden Methods
- ///
- ///
- ///
- public override void LandRenegerated()
- {
-
- }
-
- ///
- ///
- ///
- public override void update()
- {
- if (this.childAgent == false)
- {
- if (this.newForce)
- {
- this.SendTerseUpdateToALLClients();
- _updateCount = 0;
- }
- else if (movementflag != 0)
- {
- _updateCount++;
- if (_updateCount > 3)
- {
- this.SendTerseUpdateToALLClients();
- _updateCount = 0;
- }
- }
-
- this.CheckForBorderCrossing();
- }
- }
- #endregion
-
- #region Update Client(s)
- ///
- ///
- ///
- ///
- public void SendTerseUpdateToClient(IClientAPI RemoteClient)
- {
- LLVector3 pos = this.Pos;
- LLVector3 vel = this.Velocity;
- RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z));
- }
-
- ///
- ///
- ///
- public void SendTerseUpdateToALLClients()
- {
- List avatars = this.m_world.RequestAvatarList();
- for (int i = 0; i < avatars.Count; i++)
- {
- this.SendTerseUpdateToClient(avatars[i].ControllingClient);
- }
- }
-
- ///
- ///
- ///
- ///
- public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
- {
- remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
- }
-
- ///
- ///
- ///
- public void SendInitialData()
- {
- this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
- if (this.newAvatar)
- {
- this.m_world.InformClientOfNeighbours(this.ControllingClient);
- this.newAvatar = false;
- }
- }
-
- ///
- ///
- ///
- ///
- public void SendOurAppearance(IClientAPI OurClient)
- {
- this.ControllingClient.SendWearables(this.Wearables);
- }
-
- ///
- ///
- ///
- ///
- public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void SendAnimPack(LLUUID animID, int seq)
- {
-
-
- }
-
- ///
- ///
- ///
- public void SendAnimPack()
- {
-
- }
- #endregion
-
- #region Border Crossing Methods
- ///
- ///
- ///
- protected void CheckForBorderCrossing()
- {
- LLVector3 pos2 = this.Pos;
- LLVector3 vel = this.Velocity;
-
- float timeStep = 0.2f;
- pos2.X = pos2.X + (vel.X * timeStep);
- pos2.Y = pos2.Y + (vel.Y * timeStep);
- pos2.Z = pos2.Z + (vel.Z * timeStep);
-
- if ((pos2.X < 0) || (pos2.X > 256))
- {
- this.CrossToNewRegion();
- }
-
- if ((pos2.Y < 0) || (pos2.Y > 256))
- {
- this.CrossToNewRegion();
- }
- }
-
- ///
- ///
- ///
- protected void CrossToNewRegion()
- {
- LLVector3 pos = this.Pos;
- LLVector3 newpos = new LLVector3(pos.X, pos.Y, pos.Z);
- uint neighbourx = this.m_regionInfo.RegionLocX;
- uint neighboury = this.m_regionInfo.RegionLocY;
-
- if (pos.X < 2)
- {
- neighbourx -= 1;
- newpos.X = 254;
- }
- if (pos.X > 253)
- {
- neighbourx += 1;
- newpos.X = 1;
- }
- if (pos.Y < 2)
- {
- neighboury -= 1;
- newpos.Y = 254;
- }
- if (pos.Y > 253)
- {
- neighboury += 1;
- newpos.Y = 1;
- }
-
- LLVector3 vel = this.velocity;
- ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * 256), (uint)(neighboury * 256));
- RegionInfo neighbourRegion = this.m_world.RequestNeighbouringRegionInfo(neighbourHandle);
- if (neighbourRegion != null)
- {
- bool res = this.m_world.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos);
- if (res)
- {
- this.MakeChildAgent();
- this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.CommsIPListenAddr), (ushort)neighbourRegion.CommsIPListenPort);
- }
- }
- }
- #endregion
-
- ///
- ///
- ///
- public static void LoadAnims()
- {
-
- }
-
- ///
- ///
- ///
- public override void updateMovement()
- {
- newForce = false;
- lock (this.forcesList)
- {
- if (this.forcesList.Count > 0)
- {
- for (int i = 0; i < this.forcesList.Count; i++)
- {
- NewForce force = this.forcesList[i];
-
- this.updateflag = true;
- this.Velocity = new LLVector3(force.X, force.Y, force.Z);
- this.newForce = true;
- }
- for (int i = 0; i < this.forcesList.Count; i++)
- {
- this.forcesList.RemoveAt(0);
- }
- }
- }
- }
-
- public static void LoadTextureFile(string name)
- {
- FileInfo fInfo = new FileInfo(name);
- long numBytes = fInfo.Length;
- FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
- BinaryReader br = new BinaryReader(fStream);
- byte[] data1 = br.ReadBytes((int)numBytes);
- br.Close();
- fStream.Close();
- DefaultTexture = data1;
- }
-
- public class NewForce
- {
- public float X;
- public float Y;
- public float Z;
-
- public NewForce()
- {
-
- }
- }
- }
-
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
deleted file mode 100644
index eb8a117..0000000
--- a/OpenSim/Region/Simulation/Scenes/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.Environment.Scripting
-{
- public interface IScriptContext
- {
- IScriptEntity Entity { get; }
- bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
deleted file mode 100644
index e813626..0000000
--- a/OpenSim/Region/Simulation/Scenes/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.Environment.Scripting
-{
- public interface IScriptReadonlyEntity
- {
- LLVector3 Pos { get; }
- string Name { get; }
- }
-
- public interface IScriptEntity
- {
- LLVector3 Pos { get; set; }
- string Name { get; }
- }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
deleted file mode 100644
index 115b4f4..0000000
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
+++ /dev/null
@@ -1,126 +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.Environment;
-using OpenSim.Region.Environment.Scenes;
-using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
-using Primitive = OpenSim.Region.Environment.Scenes.Primitive;
-
-namespace OpenSim.Region.Environment.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/Region/Simulation/Scenes/scripting/Script.cs b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
deleted file mode 100644
index 5d398b0..0000000
--- a/OpenSim/Region/Simulation/Scenes/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.Environment.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/Region/Simulation/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
deleted file mode 100644
index 0ce65ea..0000000
--- a/OpenSim/Region/Simulation/Scenes/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.Environment.Scripting
-{
- public delegate Script ScriptFactory();
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
deleted file mode 100644
index 90c79e3..0000000
--- a/OpenSim/Region/Simulation/Scenes/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.Environment.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;
- }
- }
- }
-
-
-}
--
cgit v1.1