/// Description of InventoryManager.
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 12ebfc7701..6f80210074 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
@@ -32,7 +32,7 @@ using libsecondlife;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public class AuthenticateSessionsBase
{
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index c806262e7c..e0ffd71d96 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
@@ -31,7 +31,7 @@ using System.Text;
using libsecondlife;
using OpenSim.Framework.Types;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public class AuthenticateSessionsLocal : AuthenticateSessionsBase
{
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
index 34181d674d..5747f8a316 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
@@ -34,7 +34,7 @@ using libsecondlife;
using OpenSim.Framework.Types;
using Nwc.XmlRpc;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public class AuthenticateSessionsRemote : AuthenticateSessionsBase
{
diff --git a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index a8d78bb899..ead902da8d 100644
--- a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
@@ -29,16 +29,16 @@ using System;
using System.Collections.Generic;
using System.Text;
using System.IO;
-using OpenSim.world;
+using OpenSim.RegionServer.Simulator;
using OpenSim.UserServer;
using OpenSim.Servers;
-using OpenSim.Assets;
+using OpenSim.RegionServer.Assets;
using OpenSim.Framework.Inventory;
using libsecondlife;
-using OpenSim.RegionServer.world.scripting;
+using OpenSim.RegionServer.Scripting;
using Avatar=libsecondlife.Avatar;
-namespace OpenSim.CAPS
+namespace OpenSim.RegionServer.CAPS
{
public class AdminWebFront
{
@@ -150,12 +150,12 @@ namespace OpenSim.CAPS
{
string responseString;
responseString = " Listing connected Clients
";
- OpenSim.world.Avatar TempAv;
+ OpenSim.RegionServer.Simulator.Avatar TempAv;
foreach (libsecondlife.LLUUID UUID in m_world.Entities.Keys)
{
- if (m_world.Entities[UUID].ToString() == "OpenSim.world.Avatar")
+ if (m_world.Entities[UUID].ToString() == "OpenSim.RegionServer.Simulator.Avatar")
{
- TempAv = (OpenSim.world.Avatar)m_world.Entities[UUID];
+ TempAv = (OpenSim.RegionServer.Simulator.Avatar)m_world.Entities[UUID];
responseString += " Client: ";
responseString += TempAv.firstname + " , " + TempAv.lastname + " , " + UUID + " , " + TempAv.ControllingClient.SessionID + " , " + TempAv.ControllingClient.CircuitCode + " , " + TempAv.ControllingClient.userEP.ToString();
responseString += "
";
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.Grid.cs
similarity index 96%
rename from OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
rename to OpenSim/OpenSim.RegionServer/Client/ClientView.Grid.cs
index 019b65d908..514435ae3a 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientView.Grid.cs
@@ -40,11 +40,11 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
-using OpenSim.world;
-using OpenSim.Assets;
+using OpenSim.RegionServer.Simulator;
+using OpenSim.RegionServer.Assets;
using OpenSim.Framework.Console;
-namespace OpenSim
+namespace OpenSim.RegionServer.Client
{
public partial class ClientView
{
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.PacketHandlers.cs
similarity index 96%
rename from OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
rename to OpenSim/OpenSim.RegionServer/Client/ClientView.PacketHandlers.cs
index be3a893712..4af0485dd7 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientView.PacketHandlers.cs
@@ -40,11 +40,11 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
-using OpenSim.world;
-using OpenSim.Assets;
+using OpenSim.RegionServer.Simulator;
+using OpenSim.RegionServer.Assets;
using OpenSim.Framework.Console;
-namespace OpenSim
+namespace OpenSim.RegionServer.Client
{
public partial class ClientView
{
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.ProcessPackets.cs
similarity index 97%
rename from OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
rename to OpenSim/OpenSim.RegionServer/Client/ClientView.ProcessPackets.cs
index e3d875fc2c..b07749ee9d 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientView.ProcessPackets.cs
@@ -40,12 +40,11 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
-using OpenSim.world;
-using OpenSim.RegionServer.world;
-using OpenSim.Assets;
+using OpenSim.RegionServer.Simulator;
+using OpenSim.RegionServer.Assets;
using OpenSim.Framework.Console;
-namespace OpenSim
+namespace OpenSim.RegionServer.Client
{
public partial class ClientView
{
@@ -92,6 +91,7 @@ namespace OpenSim
protected override void ProcessInPacket(Packet Pack)
{
ack_pack(Pack);
+ debug = true;
if (debug)
{
if (Pack.Type != PacketType.AgentUpdate)
@@ -361,7 +361,7 @@ namespace OpenSim
{
if (ent.localid == updatetask.UpdateData.LocalID)
{
- if (ent is OpenSim.world.Primitive)
+ if (ent is OpenSim.RegionServer.Simulator.Primitive)
{
this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));
}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.cs
similarity index 96%
rename from OpenSim/OpenSim.RegionServer/ClientView.cs
rename to OpenSim/OpenSim.RegionServer/Client/ClientView.cs
index 3934567df5..6d7c3f2cbc 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientView.cs
@@ -41,11 +41,11 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
-using OpenSim.world;
-using OpenSim.Assets;
+using OpenSim.RegionServer.Simulator;
+using OpenSim.RegionServer.Assets;
using OpenSim.Framework.Console;
-namespace OpenSim
+namespace OpenSim.RegionServer.Client
{
public delegate bool PacketMethod(ClientView simClient, Packet packet);
@@ -62,7 +62,7 @@ namespace OpenSim
public LLUUID SessionID;
public LLUUID SecureSessionID = LLUUID.Zero;
public bool m_child;
- public world.Avatar ClientAvatar;
+ public Simulator.Avatar ClientAvatar;
private UseCircuitCodePacket cirpack;
public Thread ClientThread;
public LLVector3 startpos;
diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/Client/ClientViewBase.cs
similarity index 96%
rename from OpenSim/OpenSim.RegionServer/ClientViewBase.cs
rename to OpenSim/OpenSim.RegionServer/Client/ClientViewBase.cs
index 26391a7acf..2ff245f2df 100644
--- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim/OpenSim.RegionServer/Client/ClientViewBase.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Utilities;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Console;
-namespace OpenSim
+namespace OpenSim.RegionServer.Client
{
public class ClientViewBase
{
diff --git a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
new file mode 100644
index 0000000000..7ddfcd205e
--- /dev/null
+++ b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.RegionServer.Estate
+{
+ public class EstateManager
+ {
+
+ }
+}
diff --git a/OpenSim/OpenSim.RegionServer/Grid.cs b/OpenSim/OpenSim.RegionServer/Grid.cs
index 0308f4b270..844bb7141d 100644
--- a/OpenSim/OpenSim.RegionServer/Grid.cs
+++ b/OpenSim/OpenSim.RegionServer/Grid.cs
@@ -32,7 +32,7 @@ using System.Reflection;
using OpenSim.Framework.Interfaces;
using OpenSim.UserServer;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public class Grid
{
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 9161a4e026..faa479f4b9 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,10 +124,7 @@
-
- Code
-
-
+
Code
@@ -136,31 +133,16 @@
Code
-
- Code
-
Code
-
- Code
-
-
- Code
-
-
+
Code
Code
-
- Code
-
-
- Code
-
-
+
Code
@@ -169,85 +151,106 @@
Code
-
- Code
-
Code
-
+
+ Code
+
+
+ Code
+
+
Code
Code
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
+
Code
Code
-
+
Code
-
+
Code
-
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ 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/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index bbd63f1c59..82fc6617af 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,48 +11,49 @@
-
-
+
-
-
-
-
+
-
-
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
index 73050c3890..4d20e729b0 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
@@ -38,13 +38,13 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.world;
+using OpenSim.RegionServer.Simulator;
using OpenSim.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.UserServer;
-using OpenSim.Assets;
-using OpenSim.CAPS;
+using OpenSim.RegionServer.Assets;
+using OpenSim.RegionServer.CAPS;
using OpenSim.Framework.Console;
using OpenSim.Physics.Manager;
using Nwc.XmlRpc;
diff --git a/OpenSim/OpenSim.RegionServer/OpenSimNetworkHandler.cs b/OpenSim/OpenSim.RegionServer/OpenSimNetworkHandler.cs
index f57715254f..bc85cdb7d7 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSimNetworkHandler.cs
+++ b/OpenSim/OpenSim.RegionServer/OpenSimNetworkHandler.cs
@@ -33,7 +33,7 @@ using System.Net.Sockets;
using libsecondlife;
using OpenSim.Framework.Interfaces;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public interface OpenSimNetworkHandler
{
diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs
index dd7c658c06..7267ae824f 100644
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim/OpenSim.RegionServer/PacketServer.cs
@@ -28,10 +28,11 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenSim.world;
+using OpenSim.RegionServer.Simulator;
+using OpenSim.RegionServer.Client;
using libsecondlife.Packets;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public class PacketServer
{
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
index d54a70891b..f14fd3f8c0 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities;
using libsecondlife;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public class RegionInfo : RegionInfoBase
{
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
index d362e96f07..8622857fca 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities;
using libsecondlife;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public class RegionInfoBase
{
diff --git a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
index 01a072d7fe..2d99bb3b85 100644
--- a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
@@ -37,20 +37,20 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.world;
+using OpenSim.RegionServer.Simulator;
using OpenSim.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.UserServer;
-using OpenSim.Assets;
-using OpenSim.CAPS;
+using OpenSim.RegionServer.Assets;
+using OpenSim.RegionServer.CAPS;
using OpenSim.Framework.Console;
using OpenSim.Physics.Manager;
using Nwc.XmlRpc;
using OpenSim.Servers;
using OpenSim.GenericConfig;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public class RegionServerBase
{
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index bc77aa0130..6b3e7b1a7f 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -37,19 +37,24 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.world;
using OpenSim.Terrain;
+
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using OpenSim.UserServer;
-using OpenSim.Assets;
-using OpenSim.CAPS;
using OpenSim.Framework.Console;
+
+using OpenSim.UserServer;
+
+using OpenSim.RegionServer.Simulator;
+using OpenSim.RegionServer.Assets;
+using OpenSim.RegionServer.CAPS;
+using OpenSim.RegionServer.Client;
+
using Nwc.XmlRpc;
using OpenSim.Servers;
using OpenSim.GenericConfig;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
public delegate AuthenticateResponse AuthenticateSessionHandler(LLUUID sessionID, LLUUID agentID, uint circuitCode);
diff --git a/OpenSim/OpenSim.RegionServer/VersionInfo.cs b/OpenSim/OpenSim.RegionServer/VersionInfo.cs
index 9ab16d025d..5e0eed66a2 100644
--- a/OpenSim/OpenSim.RegionServer/VersionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/VersionInfo.cs
@@ -28,7 +28,7 @@
using System;
-namespace OpenSim
+namespace OpenSim.RegionServer
{
///
///
diff --git a/OpenSim/OpenSim.RegionServer/types/Mesh.cs b/OpenSim/OpenSim.RegionServer/types/Mesh.cs
index 81b4a47a80..4c8acabb3d 100644
--- a/OpenSim/OpenSim.RegionServer/types/Mesh.cs
+++ b/OpenSim/OpenSim.RegionServer/types/Mesh.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenSim.types
+namespace OpenSim.RegionServer.Types
{
// TODO: This will need some performance tuning no doubt.
public class Mesh
diff --git a/OpenSim/OpenSim.RegionServer/types/Triangle.cs b/OpenSim/OpenSim.RegionServer/types/Triangle.cs
index 6e634330a5..ffb62e5bef 100644
--- a/OpenSim/OpenSim.RegionServer/types/Triangle.cs
+++ b/OpenSim/OpenSim.RegionServer/types/Triangle.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text;
using Axiom.MathLib;
-namespace OpenSim.types
+namespace OpenSim.RegionServer.Types
{
public class Triangle
{
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs
deleted file mode 100644
index b1c2ff76ed..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs
+++ /dev/null
@@ -1,60 +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.Packets;
-
-namespace OpenSim.world
-{
- partial class Avatar
- {
- private List updateList = new List();
- private List interestList = new List();
-
- public void SendPacketToViewer(Packet packet)
- {
- this.ControllingClient.OutPacket(packet);
- }
-
- public void AddTerseUpdateToViewersList(ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock)
- {
-
- }
-
- public void SendUpdateListToViewer()
- {
-
- }
-
- private void UpdateInterestList()
- {
-
- }
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs
deleted file mode 100644
index 77129057d1..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs
+++ /dev/null
@@ -1,370 +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;
-
-namespace OpenSim.world
-{
- partial class Avatar
- {
- public override void update()
- {
- if (!this.childAvatar)
- {
- if (this._physActor == null)
- {
- //HACKHACK: Note to work out why this entity does not have a physics actor
- // and prehaps create one.
- return;
- }
- libsecondlife.LLVector3 pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);
- if (this.updateflag)
- {
- //need to send movement info
- //so create the improvedterseobjectupdate packet
- //use CreateTerseBlock()
- ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
- ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
- terse.RegionData.RegionHandle = m_regionHandle; // FIXME
- terse.RegionData.TimeDilation = 64096;
- terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
- terse.ObjectData[0] = terseBlock;
- List avList = this.m_world.RequestAvatarList();
- foreach (Avatar client in avList)
- {
- client.SendPacketToViewer(terse);
- }
-
- updateflag = false;
- //this._updateCount = 0;
- }
- else
- {
-
- if ((pos2 != this.positionLastFrame) || (this.movementflag == 16))
- {
- _updateCount++;
- if (((!PhysicsEngineFlying) && (_updateCount > 3)) || (PhysicsEngineFlying) && (_updateCount > 0))
- {
- //It has been a while since last update was sent so lets send one.
- ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
- ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
- terse.RegionData.RegionHandle = m_regionHandle; // FIXME
- terse.RegionData.TimeDilation = 64096;
- terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
- terse.ObjectData[0] = terseBlock;
- List avList = this.m_world.RequestAvatarList();
- foreach (Avatar client in avList)
- {
- client.SendPacketToViewer(terse);
- }
- _updateCount = 0;
- }
-
- if (this.movementflag == 16)
- {
- movementflag = 0;
- }
- }
-
- }
-
- if (positionFrameBeforeLast != pos2)
- {
- this.positionFrameBeforeLast = this.positionLastFrame;
- this.positionLastFrame = pos2;
- int tempRoundedX = (int)Math.Round(positionLastFrame.X);
- int tempRoundedY = (int)Math.Round(positionLastFrame.Y);
- if (this.positionRoundedX != tempRoundedX || this.positionRoundedY != tempRoundedY)
- {
-
- this.positionRoundedX = tempRoundedX;
- this.positionRoundedY = tempRoundedY;
- int currentParcelLocalID = m_world.parcelManager.getParcel(tempRoundedX, tempRoundedY).parcelData.localID;
- if(currentParcelLocalID != this.positionParcelHoverLocalID)
- {
-
- Console.WriteLine("NEW PARCEL: " + m_world.parcelManager.getParcel(tempRoundedX, tempRoundedY).parcelData.parcelName);
- m_world.parcelManager.getParcel(tempRoundedX, tempRoundedY).sendParcelProperties(this.parcelUpdateSequenceIncrement, false, 0,this.ControllingClient);
- this.positionParcelHoverLocalID = currentParcelLocalID;
- this.parcelUpdateSequenceIncrement++;
- }
- }
- }
-
- if (!this.ControllingClient.m_sandboxMode)
- {
- if (pos2.X < 0)
- {
- ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
- }
-
- if (pos2.Y < 0)
- {
- ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
- }
-
- if (pos2.X > 255)
- {
- ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
- }
-
- if (pos2.Y > 255)
- {
- ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
- }
- }
- }
-
- }
-
- public void SendUpdateToOtherClient(Avatar remoteAvatar)
- {
- ObjectUpdatePacket objupdate = CreateUpdatePacket();
- remoteAvatar.SendPacketToViewer(objupdate);
- }
-
- public ObjectUpdatePacket CreateUpdatePacket()
- {
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
- //send a objectupdate packet with information about the clients avatar
- ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
- objupdate.RegionData.RegionHandle = m_regionHandle;
- objupdate.RegionData.TimeDilation = 64096;
- objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-
- objupdate.ObjectData[0] = AvatarTemplate;
- //give this avatar object a local id and assign the user a name
- objupdate.ObjectData[0].ID = this.localid;
- objupdate.ObjectData[0].FullID = ControllingClient.AgentID;
- objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");
-
- libsecondlife.LLVector3 pos2 = new LLVector3((float)this._physActor.Position.X, (float)this._physActor.Position.Y, (float)this._physActor.Position.Z);
-
- byte[] pb = pos2.GetBytes();
-
- Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
- return objupdate;
- }
-
- public void SendInitialPosition()
- {
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
- //send a objectupdate packet with information about the clients avatar
-
- ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
- objupdate.RegionData.RegionHandle = m_regionHandle;
- objupdate.RegionData.TimeDilation = 64096;
- objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
- objupdate.ObjectData[0] = AvatarTemplate;
- //give this avatar object a local id and assign the user a name
-
- objupdate.ObjectData[0].ID = this.localid;
- this.uuid = objupdate.ObjectData[0].FullID = ControllingClient.AgentID;
- objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");
- libsecondlife.LLVector3 pos2 = new LLVector3((float)this.Pos.X, (float)this.Pos.Y, (float)this.Pos.Z);
- byte[] pb = pos2.GetBytes();
- Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
- m_world._localNumber++;
-
- List avList = this.m_world.RequestAvatarList();
- foreach (Avatar client in avList)
- {
- client.SendPacketToViewer(objupdate);
- if (client.ControllingClient.AgentID != this.ControllingClient.AgentID)
- {
- SendAppearanceToOtherAgent(client);
- }
- }
- }
-
- public void SendOurAppearance()
- {
- ControllingClient.SendAppearance(this.Wearables);
- }
-
- public void SendOurAppearance(ClientView OurClient)
- {
- //event handler for wearables request
- this.SendOurAppearance();
- }
-
- public void SendAppearanceToOtherAgent(Avatar avatarInfo)
- {
- AvatarAppearancePacket avp = new AvatarAppearancePacket();
- avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
- avp.ObjectData.TextureEntry = this.avatarAppearanceTexture.ToBytes();
-
- AvatarAppearancePacket.VisualParamBlock avblock = null;
- for (int i = 0; i < 218; i++)
- {
- avblock = new AvatarAppearancePacket.VisualParamBlock();
- avblock.ParamValue = visualParams[i];
- avp.VisualParam[i] = avblock;
- }
-
- avp.Sender.IsTrial = false;
- avp.Sender.ID = ControllingClient.AgentID;
- avatarInfo.SendPacketToViewer(avp);
- }
-
- public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
- {
- LLObject.TextureEntry tex = new LLObject.TextureEntry(texture, 0, texture.Length);
- this.avatarAppearanceTexture = tex;
-
- for (int i = 0; i < visualParam.Length; i++)
- {
- this.visualParams[i] = visualParam[i].ParamValue;
- }
-
- List avList = this.m_world.RequestAvatarList();
- foreach (Avatar client in avList)
- {
- if (client.ControllingClient.AgentID != this.ControllingClient.AgentID)
- {
- SendAppearanceToOtherAgent(client);
- }
- }
- }
-
- public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateTerseBlock()
- {
- byte[] bytes = new byte[60];
- int i = 0;
- ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
-
- dat.TextureEntry = new byte[0];// AvatarTemplate.TextureEntry;
- libsecondlife.LLVector3 pos2 = new LLVector3(0, 0, 0);
- lock (m_world.LockPhysicsEngine)
- {
- pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);
- }
-
- uint ID = this.localid;
-
- bytes[i++] = (byte)(ID % 256);
- bytes[i++] = (byte)((ID >> 8) % 256);
- bytes[i++] = (byte)((ID >> 16) % 256);
- bytes[i++] = (byte)((ID >> 24) % 256);
- bytes[i++] = 0;
- bytes[i++] = 1;
- i += 14;
- bytes[i++] = 128;
- bytes[i++] = 63;
-
- byte[] pb = pos2.GetBytes();
- Array.Copy(pb, 0, bytes, i, pb.Length);
- i += 12;
- ushort InternVelocityX;
- ushort InternVelocityY;
- ushort InternVelocityZ;
- Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0);
- lock (m_world.LockPhysicsEngine)
- {
- internDirec = new Axiom.MathLib.Vector3(this._physActor.Velocity.X, this._physActor.Velocity.Y, this._physActor.Velocity.Z);
- }
- internDirec = internDirec / 128.0f;
- internDirec.x += 1;
- internDirec.y += 1;
- internDirec.z += 1;
-
- InternVelocityX = (ushort)(32768 * internDirec.x);
- InternVelocityY = (ushort)(32768 * internDirec.y);
- InternVelocityZ = (ushort)(32768 * internDirec.z);
-
- ushort ac = 32767;
- bytes[i++] = (byte)(InternVelocityX % 256);
- bytes[i++] = (byte)((InternVelocityX >> 8) % 256);
- bytes[i++] = (byte)(InternVelocityY % 256);
- bytes[i++] = (byte)((InternVelocityY >> 8) % 256);
- bytes[i++] = (byte)(InternVelocityZ % 256);
- bytes[i++] = (byte)((InternVelocityZ >> 8) % 256);
-
- //accel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- //rot
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- //rotation vel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- dat.Data = bytes;
- return (dat);
- }
-
- // Sends animation update
- public void SendAnimPack(LLUUID animID, int seq)
- {
- AvatarAnimationPacket ani = new AvatarAnimationPacket();
- ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];
- ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();
- ani.AnimationSourceList[0].ObjectID = ControllingClient.AgentID;
- ani.Sender = new AvatarAnimationPacket.SenderBlock();
- ani.Sender.ID = ControllingClient.AgentID;
- ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];
- ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();
- ani.AnimationList[0].AnimID = this.current_anim = animID;
- ani.AnimationList[0].AnimSequenceID = this.anim_seq = seq;
-
- List avList = this.m_world.RequestAvatarList();
- foreach (Avatar client in avList)
- {
- client.SendPacketToViewer(ani);
- }
-
- }
-
- public void SendAnimPack()
- {
- this.SendAnimPack(this.current_anim, this.anim_seq);
- }
-
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.cs
deleted file mode 100644
index 30999fca5c..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/Avatar.cs
+++ /dev/null
@@ -1,482 +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 Axiom.MathLib;
-
-namespace OpenSim.world
-{
- public partial class Avatar : Entity
- {
- public static bool PhysicsEngineFlying = false;
- public static AvatarAnimations Animations;
- public string firstname;
- public string lastname;
- public ClientView ControllingClient;
- public LLUUID current_anim;
- public int anim_seq;
- private static libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;
- private bool updateflag = false;
- private byte movementflag = 0;
- private List forcesList = new List();
- private short _updateCount = 0;
- private Axiom.MathLib.Quaternion bodyRot;
- private LLObject.TextureEntry avatarAppearanceTexture = null;
- private byte[] visualParams;
- private AvatarWearable[] Wearables;
- private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
- private LLVector3 positionFrameBeforeLast = new LLVector3(0, 0, 0);
-
- private int positionRoundedX = 0;
- private int positionRoundedY = 0;
-
- private int positionParcelHoverLocalID = -1; //Local ID of the last parcel they were over
- private int parcelUpdateSequenceIncrement = 1;
- private ulong m_regionHandle;
- //private Dictionary m_clientThreads;
- private string m_regionName;
- private ushort m_regionWaterHeight;
- private bool m_regionTerraform;
- private bool childAvatar = false;
-
- public Avatar(ClientView TheClient, World world, string regionName, Dictionary clientThreads, ulong regionHandle, bool regionTerraform, ushort regionWater)
- {
- m_world = world;
- // m_clientThreads = clientThreads;
- m_regionName = regionName;
- m_regionHandle = regionHandle;
- m_regionTerraform = regionTerraform;
- m_regionWaterHeight = regionWater;
-
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs - Loading details from grid (DUMMY)");
- ControllingClient = TheClient;
- localid = 8880000 + (this.m_world._localNumber++);
- Pos = ControllingClient.startpos;
- visualParams = new byte[218];
- for (int i = 0; i < 218; i++)
- {
- visualParams[i] = 100;
- }
- Wearables = new AvatarWearable[13]; //should be 13 of these
- for (int i = 0; i < 13; i++)
- {
- Wearables[i] = new AvatarWearable();
- }
- this.Wearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
- this.Wearables[0].ItemID = LLUUID.Random();
-
- this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-
- //register for events
- ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance);
- ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
- ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement);
- ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition);
- ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate);
- ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
- ControllingClient.OnChildAgentStatus += new ClientView.StatusChange(this.ChildStatusChange);
-
- }
-
- public PhysicsActor PhysActor
- {
- set
- {
- this._physActor = value;
- }
- get
- {
- return _physActor;
- }
- }
-
- public void ChildStatusChange(bool status)
- {
- this.childAvatar = status;
-
- if (this.childAvatar == true)
- {
- this._physActor.Velocity = new PhysicsVector(0, 0, 0);
- ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
- ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
- terse.RegionData.RegionHandle = m_regionHandle; // FIXME
- terse.RegionData.TimeDilation = 64096;
- terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
- terse.ObjectData[0] = terseBlock;
- List avList = this.m_world.RequestAvatarList();
- foreach (Avatar client in avList)
- {
- client.SendPacketToViewer(terse);
- }
- }
- else
- {
- LLVector3 startp = ControllingClient.StartPos;
- lock (m_world.LockPhysicsEngine)
- {
- this._physActor.Position = new PhysicsVector(startp.X, startp.Y, startp.Z);
- }
- }
- }
-
- public override void addForces()
- {
- lock (this.forcesList)
- {
- if (this.forcesList.Count > 0)
- {
- for (int i = 0; i < this.forcesList.Count; i++)
- {
- NewForce force = this.forcesList[i];
- PhysicsVector phyVector = new PhysicsVector(force.X, force.Y, force.Z);
- lock (m_world.LockPhysicsEngine)
- {
- this._physActor.Velocity = phyVector;
- }
- this.updateflag = true;
- this.velocity = new LLVector3(force.X, force.Y, force.Z); //shouldn't really be doing this
- // but as we are setting the velocity (rather than using real forces) at the moment it is okay.
- }
- for (int i = 0; i < this.forcesList.Count; i++)
- {
- this.forcesList.RemoveAt(0);
- }
- }
- }
- }
-
- public static void SetupTemplate(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();
-
- libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
-
- SetDefaultPacketValues(objdata);
- objdata.TextureEntry = data1;
- objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
- objdata.PathCurve = 16;
- objdata.ProfileCurve = 1;
- objdata.PathScaleX = 100;
- objdata.PathScaleY = 100;
- objdata.ParentID = 0;
- objdata.OwnerID = LLUUID.Zero;
- objdata.Scale = new LLVector3(1, 1, 1);
- objdata.PCode = 47;
- System.Text.Encoding enc = System.Text.Encoding.ASCII;
- libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
- pos.X = 100f;
- objdata.ID = 8880000;
- objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
- libsecondlife.LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
- //objdata.FullID=user.AgentID;
- byte[] pb = pos.GetBytes();
- Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
-
- Avatar.AvatarTemplate = objdata;
- }
-
- protected static void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
- {
- objdata.PSBlock = new byte[0];
- objdata.ExtraParams = new byte[1];
- objdata.MediaURL = new byte[0];
- objdata.NameValue = new byte[0];
- objdata.Text = new byte[0];
- objdata.TextColor = new byte[4];
- objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
- objdata.JointPivot = new LLVector3(0, 0, 0);
- objdata.Material = 4;
- objdata.TextureAnim = new byte[0];
- objdata.Sound = LLUUID.Zero;
- LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
- objdata.TextureEntry = ntex.ToBytes();
- objdata.State = 0;
- objdata.Data = new byte[0];
-
- objdata.ObjectData = new byte[76];
- objdata.ObjectData[15] = 128;
- objdata.ObjectData[16] = 63;
- objdata.ObjectData[56] = 128;
- objdata.ObjectData[61] = 102;
- objdata.ObjectData[62] = 40;
- objdata.ObjectData[63] = 61;
- objdata.ObjectData[64] = 189;
-
-
- }
-
- public void CompleteMovement()
- {
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet");
- AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
- mov.AgentData.SessionID = this.ControllingClient.SessionID;
- mov.AgentData.AgentID = this.ControllingClient.AgentID;
- mov.Data.RegionHandle = this.m_regionHandle;
- // TODO - dynamicalise this stuff
- mov.Data.Timestamp = 1172750370;
- mov.Data.Position = this.ControllingClient.startpos;
- mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0);
-
- ControllingClient.OutPacket(mov);
- }
-
- public void HandleAgentUpdate(Packet pack)
- {
- this.HandleUpdate((AgentUpdatePacket)pack);
- }
-
- public void HandleUpdate(AgentUpdatePacket pack)
- {
- if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0)
- {
- if (this._physActor.Flying == false)
- {
- this.current_anim = Animations.AnimsLLUUID["FLY"];
- this.anim_seq = 1;
- this.SendAnimPack();
- }
- this._physActor.Flying = true;
-
- }
- else
- {
- if (this._physActor.Flying == true)
- {
- this.current_anim = Animations.AnimsLLUUID["STAND"];
- this.anim_seq = 1;
- this.SendAnimPack();
- }
- this._physActor.Flying = false;
- }
- if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
- {
- Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
- if (((movementflag & 1) == 0) || (q != this.bodyRot))
- {
-
- if (((movementflag & 1) == 0) && (!this._physActor.Flying))
- {
- this.current_anim = Animations.AnimsLLUUID["WALK"];
- this.anim_seq = 1;
- this.SendAnimPack();
- }
-
-
- //we should add a new force to the list
- // but for now we will deal with velocities
- NewForce newVelocity = new NewForce();
- Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
- Axiom.MathLib.Vector3 direc = q * v3;
- direc.Normalize();
-
- //work out velocity for sim physics system
- 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);
- movementflag = 1;
- this.bodyRot = q;
- }
- }
- else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0) && (PhysicsEngineFlying))
- {
- if (((movementflag & 2) == 0) && this._physActor.Flying)
- {
- //we should add a new force to the list
- // but for now we will deal with velocities
- NewForce newVelocity = new NewForce();
- Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(0, 0, 1);
- Axiom.MathLib.Vector3 direc = v3;
- direc.Normalize();
-
- //work out velocity for sim physics system
- direc = direc * ((0.03f) * 128f * 2);
- newVelocity.X = direc.x;
- newVelocity.Y = direc.y;
- newVelocity.Z = direc.z;
- this.forcesList.Add(newVelocity);
- movementflag = 2;
- }
- }
- else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && (PhysicsEngineFlying))
- {
- if (((movementflag & 4) == 0) && this._physActor.Flying)
- {
- //we should add a new force to the list
- // but for now we will deal with velocities
- NewForce newVelocity = new NewForce();
- Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(0, 0, -1);
- //Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
- Axiom.MathLib.Vector3 direc = v3;
- direc.Normalize();
-
- //work out velocity for sim physics system
- direc = direc * ((0.03f) * 128f * 2);
- newVelocity.X = direc.x;
- newVelocity.Y = direc.y;
- newVelocity.Z = direc.z;
- this.forcesList.Add(newVelocity);
- movementflag = 4;
- }
- }
- else if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
- {
- Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
- if (((movementflag & 8) == 0) || (q != this.bodyRot))
- {
- //we should add a new force to the list
- // but for now we will deal with velocities
- NewForce newVelocity = new NewForce();
- Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
- Axiom.MathLib.Vector3 direc = q * v3;
- direc.Normalize();
-
- //work out velocity for sim physics system
- direc = direc * ((0.03f) * 128f);
- if (this._physActor.Flying)
- direc *= 2;
-
- newVelocity.X = direc.x;
- newVelocity.Y = direc.y;
- newVelocity.Z = direc.z;
- this.forcesList.Add(newVelocity);
- movementflag = 8;
- this.bodyRot = q;
- }
- }
- else
- {
- if (movementflag == 16)
- {
- movementflag = 0;
- }
- if ((movementflag) != 0)
- {
- NewForce newVelocity = new NewForce();
- newVelocity.X = 0;
- newVelocity.Y = 0;
- newVelocity.Z = 0;
- this.forcesList.Add(newVelocity);
- movementflag = 0;
- // We're standing still, so make it show!
- if (this._physActor.Flying == false)
- {
- this.current_anim = Animations.AnimsLLUUID["STAND"];
- this.anim_seq = 1;
- this.SendAnimPack();
- }
- this.movementflag = 16;
-
- }
- }
- }
-
- //really really should be moved somewhere else (RegionInfo.cs ?)
- public void SendRegionHandshake(World regionInfo)
- {
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
- RegionHandshakePacket handshake = new RegionHandshakePacket();
-
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");
- handshake.RegionInfo.BillableFactor = 0;
- handshake.RegionInfo.IsEstateManager = false;
- handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.TerrainHeightRange00;
- handshake.RegionInfo.TerrainHeightRange01 = regionInfo.m_regInfo.TerrainHeightRange01;
- handshake.RegionInfo.TerrainHeightRange10 = regionInfo.m_regInfo.TerrainHeightRange10;
- handshake.RegionInfo.TerrainHeightRange11 = regionInfo.m_regInfo.TerrainHeightRange11;
- handshake.RegionInfo.TerrainStartHeight00 = regionInfo.m_regInfo.TerrainStartHeight00;
- handshake.RegionInfo.TerrainStartHeight01 = regionInfo.m_regInfo.TerrainStartHeight01;
- handshake.RegionInfo.TerrainStartHeight10 = regionInfo.m_regInfo.TerrainStartHeight10;
- handshake.RegionInfo.TerrainStartHeight11 = regionInfo.m_regInfo.TerrainStartHeight11;
- handshake.RegionInfo.SimAccess = 13;
- handshake.RegionInfo.WaterHeight = m_regionWaterHeight;
- uint regionFlags = 72458694;
- if (this.m_regionTerraform)
- {
- regionFlags -= 64;
- }
- handshake.RegionInfo.RegionFlags = regionFlags;
- handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0");
- handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");
- handshake.RegionInfo.TerrainBase0 = regionInfo.m_regInfo.TerrainBase0;
- handshake.RegionInfo.TerrainBase1 = regionInfo.m_regInfo.TerrainBase1;
- handshake.RegionInfo.TerrainBase2 = regionInfo.m_regInfo.TerrainBase2;
- handshake.RegionInfo.TerrainBase3 = regionInfo.m_regInfo.TerrainBase3;
- handshake.RegionInfo.TerrainDetail0 = regionInfo.m_regInfo.TerrainDetail0;
- handshake.RegionInfo.TerrainDetail1 = regionInfo.m_regInfo.TerrainDetail1;
- handshake.RegionInfo.TerrainDetail2 = regionInfo.m_regInfo.TerrainDetail2;
- handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.TerrainDetail3;
- handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");
-
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet");
- this.ControllingClient.OutPacket(handshake);
- }
-
- public static void LoadAnims()
- {
- Avatar.Animations = new AvatarAnimations();
- Avatar.Animations.LoadAnims();
- }
-
- public override void LandRenegerated()
- {
- Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain[(int)Pos.X, (int)Pos.Y] + 50.0f);
- }
- }
-
- public class NewForce
- {
- public float X;
- public float Y;
- public float Z;
-
- public NewForce()
- {
-
- }
- }
-
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
deleted file mode 100644
index 587092891c..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ /dev/null
@@ -1,73 +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.world
-{
- public class AvatarAnimations
- {
-
- public Dictionary AnimsLLUUID = new Dictionary();
- public Dictionary AnimsNames = new Dictionary();
-
- public AvatarAnimations()
- {
- }
-
- public void LoadAnims()
- {
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
- XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
-
- XmlDocument doc = new XmlDocument();
- doc.Load(reader);
- foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
- {
-
- if ( nod.Attributes["name"] != null)
- {
- AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
- }
-
- }
-
- reader.Close();
-
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-
- foreach (KeyValuePair kp in OpenSim.world.Avatar.Animations.AnimsLLUUID)
- {
- AnimsNames.Add(kp.Value, kp.Key);
- }
- }
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/Entity.cs b/OpenSim/OpenSim.RegionServer/world/Entity.cs
deleted file mode 100644
index 5c653c7de1..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/Entity.cs
+++ /dev/null
@@ -1,151 +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 OpenSim.types;
-using libsecondlife;
-using OpenSim.RegionServer.world.scripting;
-
-namespace OpenSim.world
-{
- public abstract class Entity : IScriptReadonlyEntity
- {
- public libsecondlife.LLUUID uuid;
- public uint localid;
- public LLVector3 velocity;
- public Quaternion rotation;
- protected List children;
-
- protected string m_name;
- public virtual string Name
- {
- get { return m_name; }
- }
-
- protected LLVector3 m_pos;
- protected PhysicsActor _physActor;
- protected World m_world;
-
- 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.LockPhysicsEngine)
- {
-
- this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
- }
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
-
- m_pos = value;
- }
- }
-
- ///
- /// Creates a new Entity (should not occur on it's own)
- ///
- public Entity()
- {
- uuid = new libsecondlife.LLUUID();
- localid = 0;
- m_pos = new LLVector3();
- velocity = new LLVector3();
- rotation = new Quaternion();
- m_name = "(basic entity)";
- children = new List();
- }
-
- public virtual void addForces()
- {
- foreach (Entity child in children)
- {
- child.addForces();
- }
- }
-
- ///
- /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
- ///
- public virtual void update() {
- // Do any per-frame updates needed that are applicable to every type of entity
- foreach (Entity child in children)
- {
- child.update();
- }
- }
-
- ///
- /// Returns a mesh for this object and any dependents
- ///
- /// The mesh of this entity tree
- public virtual Mesh getMesh()
- {
- Mesh mesh = new Mesh();
-
- foreach (Entity child in children)
- {
- mesh += child.getMesh();
- }
-
- return mesh;
- }
-
- public virtual void BackUp()
- {
-
- }
-
- public virtual void LandRenegerated()
- {
-
- }
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/ParcelManager.cs b/OpenSim/OpenSim.RegionServer/world/ParcelManager.cs
deleted file mode 100644
index fe977bc1fd..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/ParcelManager.cs
+++ /dev/null
@@ -1,831 +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.world;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-
-namespace OpenSim.RegionServer.world
-{
- public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, ClientView remote_client);
- public delegate void ParcelDivideRequest(int west, int south, int east, int north, ClientView remote_client);
- public delegate void ParcelJoinRequest(int west, int south, int east, int north, ClientView remote_client);
- public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, ClientView remote_client);
-
- #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 static World m_world;
- #endregion
-
- #region Constructors
- public ParcelManager(World world)
- {
-
- m_world = world;
- 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);
- }
-
- public 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
- public 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 e)
- {
- 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
- public bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
- {
- end_x -= 4;
- end_y -= 4;
- Console.WriteLine("Joining Parcels between (" + start_x + ", " + start_y + ") and (" + end_x + ", " + end_y + ")");
-
- //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 e)
- {
- 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;
- }
-
- Console.WriteLine("Performing Join on parcel: " + startParcel.parcelData.parcelName + " - " + startParcel.parcelData.area + "sqm and " + endParcel.parcelData.parcelName + " - " + endParcel.parcelData.area + "sqm");
- //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(ClientView 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);
- }
- #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_world.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 World m_world;
-
- private bool[,] parcelBitmap = new bool[64, 64];
-
- #endregion
-
-
- #region Constructors
- public Parcel(LLUUID owner_id, bool is_group_owned, World 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, ClientView 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, ClientView remote_client)
- {
- if (remote_client.AgentID == parcelData.ownerID)
- {
- //Needs later group support
- Console.WriteLine("Request for update - parcel #" + parcelData.localID);
- 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;
- }
- }
- #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/OpenSim.RegionServer/world/Primitive.cs b/OpenSim/OpenSim.RegionServer/world/Primitive.cs
deleted file mode 100644
index 07d07db76b..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/Primitive.cs
+++ /dev/null
@@ -1,597 +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.types;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-
-namespace OpenSim.world
-{
- public class Primitive : Entity
- {
- protected float mesh_cutbegin;
- protected float mesh_cutend;
- protected PrimData primData;
- protected bool newPrimFlag = false;
- protected bool updateFlag = false;
- protected bool dirtyFlag = false;
- private ObjectUpdatePacket OurPacket;
- private bool physicsEnabled = false;
- private bool physicstest = false;
- private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
- private Dictionary m_clientThreads;
- private ulong m_regionHandle;
- private const uint FULL_MASK_PERMISSIONS = 2147483647;
-
- public bool PhysicsEnabled
- {
- get
- {
- return physicsEnabled;
- }
- set
- {
- physicsEnabled = value;
- }
- }
- public bool UpdateFlag
- {
- get
- {
- return updateFlag;
- }
- set
- {
- updateFlag = value;
- }
- }
- public LLVector3 Scale
- {
- set
- {
- LLVector3 offset = (value - primData.Scale);
- offset.X /= 2;
- offset.Y /= 2;
- offset.Z /= 2;
-
- this.primData.Position += offset;
- this.primData.Scale = value;
-
- this.dirtyFlag = true;
- }
- get
- {
- return this.primData.Scale;
- }
- }
- public PhysicsActor PhysActor
- {
- set
- {
- this._physActor = value;
- }
- }
-
- public Primitive(Dictionary clientThreads, ulong regionHandle, World world)
- {
- mesh_cutbegin = 0.0f;
- mesh_cutend = 1.0f;
-
- m_clientThreads = clientThreads;
- m_regionHandle = regionHandle;
- m_world = world;
- }
-
- public override Mesh getMesh()
- {
- Mesh mesh = new Mesh();
- Triangle tri = new Triangle(
- new Axiom.MathLib.Vector3(0.0f, 1.0f, 1.0f),
- new Axiom.MathLib.Vector3(1.0f, 0.0f, 1.0f),
- new Axiom.MathLib.Vector3(1.0f, 1.0f, 0.0f));
-
- mesh.AddTri(tri);
- mesh += base.getMesh();
-
- return mesh;
- }
-
- public byte[] GetByteArray()
- {
- return this.primData.ToBytes();
- }
-
- public void GetProperites(ClientView client)
- {
- ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
- proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
- proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
- proper.ObjectData[0].ItemID = LLUUID.Zero; // this.uuid;
- proper.ObjectData[0].CreationDate = (ulong) this.primData.CreationDate;
- proper.ObjectData[0].CreatorID = this.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 = this.primData.OwnerMask;
- proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
- proper.ObjectData[0].GroupMask = this.primData.GroupMask;
- proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
- proper.ObjectData[0].BaseMask = this.primData.BaseMask;
-
- client.OutPacket(proper);
- }
-
- public void UpdatePosition(LLVector3 pos)
- {
- this.Pos = pos;
- if (this._physActor != null) // && this.physicsEnabled)
- {
- try
- {
- lock (m_world.LockPhysicsEngine)
- {
- this._physActor.Position = new PhysicsVector(pos.X, pos.Y, pos.Z);
- }
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- }
- this.updateFlag = true;
- }
-
- public override void update()
- {
- LLVector3 pos2 = new LLVector3(0, 0, 0);
- if (this._physActor != null && this.physicsEnabled)
- {
-
- PhysicsVector pPos = this._physActor.Position;
- pos2 = new LLVector3(pPos.X, pPos.Y, pPos.Z);
- }
- if (this.newPrimFlag)
- {
- foreach (ClientView client in m_clientThreads.Values)
- {
- client.OutPacket(OurPacket);
- }
- this.newPrimFlag = false;
- }
- else if (this.updateFlag)
- {
- ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
- terse.RegionData.RegionHandle = m_regionHandle; // FIXME
- terse.RegionData.TimeDilation = 64096;
- terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
- terse.ObjectData[0] = this.CreateImprovedBlock();
- foreach (ClientView client in m_clientThreads.Values)
- {
- client.OutPacket(terse);
- }
- this.updateFlag = false;
- }
- else if (this.dirtyFlag)
- {
- foreach (ClientView client in m_clientThreads.Values)
- {
- UpdateClient(client);
- }
- this.dirtyFlag = false;
- }
- else
- {
- if (this._physActor != null && this.physicsEnabled)
- {
- if (pos2 != this.positionLastFrame)
- {
- ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
- terse.RegionData.RegionHandle = m_regionHandle; // FIXME
- terse.RegionData.TimeDilation = 64096;
- terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
- terse.ObjectData[0] = this.CreateImprovedBlock();
- foreach (ClientView client in m_clientThreads.Values)
- {
- client.OutPacket(terse);
- }
- }
- this.positionLastFrame = pos2;
- }
- }
-
- if (this.physicstest)
- {
- LLVector3 pos = this.Pos;
- pos.Z += 0.0001f;
- this.UpdatePosition(pos);
- this.physicstest = false;
- }
- }
-
- public void UpdateClient(ClientView 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;
- }
- byte[] pb = lPos.GetBytes();
- Array.Copy(pb, 0, OurPacket.ObjectData[0].ObjectData, 0, pb.Length);
-
- // OurPacket should be update with the follwing in updateShape() rather than having to do it here
- OurPacket.ObjectData[0].OwnerID = this.primData.OwnerID;
- OurPacket.ObjectData[0].PCode = this.primData.PCode;
- OurPacket.ObjectData[0].PathBegin = this.primData.PathBegin;
- OurPacket.ObjectData[0].PathEnd = this.primData.PathEnd;
- OurPacket.ObjectData[0].PathScaleX = this.primData.PathScaleX;
- OurPacket.ObjectData[0].PathScaleY = this.primData.PathScaleY;
- OurPacket.ObjectData[0].PathShearX = this.primData.PathShearX;
- OurPacket.ObjectData[0].PathShearY = this.primData.PathShearY;
- OurPacket.ObjectData[0].PathSkew = this.primData.PathSkew;
- OurPacket.ObjectData[0].ProfileBegin = this.primData.ProfileBegin;
- OurPacket.ObjectData[0].ProfileEnd = this.primData.ProfileEnd;
- OurPacket.ObjectData[0].Scale = this.primData.Scale;
- OurPacket.ObjectData[0].PathCurve = this.primData.PathCurve;
- OurPacket.ObjectData[0].ProfileCurve = this.primData.ProfileCurve;
- OurPacket.ObjectData[0].ParentID = this.primData.ParentID ;
- OurPacket.ObjectData[0].ProfileHollow = this.primData.ProfileHollow;
- //finish off copying rest of shape data
- OurPacket.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset;
- OurPacket.ObjectData[0].PathRevolutions = this.primData.PathRevolutions;
- OurPacket.ObjectData[0].PathTaperX = this.primData.PathTaperX;
- OurPacket.ObjectData[0].PathTaperY = this.primData.PathTaperY;
- OurPacket.ObjectData[0].PathTwist = this.primData.PathTwist;
- OurPacket.ObjectData[0].PathTwistBegin = this.primData.PathTwistBegin;
-
- RemoteClient.OutPacket(OurPacket);
- }
-
- public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
- {
- this.primData.PathBegin = addPacket.PathBegin;
- this.primData.PathEnd = addPacket.PathEnd;
- this.primData.PathScaleX = addPacket.PathScaleX;
- this.primData.PathScaleY = addPacket.PathScaleY;
- this.primData.PathShearX = addPacket.PathShearX;
- this.primData.PathShearY = addPacket.PathShearY;
- this.primData.PathSkew = addPacket.PathSkew;
- this.primData.ProfileBegin = addPacket.ProfileBegin;
- this.primData.ProfileEnd = addPacket.ProfileEnd;
- this.primData.PathCurve = addPacket.PathCurve;
- this.primData.ProfileCurve = addPacket.ProfileCurve;
- this.primData.ProfileHollow = addPacket.ProfileHollow;
- this.primData.PathRadiusOffset = addPacket.PathRadiusOffset;
- this.primData.PathRevolutions = addPacket.PathRevolutions;
- this.primData.PathTaperX = addPacket.PathTaperX;
- this.primData.PathTaperY = addPacket.PathTaperY;
- this.primData.PathTwist = addPacket.PathTwist;
- this.primData.PathTwistBegin = addPacket.PathTwistBegin;
- this.dirtyFlag = true;
- }
-
- public void UpdateTexture(byte[] tex)
- {
- this.OurPacket.ObjectData[0].TextureEntry = tex;
- this.primData.Texture = tex;
- this.dirtyFlag = true;
- }
-
- public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
- {
- if (this._physActor != null)
- {
- if (this._physActor.Kinematic == pack.AgentData.UsePhysics)
- {
- this._physActor.Kinematic = !pack.AgentData.UsePhysics; //if Usephysics = true, then Kinematic should = false
- }
- this.physicsEnabled = pack.AgentData.UsePhysics;
- if (this._physActor.Kinematic == false)
- {
- LLVector3 pos = this.Pos;
- this.UpdatePosition(pos);
- pos.Z += 0.000001f;
- this.UpdatePosition(pos);
- this.physicstest = true;
- }
- else
- {
- PhysicsVector vec = this._physActor.Position;
- LLVector3 pos = new LLVector3(vec.X, vec.Y, vec.Z);
- this.Pos = pos;
- this.updateFlag = true;
- }
- }
- }
-
- public void MakeParent(Primitive prim)
- {
- this.primData.ParentID = prim.localid;
- this.Pos -= prim.Pos;
- this.dirtyFlag = true;
- }
-
- public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
- {
- ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
- objupdate.RegionData.RegionHandle = m_regionHandle;
- objupdate.RegionData.TimeDilation = 64096;
-
- objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
- PrimData PData = new PrimData();
- this.primData = PData;
- this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-
- objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();
- objupdate.ObjectData[0].PSBlock = new byte[0];
- objupdate.ObjectData[0].ExtraParams = new byte[1];
- objupdate.ObjectData[0].MediaURL = new byte[0];
- objupdate.ObjectData[0].NameValue = new byte[0];
- objupdate.ObjectData[0].Text = new byte[0];
- objupdate.ObjectData[0].TextColor = new byte[4];
- objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0);
- objupdate.ObjectData[0].JointPivot = new LLVector3(0, 0, 0);
- objupdate.ObjectData[0].Material = 3;
- objupdate.ObjectData[0].UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
- objupdate.ObjectData[0].TextureAnim = new byte[0];
- objupdate.ObjectData[0].Sound = LLUUID.Zero;
- LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
- this.primData.Texture = objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();
- objupdate.ObjectData[0].State = 0;
- objupdate.ObjectData[0].Data = new byte[0];
- PData.OwnerID = objupdate.ObjectData[0].OwnerID = ownerID;
- PData.PCode = objupdate.ObjectData[0].PCode = addPacket.ObjectData.PCode;
- PData.PathBegin = objupdate.ObjectData[0].PathBegin = addPacket.ObjectData.PathBegin;
- PData.PathEnd = objupdate.ObjectData[0].PathEnd = addPacket.ObjectData.PathEnd;
- PData.PathScaleX = objupdate.ObjectData[0].PathScaleX = addPacket.ObjectData.PathScaleX;
- PData.PathScaleY = objupdate.ObjectData[0].PathScaleY = addPacket.ObjectData.PathScaleY;
- PData.PathShearX = objupdate.ObjectData[0].PathShearX = addPacket.ObjectData.PathShearX;
- PData.PathShearY = objupdate.ObjectData[0].PathShearY = addPacket.ObjectData.PathShearY;
- PData.PathSkew = objupdate.ObjectData[0].PathSkew = addPacket.ObjectData.PathSkew;
- PData.ProfileBegin = objupdate.ObjectData[0].ProfileBegin = addPacket.ObjectData.ProfileBegin;
- PData.ProfileEnd = objupdate.ObjectData[0].ProfileEnd = addPacket.ObjectData.ProfileEnd;
- PData.Scale = objupdate.ObjectData[0].Scale = addPacket.ObjectData.Scale;
- PData.PathCurve = objupdate.ObjectData[0].PathCurve = addPacket.ObjectData.PathCurve;
- PData.ProfileCurve = objupdate.ObjectData[0].ProfileCurve = addPacket.ObjectData.ProfileCurve;
- PData.ParentID = objupdate.ObjectData[0].ParentID = 0;
- PData.ProfileHollow = objupdate.ObjectData[0].ProfileHollow = addPacket.ObjectData.ProfileHollow;
- PData.PathRadiusOffset = objupdate.ObjectData[0].PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
- PData.PathRevolutions = objupdate.ObjectData[0].PathRevolutions = addPacket.ObjectData.PathRevolutions;
- PData.PathTaperX = objupdate.ObjectData[0].PathTaperX = addPacket.ObjectData.PathTaperX;
- PData.PathTaperY = objupdate.ObjectData[0].PathTaperY = addPacket.ObjectData.PathTaperY;
- PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist;
- PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
-
- objupdate.ObjectData[0].ID = (uint)(localID);
- objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID - 702000).ToString("00000"));
- objupdate.ObjectData[0].ObjectData = new byte[60];
- objupdate.ObjectData[0].ObjectData[46] = 128;
- objupdate.ObjectData[0].ObjectData[47] = 63;
- LLVector3 pos1 = addPacket.ObjectData.RayEnd;
- //update position
- byte[] pb = pos1.GetBytes();
- Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
- this.newPrimFlag = true;
- this.primData.FullID = this.uuid = objupdate.ObjectData[0].FullID;
- this.localid = objupdate.ObjectData[0].ID;
- this.primData.Position = this.Pos = pos1;
- this.OurPacket = objupdate;
- }
-
- public void CreateFromStorage(PrimData store)
- {
- this.CreateFromStorage(store, store.Position, store.LocalID, false);
- }
-
- public void CreateFromStorage(PrimData store, LLVector3 posi, uint localID, bool newprim)
- {
- //need to clean this up as it shares a lot of code with CreateFromPacket()
- ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
- objupdate.RegionData.RegionHandle = m_regionHandle;
- objupdate.RegionData.TimeDilation = 64096;
- objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
-
- this.primData = store;
- objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();
- objupdate.ObjectData[0].PSBlock = new byte[0];
- objupdate.ObjectData[0].ExtraParams = new byte[1];
- objupdate.ObjectData[0].MediaURL = new byte[0];
- objupdate.ObjectData[0].NameValue = new byte[0];
- objupdate.ObjectData[0].Text = new byte[0];
- objupdate.ObjectData[0].TextColor = new byte[4];
- objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0);
- objupdate.ObjectData[0].JointPivot = new LLVector3(0, 0, 0);
- objupdate.ObjectData[0].Material = 3;
- objupdate.ObjectData[0].UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
- objupdate.ObjectData[0].TextureAnim = new byte[0];
- objupdate.ObjectData[0].Sound = LLUUID.Zero;
-
- if (store.Texture == null)
- {
- LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
- objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();
- }
- else
- {
- objupdate.ObjectData[0].TextureEntry = store.Texture;
- }
-
- objupdate.ObjectData[0].State = 0;
- objupdate.ObjectData[0].Data = new byte[0];
- objupdate.ObjectData[0].OwnerID = this.primData.OwnerID;
- objupdate.ObjectData[0].PCode = this.primData.PCode;
- objupdate.ObjectData[0].PathBegin = this.primData.PathBegin;
- objupdate.ObjectData[0].PathEnd = this.primData.PathEnd;
- objupdate.ObjectData[0].PathScaleX = this.primData.PathScaleX;
- objupdate.ObjectData[0].PathScaleY = this.primData.PathScaleY;
- objupdate.ObjectData[0].PathShearX = this.primData.PathShearX;
- objupdate.ObjectData[0].PathShearY = this.primData.PathShearY;
- objupdate.ObjectData[0].PathSkew = this.primData.PathSkew;
- objupdate.ObjectData[0].ProfileBegin = this.primData.ProfileBegin;
- objupdate.ObjectData[0].ProfileEnd = this.primData.ProfileEnd;
- objupdate.ObjectData[0].Scale = this.primData.Scale;
- objupdate.ObjectData[0].PathCurve = this.primData.PathCurve;
- objupdate.ObjectData[0].ProfileCurve = this.primData.ProfileCurve;
- objupdate.ObjectData[0].ParentID = 0;
- objupdate.ObjectData[0].ProfileHollow = this.primData.ProfileHollow;
- //finish off copying rest of shape data
- objupdate.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset;
- objupdate.ObjectData[0].PathRevolutions = this.primData.PathRevolutions;
- objupdate.ObjectData[0].PathTaperX = this.primData.PathTaperX;
- objupdate.ObjectData[0].PathTaperY = this.primData.PathTaperY;
- objupdate.ObjectData[0].PathTwist = this.primData.PathTwist;
- objupdate.ObjectData[0].PathTwistBegin = this.primData.PathTwistBegin;
-
- objupdate.ObjectData[0].ID = localID; // (uint)store.LocalID;
- objupdate.ObjectData[0].FullID = store.FullID;
-
- objupdate.ObjectData[0].ObjectData = new byte[60];
- objupdate.ObjectData[0].ObjectData[46] = 128;
- objupdate.ObjectData[0].ObjectData[47] = 63;
- LLVector3 pos1 = posi; // store.Position;
- //update position
- byte[] pb = pos1.GetBytes();
- Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
-
- this.uuid = objupdate.ObjectData[0].FullID;
- this.localid = objupdate.ObjectData[0].ID;
- this.Pos = pos1;
- this.OurPacket = objupdate;
- if (newprim)
- {
- this.newPrimFlag = true;
- }
- }
-
- public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()
- {
- uint ID = this.localid;
- byte[] bytes = new byte[60];
-
- int i = 0;
- ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
- //dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry;
- dat.TextureEntry = new byte[0];
- bytes[i++] = (byte)(ID % 256);
- bytes[i++] = (byte)((ID >> 8) % 256);
- bytes[i++] = (byte)((ID >> 16) % 256);
- bytes[i++] = (byte)((ID >> 24) % 256);
- bytes[i++] = 0;
- bytes[i++] = 0;
-
- LLVector3 lPos;
- Axiom.MathLib.Quaternion lRot;
- if (this._physActor != null && this.physicsEnabled)
- {
- PhysicsVector pPos = this._physActor.Position;
- lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
- lRot = this._physActor.Orientation;
- }
- else
- {
- lPos = this.Pos;
- lRot = this.rotation;
- }
- byte[] pb = lPos.GetBytes();
- Array.Copy(pb, 0, bytes, i, pb.Length);
- i += 12;
- ushort ac = 32767;
-
- //vel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- //accel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- ushort rw, rx, ry, rz;
- rw = (ushort)(32768 * (lRot.w + 1));
- rx = (ushort)(32768 * (lRot.x + 1));
- ry = (ushort)(32768 * (lRot.y + 1));
- rz = (ushort)(32768 * (lRot.z + 1));
-
- //rot
- bytes[i++] = (byte)(rx % 256);
- bytes[i++] = (byte)((rx >> 8) % 256);
- bytes[i++] = (byte)(ry % 256);
- bytes[i++] = (byte)((ry >> 8) % 256);
- bytes[i++] = (byte)(rz % 256);
- bytes[i++] = (byte)((rz >> 8) % 256);
- bytes[i++] = (byte)(rw % 256);
- bytes[i++] = (byte)((rw >> 8) % 256);
-
- //rotation vel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- dat.Data = bytes;
- return dat;
- }
-
- public override void BackUp()
- {
- this.primData.FullID = this.uuid;
- this.primData.LocalID = this.localid;
- this.primData.Position = this.Pos;
- this.primData.Rotation = new LLQuaternion(this.rotation.x, this.rotation.y, this.rotation.z, this.rotation.w);
- this.m_world.localStorage.StorePrim(this.primData);
- }
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim/OpenSim.RegionServer/world/Primitive2.cs
deleted file mode 100644
index 083d4b8268..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/Primitive2.cs
+++ /dev/null
@@ -1,518 +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.types;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-
-namespace OpenSim.world
-{
- public class Primitive2 : Entity
- {
- protected PrimData primData;
- //private ObjectUpdatePacket OurPacket;
- 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 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 Primitive2(Dictionary clientThreads, ulong regionHandle, World world)
- {
- m_clientThreads = clientThreads;
- m_regionHandle = regionHandle;
- m_world = world;
- inventoryItems = new Dictionary();
- }
-
- public Primitive2(Dictionary clientThreads, ulong regionHandle, World world, LLUUID owner)
- {
- 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;
- }
-
- public byte[] GetByteArray()
- {
- byte[] result = null;
- List dataArrays = new List();
- dataArrays.Add(primData.ToBytes());
- foreach (Entity child in children)
- {
- if (child is OpenSim.world.Primitive2)
- {
- dataArrays.Add(((OpenSim.world.Primitive2)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()
- {
- LLVector3 pos2 = new LLVector3(0, 0, 0);
- }
-
- public override void BackUp()
- {
-
- }
-
- #endregion
-
- #region Packet handlers
-
- public void UpdatePosition(LLVector3 pos)
- {
-
- }
-
- public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
- {
- this.primData.PathBegin = addPacket.PathBegin;
- this.primData.PathEnd = addPacket.PathEnd;
- this.primData.PathScaleX = addPacket.PathScaleX;
- this.primData.PathScaleY = addPacket.PathScaleY;
- this.primData.PathShearX = addPacket.PathShearX;
- this.primData.PathShearY = addPacket.PathShearY;
- this.primData.PathSkew = addPacket.PathSkew;
- this.primData.ProfileBegin = addPacket.ProfileBegin;
- this.primData.ProfileEnd = addPacket.ProfileEnd;
- this.primData.PathCurve = addPacket.PathCurve;
- this.primData.ProfileCurve = addPacket.ProfileCurve;
- this.primData.ProfileHollow = addPacket.ProfileHollow;
- this.primData.PathRadiusOffset = addPacket.PathRadiusOffset;
- this.primData.PathRevolutions = addPacket.PathRevolutions;
- this.primData.PathTaperX = addPacket.PathTaperX;
- this.primData.PathTaperY = addPacket.PathTaperY;
- this.primData.PathTwist = addPacket.PathTwist;
- this.primData.PathTwistBegin = addPacket.PathTwistBegin;
- }
-
- public void UpdateTexture(byte[] tex)
- {
- this.primData.Texture = tex;
- //this.dirtyFlag = true;
- }
-
- public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
- {
-
- }
-
- public void AssignToParent(Primitive prim)
- {
-
- }
-
- public void GetProperites(ClientView client)
- {
- 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.primData.CreationDate;
- proper.ObjectData[0].CreatorID = this.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 = this.primData.OwnerMask;
- proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
- proper.ObjectData[0].GroupMask = this.primData.GroupMask;
- proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
- proper.ObjectData[0].BaseMask = this.primData.BaseMask;
-
- client.OutPacket(proper);
- }
-
- #endregion
-
- # region Inventory Methods
-
- public bool AddToInventory(InventoryItem item)
- {
- return false;
- }
-
- public InventoryItem RemoveFromInventory(LLUUID itemID)
- {
- return null;
- }
-
- public void RequestInventoryInfo(ClientView simClient, RequestTaskInventoryPacket packet)
- {
-
- }
-
- public void RequestXferInventory(ClientView 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
-
- //should change these mehtods, so that outgoing packets are sent through the avatar class
- public void SendFullUpdateToClient(ClientView 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;
- }
-
- ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
- outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
- outPacket.ObjectData[0] = this.CreateUpdateBlock();
- byte[] pb = lPos.GetBytes();
- Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
-
- remoteClient.OutPacket(outPacket);
- }
-
- public void SendFullUpdateToAllClients()
- {
-
- }
-
- public void SendTerseUpdateToClient(ClientView RemoteClient)
- {
-
- }
-
- public void SendTerseUpdateToALLClients()
- {
-
- }
-
- #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.localid = (uint)(localID);
- this.primData.Position = this.Pos = pos1;
- }
-
- public void CreateFromBytes(byte[] data)
- {
-
- }
-
- public void CreateFromPrimData(PrimData primData)
- {
- this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
- }
-
- public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
- {
-
- }
-
- #endregion
-
- #region Packet Update Methods
- protected void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
- {
- objdata.PSBlock = new byte[0];
- objdata.ExtraParams = new byte[1];
- objdata.MediaURL = new byte[0];
- objdata.NameValue = new byte[0];
- objdata.Text = new byte[0];
- objdata.TextColor = new byte[4];
- objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
- objdata.JointPivot = new LLVector3(0, 0, 0);
- objdata.Material = 3;
- objdata.TextureAnim = new byte[0];
- objdata.Sound = LLUUID.Zero;
- LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
- this.primData.Texture = objdata.TextureEntry = ntex.ToBytes();
- objdata.State = 0;
- objdata.Data = new byte[0];
-
- objdata.ObjectData = new byte[60];
- objdata.ObjectData[46] = 128;
- objdata.ObjectData[47] = 63;
- }
-
- protected void SetPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData)
- {
- objectData.OwnerID = this.primData.OwnerID;
- objectData.PCode = this.primData.PCode;
- objectData.PathBegin = this.primData.PathBegin;
- objectData.PathEnd = this.primData.PathEnd;
- objectData.PathScaleX = this.primData.PathScaleX;
- objectData.PathScaleY = this.primData.PathScaleY;
- objectData.PathShearX = this.primData.PathShearX;
- objectData.PathShearY = this.primData.PathShearY;
- objectData.PathSkew = this.primData.PathSkew;
- objectData.ProfileBegin = this.primData.ProfileBegin;
- objectData.ProfileEnd = this.primData.ProfileEnd;
- objectData.Scale = this.primData.Scale;
- objectData.PathCurve = this.primData.PathCurve;
- objectData.ProfileCurve = this.primData.ProfileCurve;
- objectData.ParentID = this.primData.ParentID;
- objectData.ProfileHollow = this.primData.ProfileHollow;
- objectData.PathRadiusOffset = this.primData.PathRadiusOffset;
- objectData.PathRevolutions = this.primData.PathRevolutions;
- objectData.PathTaperX = this.primData.PathTaperX;
- objectData.PathTaperY = this.primData.PathTaperY;
- objectData.PathTwist = this.primData.PathTwist;
- objectData.PathTwistBegin = this.primData.PathTwistBegin;
- }
-
- #endregion
- protected ObjectUpdatePacket.ObjectDataBlock CreateUpdateBlock()
- {
- ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
- this.SetDefaultPacketValues(objupdate);
- objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
- this.SetPacketShapeData(objupdate);
- byte[] pb = this.Pos.GetBytes();
- Array.Copy(pb, 0, objupdate.ObjectData, 0, pb.Length);
- return objupdate;
- }
-
- protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()
- {
- uint ID = this.localid;
- byte[] bytes = new byte[60];
-
- int i = 0;
- ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
- dat.TextureEntry = new byte[0];
- bytes[i++] = (byte)(ID % 256);
- bytes[i++] = (byte)((ID >> 8) % 256);
- bytes[i++] = (byte)((ID >> 16) % 256);
- bytes[i++] = (byte)((ID >> 24) % 256);
- bytes[i++] = 0;
- bytes[i++] = 0;
-
- LLVector3 lPos;
- Axiom.MathLib.Quaternion lRot;
- if (this._physActor != null && this.physicsEnabled)
- {
- PhysicsVector pPos = this._physActor.Position;
- lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
- lRot = this._physActor.Orientation;
- }
- else
- {
- lPos = this.Pos;
- lRot = this.rotation;
- }
- byte[] pb = lPos.GetBytes();
- Array.Copy(pb, 0, bytes, i, pb.Length);
- i += 12;
- ushort ac = 32767;
-
- //vel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- //accel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- ushort rw, rx, ry, rz;
- rw = (ushort)(32768 * (lRot.w + 1));
- rx = (ushort)(32768 * (lRot.x + 1));
- ry = (ushort)(32768 * (lRot.y + 1));
- rz = (ushort)(32768 * (lRot.z + 1));
-
- //rot
- bytes[i++] = (byte)(rx % 256);
- bytes[i++] = (byte)((rx >> 8) % 256);
- bytes[i++] = (byte)(ry % 256);
- bytes[i++] = (byte)((ry >> 8) % 256);
- bytes[i++] = (byte)(rz % 256);
- bytes[i++] = (byte)((rz >> 8) % 256);
- bytes[i++] = (byte)(rw % 256);
- bytes[i++] = (byte)((rw >> 8) % 256);
-
- //rotation vel
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
- bytes[i++] = (byte)(ac % 256);
- bytes[i++] = (byte)((ac >> 8) % 256);
-
- dat.Data = bytes;
- return dat;
- }
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim/OpenSim.RegionServer/world/SceneObject.cs
deleted file mode 100644
index 73adf8752a..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/SceneObject.cs
+++ /dev/null
@@ -1,104 +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.types;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-
-namespace OpenSim.world
-{
- public class SceneObject : Entity
- {
- private LLUUID rootUUID;
- private Dictionary ChildPrimitives = new Dictionary();
- private Dictionary m_clientThreads;
- private World m_world;
-
- public SceneObject()
- {
-
- }
-
- public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
- {
- }
-
- public void CreateFromBytes(byte[] data)
- {
-
- }
-
- public override void update()
- {
-
- }
-
- public override void BackUp()
- {
-
- }
-
- public void GetProperites(ClientView client)
- {
- /*
- 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.primData.CreationDate;
- proper.ObjectData[0].CreatorID = this.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 = this.primData.OwnerMask;
- proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
- proper.ObjectData[0].GroupMask = this.primData.GroupMask;
- proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
- proper.ObjectData[0].BaseMask = this.primData.BaseMask;
-
- client.OutPacket(proper);
- * */
- }
-
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
deleted file mode 100644
index d2abec2740..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ /dev/null
@@ -1,449 +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.Terrain;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.Assets;
-using OpenSim.RegionServer.world;
-
-namespace OpenSim.world
-{
- public partial class World
- {
- public void ModifyTerrain(byte action, float north, float west)
- {
- switch (action)
- {
- case 1:
- // raise terrain
- Terrain.raise(north, west, 10.0, 0.001);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
- case 2:
- //lower terrain
- Terrain.lower(north, west, 10.0, 0.001);
- RegenerateTerrain(true, (int)north, (int)west);
- break;
- }
- return;
- }
-
- public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
- {
- foreach (ClientView client in m_clientThreads.Values)
- {
- // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
- int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos);
-
- 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))
- {
- 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)
- {
- PrimData primd = new PrimData(primAsset.Data);
- Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
- nPrim.CreateFromStorage(primd, pos, this._primCount, true);
- this.Entities.Add(nPrim.uuid, nPrim);
- this._primCount++;
- }
-
- public void DeRezObject(Packet packet, ClientView simClient)
- {
- DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;
-
- //Needs to delete object from physics at a later date
- if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
- {
- //currently following code not used (or don't know of any case of destination being zero
- libsecondlife.LLUUID[] DeRezEnts;
- DeRezEnts = new libsecondlife.LLUUID[DeRezPacket.ObjectData.Length];
- int i = 0;
- foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
- {
-
- //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
- foreach (Entity ent in this.Entities.Values)
- {
- if (ent.localid == Data.ObjectLocalID)
- {
- DeRezEnts[i++] = ent.uuid;
- this.localStorage.RemovePrim(ent.uuid);
- KillObjectPacket kill = new KillObjectPacket();
- kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
- kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
- kill.ObjectData[0].ID = ent.localid;
- foreach (ClientView client in m_clientThreads.Values)
- {
- client.OutPacket(kill);
- }
- //Uncommenting this means an old UUID will be re-used, thus crashing the asset server
- //Uncomment when prim/object UUIDs are random or such
- //2007-03-22 - Randomskk
- //this._primCount--;
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Deleted UUID " + ent.uuid);
- }
- }
- }
- foreach (libsecondlife.LLUUID uuid in DeRezEnts)
- {
- lock (Entities)
- {
- Entities.Remove(uuid);
- }
- }
- }
- else
- {
- foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
- {
- Entity selectedEnt = null;
- //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
- foreach (Entity ent in this.Entities.Values)
- {
- if (ent.localid == Data.ObjectLocalID)
- {
- AssetBase primAsset = new AssetBase();
- primAsset.FullID = LLUUID.Random();//DeRezPacket.AgentBlock.TransactionID.Combine(LLUUID.Zero); //should be combining with securesessionid
- primAsset.InvType = 6;
- primAsset.Type = 6;
- primAsset.Name = "Prim";
- primAsset.Description = "";
- primAsset.Data = ((Primitive)ent).GetByteArray();
- this._assetCache.AddAsset(primAsset);
- this._inventoryCache.AddNewInventoryItem(simClient, DeRezPacket.AgentBlock.DestinationID, primAsset);
- selectedEnt = ent;
- break;
- }
- }
- if (selectedEnt != null)
- {
- this.localStorage.RemovePrim(selectedEnt.uuid);
- KillObjectPacket kill = new KillObjectPacket();
- kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
- kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
- kill.ObjectData[0].ID = selectedEnt.localid;
- foreach (ClientView client in m_clientThreads.Values)
- {
- client.OutPacket(kill);
- }
- lock (Entities)
- {
- Entities.Remove(selectedEnt.uuid);
- }
- }
- }
- }
-
- }
-
- public void SendAvatarsToClient(ClientView remoteClient)
- {
- foreach (ClientView client in m_clientThreads.Values)
- {
- if (client.AgentID != remoteClient.AgentID)
- {
- // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();
- // RemoteClient.OutPacket(objupdate);
- client.ClientAvatar.SendUpdateToOtherClient(remoteClient.ClientAvatar);
- client.ClientAvatar.SendAppearanceToOtherAgent(remoteClient.ClientAvatar);
- }
- }
- }
-
- public void LinkObjects(uint parentPrim, List childPrims)
- {
- Primitive parentprim = null;
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == parentPrim)
- {
- parentprim = (OpenSim.world.Primitive)ent;
-
- }
- }
-
- for (int i = 0; i < childPrims.Count; i++)
- {
- uint childId = childPrims[i];
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == childId)
- {
- ((OpenSim.world.Primitive)ent).MakeParent(parentprim);
- }
- }
- }
-
- }
-
- public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == primLocalID)
- {
- ((OpenSim.world.Primitive)ent).UpdateShape(shapeBlock);
- break;
- }
- }
- }
-
- public void SelectPrim(uint primLocalID, ClientView remoteClient)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == primLocalID)
- {
- ((OpenSim.world.Primitive)ent).GetProperites(remoteClient);
- break;
- }
- }
- }
-
- public void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == localID)
- {
- ((OpenSim.world.Primitive)ent).UpdateObjectFlags((ObjectFlagUpdatePacket) packet);
- break;
- }
- }
- }
-
- public void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == localID)
- {
- ((OpenSim.world.Primitive)ent).UpdateTexture(texture);
- break;
- }
- }
- }
-
- public void UpdatePrimPosition(uint localID, LLVector3 pos, ClientView remoteClient)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == localID)
- {
- ((OpenSim.world.Primitive)ent).UpdatePosition(pos);
- break;
- }
- }
- }
-
- public void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == localID)
- {
- ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);
- ((OpenSim.world.Primitive)ent).UpdateFlag = true;
- break;
- }
- }
- }
-
- public void UpdatePrimScale(uint localID, LLVector3 scale, ClientView remoteClient)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == localID)
- {
- ((OpenSim.world.Primitive)ent).Scale = scale;
- break;
- }
- }
- }
- #region Parcel Packet Handlers
- void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, ClientView 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.RegionServer.world.Parcel currentParcel = parcelManager.getParcel(start_x + x, start_y + y);
- if(!temp.Contains(currentParcel))
- {
- currentParcel.
- forceUpdateParcelInfo();
- temp.Add(currentParcel);
- }
- }
- }
-
- int requestResult = OpenSim.RegionServer.world.ParcelManager.PARCEL_RESULT_ONE_PARCEL;
- if (temp.Count > 1)
- {
- requestResult = OpenSim.RegionServer.world.ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;
- }
-
- for (i = 0; i < temp.Count; i++)
- {
- temp[i].sendParcelProperties(sequence_id, snap_selection, requestResult, remote_client);
- }
-
-
- parcelManager.sendParcelOverlay(remote_client);
- }
-
- void ParcelDivideRequest(int west, int south, int east, int north, ClientView remote_client)
- {
- parcelManager.subdivide(west, south, east, north, remote_client.AgentID);
- }
- void ParcelJoinRequest(int west, int south, int east, int north, ClientView remote_client)
- {
- parcelManager.join(west, south, east, north, remote_client.AgentID);
- }
- void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, ClientView remote_client)
- {
- if (parcelManager.parcelList.ContainsKey(packet.ParcelData.LocalID))
- {
- parcelManager.parcelList[packet.ParcelData.LocalID].updateParcelProperties(packet, remote_client);
- }
- }
- #endregion
-
- /*
- public void RequestMapBlock(ClientView simClient, int minX, int minY, int maxX, int maxY)
- {
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
- if (((m_regInfo.RegionLocX > minX) && (m_regInfo.RegionLocX < maxX)) && ((m_regInfo.RegionLocY > minY) && (m_regInfo.RegionLocY < maxY)))
- {
- MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
- mapReply.AgentData.AgentID = simClient.AgentID;
- mapReply.AgentData.Flags = 0;
- mapReply.Data = new MapBlockReplyPacket.DataBlock[1];
- mapReply.Data[0] = new MapBlockReplyPacket.DataBlock();
- mapReply.Data[0].MapImageID = new LLUUID("00000000-0000-0000-9999-000000000007");
- mapReply.Data[0].X = (ushort)m_regInfo.RegionLocX;
- mapReply.Data[0].Y = (ushort)m_regInfo.RegionLocY;
- mapReply.Data[0].WaterHeight = (byte)m_regInfo.RegionWaterHeight;
- mapReply.Data[0].Name = _enc.GetBytes(this.m_regionName);
- mapReply.Data[0].RegionFlags = 72458694;
- mapReply.Data[0].Access = 13;
- mapReply.Data[0].Agents = 1; //should send number of clients connected
- simClient.OutPacket(mapReply);
- }
- }
- public bool RezObjectHandler(ClientView simClient, Packet packet)
- {
- RezObjectPacket rezPacket = (RezObjectPacket)packet;
- AgentInventory inven = this._inventoryCache.GetAgentsInventory(simClient.AgentID);
- if (inven != null)
- {
- if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))
- {
- AssetBase asset = this._assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);
- if (asset != null)
- {
- PrimData primd = new PrimData(asset.Data);
- Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
- nPrim.CreateFromStorage(primd, rezPacket.RezData.RayEnd, this._primCount, true);
- this.Entities.Add(nPrim.uuid, nPrim);
- this._primCount++;
- this._inventoryCache.DeleteInventoryItem(simClient, rezPacket.InventoryData.ItemID);
- }
- }
- }
- return true;
- }
- public bool ModifyTerrain(ClientView simClient, Packet packet)
- {
- ModifyLandPacket modify = (ModifyLandPacket)packet;
-
- switch (modify.ModifyBlock.Action)
- {
- case 1:
- // raise terrain
- if (modify.ParcelData.Length > 0)
- {
- Terrain.raise(modify.ParcelData[0].North, modify.ParcelData[0].West, 10.0, 0.1);
- RegenerateTerrain(true, (int)modify.ParcelData[0].North, (int)modify.ParcelData[0].West);
- }
- break;
- case 2:
- //lower terrain
- if (modify.ParcelData.Length > 0)
- {
- Terrain.lower(modify.ParcelData[0].North, modify.ParcelData[0].West, 10.0, 0.1);
- RegenerateTerrain(true, (int)modify.ParcelData[0].North, (int)modify.ParcelData[0].West);
- }
- break;
- }
- return true;
- }
- */
-
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs
deleted file mode 100644
index 0972168098..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs
+++ /dev/null
@@ -1,151 +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.world
-{
- public partial class World
- {
- 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 OSVector3 GetEntityPosition(uint localID)
- {
- OSVector3 res = new OSVector3();
- // Console.WriteLine("script- getting entity " + localID + " position");
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity.localid == localID)
- {
- res.X = entity.Pos.X;
- res.Y = entity.Pos.Y;
- res.Z = entity.Pos.Z;
- }
- }
- return res;
- }
-
- public void SetEntityPosition(uint localID, float x , float y, float z)
- {
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity.localid == localID && entity is Primitive)
- {
- LLVector3 pos = entity.Pos;
- pos.X = x;
- pos.Y = y;
- Primitive prim = entity as Primitive;
- // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
- prim.UpdatePosition(pos);
- // Console.WriteLine("script- setting entity " + localID + " positon");
- }
- }
-
- }
-
- public uint GetRandomAvatarID()
- {
- //Console.WriteLine("script- getting random avatar id");
- uint res = 0;
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity is Avatar)
- {
- res = entity.localid;
- }
- }
- return res;
- }
-
- #endregion
-
-
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs
deleted file mode 100644
index 69f3fda30f..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/World.cs
+++ /dev/null
@@ -1,734 +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.Terrain;
-using OpenSim.Framework.Inventory;
-using OpenSim.Assets;
-//using OpenSim.world.scripting;
-using OpenSim.RegionServer.world.scripting;
-using OpenSim.Terrain;
-using OpenSim.Framework.Console;
-
-namespace OpenSim.world
-{
- public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI
- {
- public object LockPhysicsEngine = new object();
- public Dictionary Avatars;
- public Dictionary Prims;
- //public ScriptEngine Scripts;
- public uint _localNumber = 0;
- private PhysicsScene phyScene;
- private float timeStep = 0.1f;
- public ILocalStorage localStorage;
- private Random Rand = new Random();
- private uint _primCount = 702000;
- private int storageCount;
- private Dictionary m_scriptHandlers;
- private Dictionary m_scripts;
- private Mutex updateLock;
- public string m_datastore;
- public OpenSim.RegionServer.world.ParcelManager parcelManager;
-
- #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 World(Dictionary clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName)
- {
- try
- {
- updateLock = new Mutex(false);
- m_clientThreads = clientThreads;
- m_regionHandle = regionHandle;
- m_regionName = regionName;
- m_regInfo = regInfo;
-
- m_scriptHandlers = new Dictionary();
- m_scripts = new Dictionary();
-
- MainConsole.Instance.Notice("World.cs - creating new entitities instance");
- Entities = new Dictionary();
- Avatars = new Dictionary();
- Prims = new Dictionary();
-
- MainConsole.Instance.Notice("World.cs - creating LandMap");
- TerrainManager = new TerrainManager(new SecondLife());
- Terrain = new TerrainEngine();
- Avatar.SetupTemplate("avatar-texture.dat");
- // MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
- // Initialise this only after the world has loaded
- // Scripts = new ScriptEngine(this);
- Avatar.LoadAnims();
- this.SetDefaultScripts();
- this.LoadScriptEngines();
-
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Constructor failed with exception " + e.ToString());
- }
- }
- #endregion
-
- #region Script Methods
- ///
- /// Loads a new script into the specified entity
- ///
- /// Entity to be scripted
- /// The script to load
- public void AddScript(Entity entity, Script script)
- {
- try
- {
- ScriptHandler scriptHandler = new ScriptHandler(script, entity, this);
- m_scriptHandlers.Add(scriptHandler.ScriptId, scriptHandler);
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: AddScript() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Loads a new script into the specified entity, using a script loaded from a string.
- ///
- /// The entity to be scripted
- /// The string containing the script
- public void AddScript(Entity entity, string scriptData)
- {
- try
- {
- int scriptstart = 0;
- int scriptend = 0;
- string substring;
- scriptstart = scriptData.LastIndexOf("");
- substring = scriptData.Substring(scriptstart + 8, scriptend - scriptstart - 8);
- substring = substring.Trim();
- //Console.WriteLine("searching for script to add: " + substring);
-
- ScriptFactory scriptFactory;
- //Console.WriteLine("script string is " + substring);
- if (substring.StartsWith("');
- string sName = substring1.Substring(0, end);
- //Console.WriteLine(" script info : " + sEngine + " , " + sName);
- int startscript = substring.IndexOf('>');
- script = substring.Remove(0, startscript + 1);
- // Console.WriteLine("script data is " + script);
- if (this.scriptEngines.ContainsKey(sEngine))
- {
- this.scriptEngines[sEngine].LoadScript(script, sName, entity.localid);
- }
- }
- else if (this.m_scripts.TryGetValue(substring, out scriptFactory))
- {
- //Console.WriteLine("added script");
- this.AddScript(entity, scriptFactory());
- }
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: AddScript() - Failed with exception " + e.ToString());
- }
- }
-
- #endregion
-
- #region Update Methods
- ///
- /// Performs per-frame updates on the world, this should be the central world loop
- ///
- public override void Update()
- {
- updateLock.WaitOne();
- try
- {
- if (this.phyScene.IsThreaded)
- {
- this.phyScene.GetResults();
-
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].addForces();
- }
-
- lock (this.LockPhysicsEngine)
- {
- this.phyScene.Simulate(timeStep);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].update();
- }
-
- foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
- {
- scriptHandler.OnFrame();
- }
- foreach (IScriptEngine scripteng in this.scriptEngines.Values)
- {
- scripteng.OnFrame();
- }
- //backup world data
- this.storageCount++;
- if (storageCount > 1200) //set to how often you want to backup
- {
- this.Backup();
- storageCount = 0;
- }
- }
- catch (Exception e)
- {
- MainConsole.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;
- MainConsole.Instance.Notice("World.cs: Backup() - Terrain tainted, saving.");
- localStorage.SaveMap(Terrain.getHeights1D());
- MainConsole.Instance.Notice("World.cs: Backup() - Rebuilding world map image.");
- Terrain.exportImage("map_" + m_regInfo.RegionName.ToLower() + ".png", "defaultstripe.png");
- MainConsole.Instance.Notice("World.cs: Backup() - Terrain saved, informing Physics.");
- phyScene.SetTerrain(Terrain.getHeights1D());
-
- // Needs optimising to just send patches which have changed.
- MainConsole.Instance.Notice("World.cs: Backup() - Terrain changed, informing Clients.");
- foreach (ClientView client in m_clientThreads.Values)
- {
- this.SendLayerData(client);
- }
- }
-
- // Primitive backup routines -- should only do if there's been a change.
- MainConsole.Instance.Notice("World.cs: Backup() - Backing up Primitives");
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].BackUp();
- }
-
-
- //Parcel backup routines. Yay!
- ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
- int i = 0;
- foreach(OpenSim.RegionServer.world.Parcel parcel in parcelManager.parcelList.Values)
- {
- parcels[i] = parcel.parcelData;
- i++;
- }
- localStorage.SaveParcels(parcels);
-
-
- // Backup successful
- return true;
- }
- catch (Exception e)
- {
- // Backup failed
- OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Backup() - Backup Failed with exception " + e.ToString());
- return false;
- }
- }
- #endregion
-
- #region Setup Methods
- ///
- /// Loads a new storage subsystem from a named library
- ///
- /// Storage Library
- /// Successful or not
- public bool LoadStorageDLL(string dllName)
- {
- try
- {
- Assembly pluginAssembly = Assembly.LoadFrom(dllName);
- ILocalStorage store = null;
-
- foreach (Type pluginType in pluginAssembly.GetTypes())
- {
- if (pluginType.IsPublic)
- {
- if (!pluginType.IsAbstract)
- {
- Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
-
- if (typeInterface != null)
- {
- ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
- store = plug;
-
- store.Initialise(this.m_datastore);
- break;
- }
-
- typeInterface = null;
- }
- }
- }
- pluginAssembly = null;
- this.localStorage = store;
- return (store == null);
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
- return false;
- }
- }
-
- public void SetDefaultScripts()
- {
- this.m_scripts.Add("FollowRandomAvatar", delegate()
- {
- return new OpenSim.RegionServer.world.scripting.FollowRandomAvatar();
- });
- }
-
- #endregion
-
- #region Regenerate Terrain
-
- ///
- /// Rebuilds the terrain using a procedural algorithm
- ///
- public void RegenerateTerrain()
- {
- try
- {
- Terrain.hills();
-
- lock (this.LockPhysicsEngine)
- {
- this.phyScene.SetTerrain(Terrain.getHeights1D());
- }
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
-
- foreach (ClientView client in m_clientThreads.Values)
- {
- this.SendLayerData(client);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].LandRenegerated();
- }
- }
- catch (Exception e)
- {
- MainConsole.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.LockPhysicsEngine)
- {
- this.phyScene.SetTerrain(this.Terrain.getHeights1D());
- }
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
-
- foreach (ClientView client in m_clientThreads.Values)
- {
- this.SendLayerData(client);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].LandRenegerated();
- }
- }
- catch (Exception e)
- {
- MainConsole.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 (ClientView client in m_clientThreads.Values)
- {
- this.SendLayerData(pointx, pointy, client);
- }
- }
- }
- catch (Exception e)
- {
- MainConsole.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.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.TerrainFile);
- this.Terrain *= this.m_regInfo.TerrainMultiplier;
- }
- catch (Exception e)
- {
- Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
- Terrain.hills();
- }
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
- }
- }
- else
- {
- this.Terrain.setHeights1D(map);
- }
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
- }
- }
- #endregion
-
- #region Primitives Methods
-
- ///
- /// Sends prims to a client
- ///
- /// Client to send to
- public void GetInitialPrims(ClientView RemoteClient)
- {
- try
- {
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- if (Entities[UUID] is Primitive)
- {
- Primitive primitive = Entities[UUID] as Primitive;
- primitive.UpdateClient(RemoteClient);
- }
- }
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: GetInitialPrims() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Loads the World's objects
- ///
- public void LoadPrimsFromStorage()
- {
- try
- {
- MainConsole.Instance.Notice("World.cs: LoadPrimsFromStorage() - Loading primitives");
- this.localStorage.LoadPrimitives(this);
- }
- catch (Exception e)
- {
- MainConsole.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)
- {
- try
- {
- if (prim.LocalID >= this._primCount)
- {
- _primCount = prim.LocalID + 1;
- }
- MainConsole.Instance.Notice("World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage");
- Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
- nPrim.CreateFromStorage(prim);
- this.Entities.Add(nPrim.uuid, nPrim);
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: PrimFromStorage() - Failed with exception " + e.ToString());
- }
- }
-
- public void AddNewPrim(Packet addPacket, ClientView agentClient)
- {
- AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentID);
- }
-
- public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
- {
- try
- {
- MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
- Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);
- prim.CreateFromPacket(addPacket, ownerID, this._primCount);
- PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z);
- PhysicsVector pSize = new PhysicsVector(0.255f, 0.255f, 0.255f);
- if (OpenSim.world.Avatar.PhysicsEngineFlying)
- {
- lock (this.LockPhysicsEngine)
- {
- prim.PhysActor = this.phyScene.AddPrim(pVec, pSize);
- }
- }
-
- this.Entities.Add(prim.uuid, prim);
- this._primCount++;
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
- }
- }
-
- #endregion
-
- #region Add/Remove Avatar Methods
-
- public override Avatar AddViewerAgent(ClientView agentClient)
- {
- //register for events
- agentClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);
- agentClient.OnRezObject += new RezObject(this.RezObject);
- agentClient.OnModifyTerrain += new ModifyTerrain(this.ModifyTerrain);
- agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData);
- agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims);
- agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient);
- agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects);
- agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim);
- agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape);
-
- agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim);
- agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags);
- agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture);
- agentClient.OnUpdatePrimPosition += new ClientView.UpdatePrimVector(this.UpdatePrimPosition);
- agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation);
- agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);
- agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);
-
- agentClient.OnParcelPropertiesRequest += new OpenSim.RegionServer.world.ParcelPropertiesRequest(ParcelPropertiesRequest);
- agentClient.OnParcelDivideRequest += new OpenSim.RegionServer.world.ParcelDivideRequest(ParcelDivideRequest);
- agentClient.OnParcelJoinRequest+=new OpenSim.RegionServer.world.ParcelJoinRequest(ParcelJoinRequest);
- agentClient.OnParcelPropertiesUpdateRequest += new OpenSim.RegionServer.world.ParcelPropertiesUpdateRequest(ParcelPropertiesUpdateRequest);
- Avatar newAvatar = null;
- try
- {
- MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
- newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20);
- MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Adding new avatar to world");
- MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Starting RegionHandshake ");
- newAvatar.SendRegionHandshake(this);
- //if (!agentClient.m_child)
- //{
-
- PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
- lock (this.LockPhysicsEngine)
- {
- newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
- }
- // }
- lock (Entities)
- {
- if (!Entities.ContainsKey(agentClient.AgentID))
- {
- this.Entities.Add(agentClient.AgentID, newAvatar);
- }
- else
- {
- Entities[agentClient.AgentID] = newAvatar;
- }
- }
- lock (Avatars)
- {
- if (Avatars.ContainsKey(agentClient.AgentID))
- {
- Avatars[agentClient.AgentID] = newAvatar;
- }
- else
- {
- this.Avatars.Add(agentClient.AgentID, newAvatar);
- }
- }
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
- }
- return newAvatar;
- }
-
-
-
-
-
-
-
- public override void RemoveViewerAgent(ClientView agentClient)
- {
- try
- {
- lock (Entities)
- {
- Entities.Remove(agentClient.AgentID);
- }
- lock (Avatars)
- {
- Avatars.Remove(agentClient.AgentID);
- }
- if (agentClient.ClientAvatar.PhysActor != null)
- {
- this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor);
- }
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString());
- }
- }
- #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.
-
- public List RequestAvatarList()
- {
- List result = new List();
-
- foreach (Avatar avatar in Avatars.Values)
- {
- result.Add(avatar);
- }
-
- return result;
- }
- #endregion
-
- #region ShutDown
- ///
- /// Tidy before shutdown
- ///
- public override void Close()
- {
- try
- {
- this.localStorage.ShutDown();
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Close() - Failed with exception " + e.ToString());
- }
- }
- #endregion
-
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
deleted file mode 100644
index 4050c09b92..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
+++ /dev/null
@@ -1,204 +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.Terrain;
-using OpenSim.Framework.Inventory;
-using OpenSim.Assets;
-using OpenSim.RegionServer.world.scripting;
-using OpenSim.Terrain;
-using OpenSim.Framework.Console;
-
-namespace OpenSim.world
-{
- public class WorldBase
- {
- public Dictionary Entities;
- protected Dictionary m_clientThreads;
- protected ulong m_regionHandle;
- protected string m_regionName;
- protected InventoryCache _inventoryCache;
- protected AssetCache _assetCache;
- public RegionInfo m_regInfo;
-
- public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
- protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine
-
- #region Properties
- public InventoryCache InventoryCache
- {
- set
- {
- this._inventoryCache = value;
- }
- }
-
- public AssetCache AssetCache
- {
- set
- {
- this._assetCache = value;
- }
- }
- #endregion
-
- #region Constructors
- public WorldBase()
- {
-
- }
- #endregion
-
- #region Setup Methods
- ///
- /// Register Packet handler Methods with the packet server (which will register them with the SimClient)
- ///
- ///
- public virtual void RegisterPacketHandlers(PacketServer packetServer)
- {
-
- }
- #endregion
-
- #region Update Methods
- ///
- /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
- ///
- public virtual void Update()
- {
-
- }
- #endregion
-
- #region Terrain Methods
-
- ///
- /// Loads the World heightmap
- ///
- public virtual void LoadWorldMap()
- {
-
- }
-
- ///
- /// Send the region heightmap to the client
- ///
- /// Client to send to
- public virtual void SendLayerData(ClientView RemoteClient)
- {
- try
- {
- int[] patches = new int[4];
-
- for (int y = 0; y < 16; y++)
- {
- for (int x = 0; x < 16; x = x + 4)
- {
- patches[0] = x + 0 + y * 16;
- patches[1] = x + 1 + y * 16;
- patches[2] = x + 2 + y * 16;
- patches[3] = x + 3 + y * 16;
-
- Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);
- RemoteClient.OutPacket(layerpack);
- }
- }
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: SendLayerData() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Sends a specified patch to a client
- ///
- /// Patch coordinate (x) 0..16
- /// Patch coordinate (y) 0..16
- /// The client to send to
- public void SendLayerData(int px, int py, ClientView RemoteClient)
- {
- try
- {
- int[] patches = new int[1];
- int patchx, patchy;
- patchx = px / 16;
- patchy = py / 16;
-
- patches[0] = patchx + 0 + patchy * 16;
-
- Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);
- RemoteClient.OutPacket(layerpack);
- }
- catch (Exception e)
- {
- MainConsole.Instance.Warn("World.cs: SendLayerData() - Failed with exception " + e.ToString());
- }
- }
- #endregion
-
- #region Add/Remove Agent/Avatar
- ///
- /// Add a new Agent's avatar
- ///
- ///
- public virtual Avatar AddViewerAgent(ClientView agentClient)
- {
- return null;
- }
-
- ///
- /// Remove a Agent's avatar
- ///
- ///
- public virtual void RemoveViewerAgent(ClientView agentClient)
- {
-
- }
- #endregion
-
- #region Shutdown
- ///
- /// Tidy before shutdown
- ///
- public virtual void Close()
- {
-
- }
- #endregion
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs
deleted file mode 100644
index 3b5c91c796..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/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.RegionServer.world.scripting
-{
- public interface IScriptContext
- {
- IScriptEntity Entity { get; }
- bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
deleted file mode 100644
index adb1b58c4c..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/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.RegionServer.world.scripting
-{
- public interface IScriptReadonlyEntity
- {
- LLVector3 Pos { get; }
- string Name { get; }
- }
-
- public interface IScriptEntity
- {
- LLVector3 Pos { get; set; }
- string Name { get; }
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
deleted file mode 100644
index 7f53c866a2..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Physics.Manager;
-using OpenSim.world;
-using Avatar=OpenSim.world.Avatar;
-using Primitive = OpenSim.world.Primitive;
-
-namespace OpenSim.RegionServer.world.scripting
-{
- public delegate void ScriptEventHandler(IScriptContext context);
-
- public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
- {
- private World 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, World world)
- {
- m_script = script;
- m_entity = entity;
- m_world = world;
- }
-
- #region IScriptContext Members
-
- IScriptEntity IScriptContext.Entity
- {
- get
- {
- return this;
- }
- }
-
- bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
- {
- foreach (Entity entity in m_world.Entities.Values )
- {
- if( entity is Avatar )
- {
- avatar = entity;
- return true;
- }
- }
-
- avatar = null;
- return false;
- }
-
- #endregion
-
- #region IScriptEntity and IScriptReadonlyEntity Members
-
- public string Name
- {
- get
- {
- return m_entity.Name;
- }
- }
-
- public LLVector3 Pos
- {
- get
- {
- return m_entity.Pos;
- }
-
- set
- {
- if (m_entity is Primitive)
- {
- Primitive prim = m_entity as Primitive;
- // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
- prim.UpdatePosition( value );
- }
- }
- }
-
- #endregion
- }
-
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim/OpenSim.RegionServer/world/scripting/Script.cs
deleted file mode 100644
index 9c2280abef..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/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.RegionServer.world.scripting
-{
- public class Script
- {
- private LLUUID m_scriptId;
- public virtual LLUUID ScriptId
- {
- get
- {
- return m_scriptId;
- }
- }
-
- public Script( LLUUID scriptId )
- {
- m_scriptId = scriptId;
- }
-
- public ScriptEventHandler OnFrame;
- }
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
deleted file mode 100644
index 17ec50eedb..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/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.RegionServer.world.scripting
-{
- public delegate Script ScriptFactory();
-}
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
deleted file mode 100644
index 8e4565a9d3..0000000000
--- a/OpenSim/OpenSim.RegionServer/world/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.RegionServer.world.scripting
-{
- public class FollowRandomAvatar : Script
- {
- public FollowRandomAvatar()
- : base(LLUUID.Random())
- {
- OnFrame += MyOnFrame;
- }
-
- private void MyOnFrame(IScriptContext context)
- {
- LLVector3 pos = context.Entity.Pos;
-
- IScriptReadonlyEntity avatar;
-
- if (context.TryGetRandomAvatar(out avatar))
- {
- LLVector3 avatarPos = avatar.Pos;
-
- float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
- float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
-
- LLVector3 newPos = new LLVector3(x, y, pos.Z);
-
- context.Entity.Pos = newPos;
- }
- }
- }
-
-
-}
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 7bb5d6ed5b..7d90947523 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -99,10 +99,10 @@
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index e18478ab8a..9789712114 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -14,8 +14,8 @@
-
+
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs
index 38da77990c..e3b23ad999 100644
--- a/OpenSim/OpenSim/Application.cs
+++ b/OpenSim/OpenSim/Application.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
using System.Text;
using OpenSim.UserServer;
using OpenSim.Framework.Console;
+using OpenSim.RegionServer;
namespace OpenSim
{
@@ -111,7 +112,7 @@ namespace OpenSim
sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts;
sim.gridLocalAsset = gridLocalAsset;
- OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
+ OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = allowFlying;
sim.StartUp();
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 6db4572b1f..a310deda7c 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -38,13 +38,15 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.world;
+using OpenSim.RegionServer;
+
+using OpenSim.RegionServer.Simulator;
using OpenSim.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.UserServer;
-using OpenSim.Assets;
-using OpenSim.CAPS;
+using OpenSim.RegionServer.Assets;
+using OpenSim.RegionServer.CAPS;
using OpenSim.Framework.Console;
using OpenSim.Physics.Manager;
using Nwc.XmlRpc;
@@ -54,7 +56,7 @@ using OpenSim.GenericConfig;
namespace OpenSim
{
- public class OpenSimMain : RegionServerBase, conscmd_callback
+ public class OpenSimMain : OpenSim.RegionServer.RegionServerBase, conscmd_callback
{
private CheckSumServer checkServer;
@@ -209,7 +211,7 @@ namespace OpenSim
}
m_console.Notice("Creating ParcelManager");
- LocalWorld.parcelManager = new OpenSim.RegionServer.world.ParcelManager(this.LocalWorld);
+ LocalWorld.parcelManager = new OpenSim.RegionServer.Simulator.ParcelManager(this.LocalWorld);
m_console.Notice("Loading Parcels from DB...");
LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
@@ -436,23 +438,23 @@ namespace OpenSim
case "":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.world.Avatar.PhysicsEngineFlying = false;
+ OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = false;
break;
case "basicphysics":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.world.Avatar.PhysicsEngineFlying = false;
+ OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = false;
break;
case "RealPhysX":
this.m_physicsEngine = "RealPhysX";
- OpenSim.world.Avatar.PhysicsEngineFlying = true;
+ OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = true;
break;
case "OpenDynamicsEngine":
this.m_physicsEngine = "OpenDynamicsEngine";
- OpenSim.world.Avatar.PhysicsEngineFlying = true;
+ OpenSim.RegionServer.Simulator.Avatar.PhysicsEngineFlying = true;
break;
}
@@ -556,19 +558,19 @@ namespace OpenSim
m_console.Error("That is " + (DateTime.Now - startuptime).ToString());
break;
case "users":
- OpenSim.world.Avatar TempAv;
+ OpenSim.RegionServer.Simulator.Avatar TempAv;
m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
{
- if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
+ if (LocalWorld.Entities[UUID].ToString() == "OpenSim.RegionServer.Simulator.Avatar")
{
- TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID];
+ TempAv = (OpenSim.RegionServer.Simulator.Avatar)LocalWorld.Entities[UUID];
m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
}
}
break;
case "parcels":
- foreach (OpenSim.RegionServer.world.Parcel parcel in LocalWorld.parcelManager.parcelList.Values)
+ foreach (OpenSim.RegionServer.Simulator.Parcel parcel in LocalWorld.parcelManager.parcelList.Values)
{
m_console.Error("Parcel ID#" + parcel.parcelData.localID + "(Global UUID: " + parcel.parcelData.globalID + "):");
m_console.Error("\tParcel Name: " + parcel.parcelData.parcelName);