From a143cf81803c4c5c38c2115497dd76b4a885c0ef Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 12 Jun 2007 17:45:11 +0000
Subject: Renamed World class to Scene class
---
OpenSim.sln | 242 ++++---
OpenSim/OpenSim.Region/Estate/EstateManager.cs | 4 +-
OpenSim/OpenSim.Region/OpenSim.Region.csproj | 32 +-
OpenSim/OpenSim.Region/OpenSim.Region.dll.build | 32 +-
OpenSim/OpenSim.Region/ParcelManager.cs | 8 +-
OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs | 2 +-
OpenSim/OpenSim.Region/Scene/Entities/Entity.cs | 2 +-
OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs | 8 +-
.../OpenSim.Region/Scene/Entities/SceneObject.cs | 2 +-
.../OpenSim.Region/Scene/Scene.PacketHandlers.cs | 253 ++++++++
OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs | 184 ++++++
OpenSim/OpenSim.Region/Scene/Scene.cs | 711 +++++++++++++++++++++
OpenSim/OpenSim.Region/Scene/SceneBase.cs | 138 ++++
.../OpenSim.Region/Scene/World.PacketHandlers.cs | 253 --------
OpenSim/OpenSim.Region/Scene/World.Scripting.cs | 184 ------
OpenSim/OpenSim.Region/Scene/World.cs | 711 ---------------------
OpenSim/OpenSim.Region/Scene/WorldBase.cs | 138 ----
.../Scene/scripting/IScriptHandler.cs | 4 +-
OpenSim/OpenSim/OpenSimMain.cs | 6 +-
19 files changed, 1484 insertions(+), 1430 deletions(-)
create mode 100644 OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
create mode 100644 OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
create mode 100644 OpenSim/OpenSim.Region/Scene/Scene.cs
create mode 100644 OpenSim/OpenSim.Region/Scene/SceneBase.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/World.Scripting.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/World.cs
delete mode 100644 OpenSim/OpenSim.Region/Scene/WorldBase.cs
diff --git a/OpenSim.sln b/OpenSim.sln
index 9cdc069..891578f 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
@@ -43,97 +43,151 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
EndProject
Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+ ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
+ ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({196916AF-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+ ({196916AF-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({196916AF-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({196916AF-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
+ ({196916AF-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
+ ({196916AF-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
+ ({196916AF-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
+ ({196916AF-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).10 = ({196916AF-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).14 = ({1938EB12-0000-0000-0000-000000000000})
+ ({438A9556-0000-0000-0000-000000000000}).15 = ({8E81D43C-0000-0000-0000-000000000000})
+ ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+ ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
+ ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
+ ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
+ ({632E1BFD-0000-0000-0000-000000000000}).11 = ({1938EB12-0000-0000-0000-000000000000})
+ ({632E1BFD-0000-0000-0000-000000000000}).12 = ({8E81D43C-0000-0000-0000-000000000000})
+ ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
+ ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
+ ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
+ ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})
+ ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
+ ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+ ({1938EB12-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({97A82740-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+ ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
EndGlobal
diff --git a/OpenSim/OpenSim.Region/Estate/EstateManager.cs b/OpenSim/OpenSim.Region/Estate/EstateManager.cs
index 688182d..875defd 100644
--- a/OpenSim/OpenSim.Region/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.Region/Estate/EstateManager.cs
@@ -45,10 +45,10 @@ namespace OpenSim.Region.Estate
///
public class EstateManager
{
- private World m_world;
+ private Scene m_world;
private RegionInfo m_regInfo;
- public EstateManager(World world,RegionInfo reginfo)
+ public EstateManager(Scene world,RegionInfo reginfo)
{
m_world = world; //Estate settings found at world.m_regInfo.estateSettings
m_regInfo = reginfo;
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 4447819..ff916d1 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -136,52 +136,52 @@
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index f0d1a34..a49c08f 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -13,22 +13,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/OpenSim.Region/ParcelManager.cs b/OpenSim/OpenSim.Region/ParcelManager.cs
index 37dd24f..081f9a2 100644
--- a/OpenSim/OpenSim.Region/ParcelManager.cs
+++ b/OpenSim/OpenSim.Region/ParcelManager.cs
@@ -74,13 +74,13 @@ namespace OpenSim.Region
private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
private int[,] parcelIDList = new int[64, 64];
- private World m_world;
+ private Scene m_world;
private RegionInfo m_regInfo;
#endregion
#region Constructors
- public ParcelManager(World world, RegionInfo reginfo)
+ public ParcelManager(Scene world, RegionInfo reginfo)
{
m_world = world;
@@ -497,7 +497,7 @@ namespace OpenSim.Region
{
#region Member Variables
public ParcelData parcelData = new ParcelData();
- public World m_world;
+ public Scene m_world;
private bool[,] parcelBitmap = new bool[64, 64];
@@ -505,7 +505,7 @@ namespace OpenSim.Region
#region Constructors
- public Parcel(LLUUID owner_id, bool is_group_owned, World world)
+ public Parcel(LLUUID owner_id, bool is_group_owned, Scene world)
{
m_world = world;
parcelData.ownerID = owner_id;
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
index c88e0cc..989c53d 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region
///
///
///
- public Avatar(IClientAPI theClient, World world, Dictionary clientThreads, RegionInfo reginfo)
+ public Avatar(IClientAPI theClient, Scene world, Dictionary clientThreads, RegionInfo reginfo)
{
m_world = world;
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs b/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
index 3d6ba64..9e288d7 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region
protected List children;
protected LLVector3 m_pos;
protected PhysicsActor _physActor;
- protected World m_world;
+ protected Scene m_world;
protected string m_name;
///
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
index 6efdd66..aa747d3 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region
///
///
///
- public Primitive( ulong regionHandle, World world)
+ public Primitive( ulong regionHandle, Scene world)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
@@ -108,7 +108,7 @@ namespace OpenSim.Region
///
///
///
- public Primitive(ulong regionHandle, World world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
+ public Primitive(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
@@ -126,7 +126,7 @@ namespace OpenSim.Region
///
///
///
- public Primitive( ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID)
+ public Primitive( ulong regionHandle, Scene world, LLUUID owner, LLUUID fullID, uint localID)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
@@ -148,7 +148,7 @@ namespace OpenSim.Region
///
///
///
- public Primitive( ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position)
+ public Primitive( ulong regionHandle, Scene world, LLUUID owner, uint localID, LLVector3 position)
{
//m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
diff --git a/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs b/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
index 7284b73..e15e871 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region
private LLUUID rootUUID;
//private Dictionary ChildPrimitives = new Dictionary();
protected Primitive rootPrimitive;
- private World m_world;
+ private Scene m_world;
protected ulong regionHandle;
///
diff --git a/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs b/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
new file mode 100644
index 0000000..1c6fbcd
--- /dev/null
+++ b/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
@@ -0,0 +1,253 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Region
+{
+ public partial class Scene
+ {
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void ModifyTerrain(byte action, float north, float west)
+ {
+ switch (action)
+ {
+ case 1:
+ // raise terrain
+ Terrain.raise(north, west, 10.0, 0.001);
+ RegenerateTerrain(true, (int)north, (int)west);
+ break;
+ case 2:
+ //lower terrain
+ Terrain.lower(north, west, 10.0, 0.001);
+ RegenerateTerrain(true, (int)north, (int)west);
+ break;
+ }
+ return;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+ {
+ Console.WriteLine("Chat message");
+ Avatar avatar = null;
+ foreach (IClientAPI client in m_clientThreads.Values)
+ {
+ int dis = -1000;
+ if (this.Avatars.ContainsKey(client.AgentId))
+ {
+
+ avatar = this.Avatars[client.AgentId];
+ // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
+ dis= (int)avatar.Pos.GetDistanceTo(fromPos);
+ Console.WriteLine("found avatar at " +dis);
+
+ }
+
+ switch (type)
+ {
+ case 0: // Whisper
+ if ((dis < 10) && (dis > -10))
+ {
+ //should change so the message is sent through the avatar rather than direct to the ClientView
+ client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+ }
+ break;
+ case 1: // Say
+ if ((dis < 30) && (dis > -30))
+ {
+ Console.WriteLine("sending chat");
+ client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+ }
+ break;
+ case 2: // Shout
+ if ((dis < 100) && (dis > -100))
+ {
+ client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+ }
+ break;
+
+ case 0xff: // Broadcast
+ client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+ break;
+ }
+
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void RezObject(AssetBase primAsset, LLVector3 pos)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void DeRezObject(Packet packet, IClientAPI simClient)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public void SendAvatarsToClient(IClientAPI remoteClient)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void LinkObjects(uint parentPrim, List childPrims)
+ {
+
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void UpdatePrimPosition(uint localID, LLVector3 pos, IClientAPI remoteClient)
+ {
+ foreach (Entity ent in Entities.Values)
+ {
+ if (ent.localid == localID)
+ {
+ ((OpenSim.Region.Primitive)ent).UpdatePosition(pos);
+ break;
+ }
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void UpdatePrimScale(uint localID, LLVector3 scale, IClientAPI remoteClient)
+ {
+ }
+
+ ///
+ /// Sends prims to a client
+ ///
+ /// Client to send to
+ public void GetInitialPrims(IClientAPI RemoteClient)
+ {
+
+ }
+ }
+}
diff --git a/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs b/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
new file mode 100644
index 0000000..df5ca9b
--- /dev/null
+++ b/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
@@ -0,0 +1,184 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using libsecondlife;
+
+namespace OpenSim.Region
+{
+ public partial class Scene
+ {
+ private Dictionary scriptEngines = new Dictionary();
+
+ ///
+ ///
+ ///
+ private void LoadScriptEngines()
+ {
+ this.LoadScriptPlugins();
+ }
+
+ ///
+ ///
+ ///
+ public void LoadScriptPlugins()
+ {
+ string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines");
+ string[] pluginFiles = Directory.GetFiles(path, "*.dll");
+
+
+ for (int i = 0; i < pluginFiles.Length; i++)
+ {
+ this.AddPlugin(pluginFiles[i]);
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ private void AddPlugin(string FileName)
+ {
+ Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+
+ foreach (Type pluginType in pluginAssembly.GetTypes())
+ {
+ if (pluginType.IsPublic)
+ {
+ if (!pluginType.IsAbstract)
+ {
+ Type typeInterface = pluginType.GetInterface("IScriptEngine", true);
+
+ if (typeInterface != null)
+ {
+ IScriptEngine plug = (IScriptEngine)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+ plug.Init(this);
+ this.scriptEngines.Add(plug.GetName(), plug);
+
+ }
+
+ typeInterface = null;
+ }
+ }
+ }
+
+ pluginAssembly = null;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void LoadScript(string scriptType, string scriptName, string script, Entity ent)
+ {
+ if(this.scriptEngines.ContainsKey(scriptType))
+ {
+ this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.localid);
+ }
+ }
+
+ #region IScriptAPI Methods
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public LLVector3 GetEntityPosition(uint localID)
+ {
+ LLVector3 res = new LLVector3();
+ // Console.WriteLine("script- getting entity " + localID + " position");
+ foreach (Entity entity in this.Entities.Values)
+ {
+ if (entity.localid == localID)
+ {
+ res.X = entity.Pos.X;
+ res.Y = entity.Pos.Y;
+ res.Z = entity.Pos.Z;
+ }
+ }
+ return res;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void SetEntityPosition(uint localID, float x , float y, float z)
+ {
+ foreach (Entity entity in this.Entities.Values)
+ {
+ if (entity.localid == localID && entity is Primitive)
+ {
+ LLVector3 pos = entity.Pos;
+ pos.X = x;
+ pos.Y = y;
+ Primitive prim = entity as Primitive;
+ // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
+ //prim.UpdatePosition(pos);
+ // Console.WriteLine("script- setting entity " + localID + " positon");
+ }
+ }
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public uint GetRandomAvatarID()
+ {
+ //Console.WriteLine("script- getting random avatar id");
+ uint res = 0;
+ foreach (Entity entity in this.Entities.Values)
+ {
+ if (entity is Avatar)
+ {
+ res = entity.localid;
+ }
+ }
+ return res;
+ }
+
+ #endregion
+
+
+ }
+}
diff --git a/OpenSim/OpenSim.Region/Scene/Scene.cs b/OpenSim/OpenSim.Region/Scene/Scene.cs
new file mode 100644
index 0000000..e3ffca4
--- /dev/null
+++ b/OpenSim/OpenSim.Region/Scene/Scene.cs
@@ -0,0 +1,711 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.IO;
+using System.Threading;
+using System.Timers;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework;
+using OpenSim.Region.Scripting;
+using OpenSim.Terrain;
+using OpenGrid.Framework.Communications;
+using OpenSim.Region.Estate;
+
+
+namespace OpenSim.Region
+{
+ public delegate bool FilterAvatarList(Avatar avatar);
+
+ public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
+ {
+ protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
+ protected Dictionary Avatars;
+ protected Dictionary Prims;
+ private PhysicsScene phyScene;
+ private float timeStep = 0.1f;
+ public ILocalStorage localStorage;
+ private Random Rand = new Random();
+ private uint _primCount = 702000;
+ private int storageCount;
+ private Dictionary m_scriptHandlers;
+ private Dictionary m_scripts;
+ private Mutex updateLock;
+ public string m_datastore;
+ protected AuthenticateSessionsBase authenticateHandler;
+ protected RegionCommsHostBase regionCommsHost;
+ protected RegionServerCommsManager commsManager;
+
+ public ParcelManager parcelManager;
+ public EstateManager estateManager;
+
+ #region Properties
+ ///
+ ///
+ ///
+ public PhysicsScene PhysScene
+ {
+ set
+ {
+ this.phyScene = value;
+ }
+ get
+ {
+ return (this.phyScene);
+ }
+ }
+
+ #endregion
+
+ #region Constructors
+ ///
+ /// Creates a new World class, and a region to go with it.
+ ///
+ /// Dictionary to contain client threads
+ /// Region Handle for this region
+ /// Region Name for this region
+ public Scene(Dictionary clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)
+ {
+ try
+ {
+ updateLock = new Mutex(false);
+ this.authenticateHandler = authen;
+ this.commsManager = commsMan;
+ m_clientThreads = clientThreads;
+ m_regInfo = regInfo;
+ m_regionHandle = m_regInfo.RegionHandle;
+ m_regionName = m_regInfo.RegionName;
+ this.m_datastore = m_regInfo.DataStore;
+ this.RegisterRegionWithComms();
+
+ parcelManager = new ParcelManager(this, this.m_regInfo);
+ estateManager = new EstateManager(this, this.m_regInfo);
+
+ m_scriptHandlers = new Dictionary();
+ m_scripts = new Dictionary();
+
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance");
+ Entities = new Dictionary();
+ Avatars = new Dictionary();
+ Prims = new Dictionary();
+
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap");
+ TerrainManager = new TerrainManager(new SecondLife());
+ Terrain = new TerrainEngine();
+ Avatar.SetupTemplate("avatar-texture.dat");
+
+ Avatar.LoadAnims();
+
+ //this.SetDefaultScripts();
+ //this.LoadScriptEngines();
+
+
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString());
+ }
+ }
+ #endregion
+
+ ///
+ ///
+ ///
+ public void StartTimer()
+ {
+ m_heartbeatTimer.Enabled = true;
+ m_heartbeatTimer.Interval = 100;
+ m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
+ }
+
+
+ #region Update Methods
+
+
+ ///
+ /// Performs per-frame updates regularly
+ ///
+ ///
+ ///
+ void Heartbeat(object sender, System.EventArgs e)
+ {
+ this.Update();
+ }
+
+ ///
+ /// Performs per-frame updates on the world, this should be the central world loop
+ ///
+ public override void Update()
+ {
+ updateLock.WaitOne();
+ try
+ {
+ if (this.phyScene.IsThreaded)
+ {
+ this.phyScene.GetResults();
+
+ }
+
+ foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ {
+ Entities[UUID].addForces();
+ }
+
+ lock (this.m_syncRoot)
+ {
+ this.phyScene.Simulate(timeStep);
+ }
+
+ foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ {
+ Entities[UUID].update();
+ }
+
+ foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
+ {
+ scriptHandler.OnFrame();
+ }
+ foreach (IScriptEngine scripteng in this.scriptEngines.Values)
+ {
+ scripteng.OnFrame();
+ }
+ //backup world data
+ this.storageCount++;
+ if (storageCount > 1200) //set to how often you want to backup
+ {
+ this.Backup();
+ storageCount = 0;
+ }
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString());
+ }
+ updateLock.ReleaseMutex();
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public bool Backup()
+ {
+ try
+ {
+ // Terrain backup routines
+ if (Terrain.tainted > 0)
+ {
+ Terrain.tainted = 0;
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");
+ localStorage.SaveMap(Terrain.getHeights1D());
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");
+ lock (this.m_syncRoot)
+ {
+ phyScene.SetTerrain(Terrain.getHeights1D());
+ }
+ }
+
+ // Primitive backup routines
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives");
+ foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ {
+ Entities[UUID].BackUp();
+ }
+
+ //Parcel backup routines
+ ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
+ int i = 0;
+ foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
+ {
+ parcels[i] = parcel.parcelData;
+ i++;
+ }
+ localStorage.SaveParcels(parcels);
+
+ // Backup successful
+ return true;
+ }
+ catch (Exception e)
+ {
+ // Backup failed
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
+ return false;
+ }
+ }
+ #endregion
+
+ #region Setup Methods
+ ///
+ /// Loads a new storage subsystem from a named library
+ ///
+ /// Storage Library
+ /// Successful or not
+ public bool LoadStorageDLL(string dllName)
+ {
+ try
+ {
+ Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+ ILocalStorage store = null;
+
+ foreach (Type pluginType in pluginAssembly.GetTypes())
+ {
+ if (pluginType.IsPublic)
+ {
+ if (!pluginType.IsAbstract)
+ {
+ Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
+
+ if (typeInterface != null)
+ {
+ ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+ store = plug;
+
+ store.Initialise(this.m_datastore);
+ break;
+ }
+
+ typeInterface = null;
+ }
+ }
+ }
+ pluginAssembly = null;
+ this.localStorage = store;
+ return (store == null);
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
+ return false;
+ }
+ }
+
+ #endregion
+
+
+ #region Regenerate Terrain
+
+ ///
+ /// Rebuilds the terrain using a procedural algorithm
+ ///
+ public void RegenerateTerrain()
+ {
+ try
+ {
+ Terrain.hills();
+
+ lock (this.m_syncRoot)
+ {
+ this.phyScene.SetTerrain(Terrain.getHeights1D());
+ }
+ this.localStorage.SaveMap(this.Terrain.getHeights1D());
+
+ foreach (IClientAPI client in m_clientThreads.Values)
+ {
+ this.SendLayerData(client);
+ }
+
+ foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ {
+ Entities[UUID].LandRenegerated();
+ }
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+ }
+ }
+
+ ///
+ /// Rebuilds the terrain using a 2D float array
+ ///
+ /// 256,256 float array containing heights
+ public void RegenerateTerrain(float[,] newMap)
+ {
+ try
+ {
+ this.Terrain.setHeights2D(newMap);
+ lock (this.m_syncRoot)
+ {
+ this.phyScene.SetTerrain(this.Terrain.getHeights1D());
+ }
+ this.localStorage.SaveMap(this.Terrain.getHeights1D());
+
+ foreach (IClientAPI client in m_clientThreads.Values)
+ {
+ this.SendLayerData(client);
+ }
+
+ foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ {
+ Entities[UUID].LandRenegerated();
+ }
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+ }
+ }
+
+ ///
+ /// Rebuilds the terrain assuming changes occured at a specified point[?]
+ ///
+ /// ???
+ /// ???
+ /// ???
+ public void RegenerateTerrain(bool changes, int pointx, int pointy)
+ {
+ try
+ {
+ if (changes)
+ {
+ /* Dont save here, rely on tainting system instead */
+
+ foreach (IClientAPI client in m_clientThreads.Values)
+ {
+ this.SendLayerData(pointx, pointy, client);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+ }
+ }
+
+ #endregion
+
+ #region Load Terrain
+ ///
+ /// Loads the World heightmap
+ ///
+ public override void LoadWorldMap()
+ {
+ try
+ {
+ float[] map = this.localStorage.LoadWorld();
+ if (map == null)
+ {
+ Console.WriteLine("creating new terrain");
+ this.Terrain.hills();
+
+ this.localStorage.SaveMap(this.Terrain.getHeights1D());
+ }
+ else
+ {
+ this.Terrain.setHeights1D(map);
+ }
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
+ }
+ }
+ #endregion
+
+ #region Primitives Methods
+
+
+ ///
+ /// Loads the World's objects
+ ///
+ public void LoadPrimsFromStorage()
+ {
+ try
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives");
+ this.localStorage.LoadPrimitives(this);
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
+ }
+ }
+
+ ///
+ /// Loads a specific object from storage
+ ///
+ /// The object to load
+ public void PrimFromStorage(PrimData prim)
+ {
+
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void AddNewPrim(Packet addPacket, IClientAPI agentClient)
+ {
+ AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentId);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
+ {
+ try
+ {
+ // MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
+ Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
+
+ this.Entities.Add(prim.uuid, prim);
+ this._primCount++;
+ }
+ catch (Exception e)
+ {
+ // MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
+ }
+ }
+
+ #endregion
+
+ #region Add/Remove Avatar Methods
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public override void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)
+ {
+ remoteClient.OnRegionHandShakeReply += new GenericCall(this.SendLayerData);
+ //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
+ remoteClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);
+ remoteClient.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours);
+ remoteClient.OnAddPrim += new GenericCall4(this.AddNewPrim);
+ remoteClient.OnUpdatePrimPosition += new UpdatePrimVector(this.UpdatePrimPosition);
+
+ /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
+ remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
+ remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
+ remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
+ remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
+ */
+
+ Avatar newAvatar = null;
+ try
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
+ newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo);
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
+
+ //newAvatar.SendRegionHandshake();
+ this.estateManager.sendRegionHandshake(remoteClient);
+
+ PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
+ lock (this.m_syncRoot)
+ {
+ newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
+ }
+
+ lock (Entities)
+ {
+ if (!Entities.ContainsKey(agentID))
+ {
+ this.Entities.Add(agentID, newAvatar);
+ }
+ else
+ {
+ Entities[agentID] = newAvatar;
+ }
+ }
+ lock (Avatars)
+ {
+ if (Avatars.ContainsKey(agentID))
+ {
+ Avatars[agentID] = newAvatar;
+ }
+ else
+ {
+ this.Avatars.Add(agentID, newAvatar);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
+ }
+ return;
+ }
+
+ ///
+ ///
+ ///
+ protected void InformClientOfNeighbours(IClientAPI remoteClient)
+ {
+ // Console.WriteLine("informing client of neighbouring regions");
+ List neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo);
+
+ //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
+ if (neighbours != null)
+ {
+ for (int i = 0; i < neighbours.Count; i++)
+ {
+ // Console.WriteLine("sending neighbours data");
+ AgentCircuitData agent = remoteClient.RequestClientInfo();
+ agent.BaseFolder = LLUUID.Zero;
+ agent.InventoryFolder = LLUUID.Zero;
+ agent.startpos = new LLVector3(128, 128, 70);
+ this.commsManager.InterSims.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
+ remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
+ }
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public override void RemoveAvatar(LLUUID agentID)
+ {
+ return;
+ }
+ #endregion
+
+ #region Request Avatars List Methods
+ //The idea is to have a group of method that return a list of avatars meeting some requirement
+ // ie it could be all Avatars within a certain range of the calling prim/avatar.
+
+ ///
+ /// Request a List of all Avatars in this World
+ ///
+ ///
+ public List RequestAvatarList()
+ {
+ List result = new List();
+
+ foreach (Avatar avatar in Avatars.Values)
+ {
+ result.Add(avatar);
+ }
+
+ return result;
+ }
+
+ ///
+ /// Request a filtered list of Avatars in this World
+ ///
+ ///
+ public List RequestAvatarList(FilterAvatarList filter)
+ {
+ List result = new List();
+
+ foreach (Avatar avatar in Avatars.Values)
+ {
+ if (filter(avatar))
+ {
+ result.Add(avatar);
+ }
+ }
+
+ return result;
+ }
+
+ public Avatar RequestAvatar(LLUUID avatarID)
+ {
+ if (this.Avatars.ContainsKey(avatarID))
+ {
+ return Avatars[avatarID];
+ }
+ return null;
+ }
+ #endregion
+
+ #region ShutDown
+ ///
+ /// Tidy before shutdown
+ ///
+ public override void Close()
+ {
+ try
+ {
+ this.localStorage.ShutDown();
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
+ }
+ }
+ #endregion
+
+ #region RegionCommsHost
+
+ ///
+ ///
+ ///
+ public void RegisterRegionWithComms()
+ {
+ this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo);
+ if (this.regionCommsHost != null)
+ {
+ this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
+ {
+ // Console.WriteLine("World.cs - add new user connection");
+ //should just check that its meant for this region
+ if (regionHandle == this.m_regInfo.RegionHandle)
+ {
+ this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+ }
+ }
+
+ #endregion
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public override void SendLayerData(int px, int py, IClientAPI RemoteClient)
+ {
+ RemoteClient.SendLayerData( Terrain.getHeights1D() );
+ }
+ }
+}
diff --git a/OpenSim/OpenSim.Region/Scene/SceneBase.cs b/OpenSim/OpenSim.Region/Scene/SceneBase.cs
new file mode 100644
index 0000000..114b6a3
--- /dev/null
+++ b/OpenSim/OpenSim.Region/Scene/SceneBase.cs
@@ -0,0 +1,138 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.IO;
+using System.Threading;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Region.Scripting;
+using OpenSim.Terrain;
+
+namespace OpenSim.Region
+{
+ public abstract class SceneBase : IWorld
+ {
+ public Dictionary Entities;
+ protected Dictionary m_clientThreads;
+ protected ulong m_regionHandle;
+ protected string m_regionName;
+ protected RegionInfo m_regInfo;
+
+ public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
+ protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine
+ protected object m_syncRoot = new object();
+ private uint m_nextLocalId = 8880000;
+
+ #region Update Methods
+ ///
+ /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
+ ///
+ public abstract void Update();
+
+ #endregion
+
+ #region Terrain Methods
+
+ ///
+ /// Loads the World heightmap
+ ///
+ public abstract void LoadWorldMap();
+
+ ///
+ /// Send the region heightmap to the client
+ ///
+ /// Client to send to
+ public virtual void SendLayerData(IClientAPI RemoteClient)
+ {
+ RemoteClient.SendLayerData(Terrain.getHeights1D());
+ }
+
+ ///
+ /// Sends a specified patch to a client
+ ///
+ /// Patch coordinate (x) 0..16
+ /// Patch coordinate (y) 0..16
+ /// The client to send to
+ public abstract void SendLayerData(int px, int py, IClientAPI RemoteClient);
+
+ #endregion
+
+ #region Add/Remove Agent/Avatar
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
+
+ ///
+ ///
+ ///
+ ///
+ public abstract void RemoveAvatar(LLUUID agentID);
+
+ #endregion
+
+ ///
+ ///
+ ///
+ ///
+ public virtual RegionInfo RegionInfo
+ {
+ get { return null; }
+ }
+
+ public object SyncRoot
+ {
+ get { return m_syncRoot; }
+ }
+
+ public uint NextLocalId
+ {
+ get { return m_nextLocalId++; }
+ }
+
+ #region Shutdown
+ ///
+ /// Tidy before shutdown
+ ///
+ public abstract void Close();
+
+ #endregion
+
+
+ }
+}
diff --git a/OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs b/OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs
deleted file mode 100644
index 85ca247..0000000
--- a/OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-
-namespace OpenSim.Region
-{
- public partial class 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)
- {
- Console.WriteLine("Chat message");
- Avatar avatar = null;
- foreach (IClientAPI client in m_clientThreads.Values)
- {
- int dis = -1000;
- if (this.Avatars.ContainsKey(client.AgentId))
- {
-
- avatar = this.Avatars[client.AgentId];
- // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
- dis= (int)avatar.Pos.GetDistanceTo(fromPos);
- Console.WriteLine("found avatar at " +dis);
-
- }
-
- switch (type)
- {
- case 0: // Whisper
- if ((dis < 10) && (dis > -10))
- {
- //should change so the message is sent through the avatar rather than direct to the ClientView
- client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
- }
- break;
- case 1: // Say
- if ((dis < 30) && (dis > -30))
- {
- Console.WriteLine("sending chat");
- client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
- }
- break;
- case 2: // Shout
- if ((dis < 100) && (dis > -100))
- {
- client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
- }
- break;
-
- case 0xff: // Broadcast
- client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
- break;
- }
-
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- public void RezObject(AssetBase primAsset, LLVector3 pos)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void DeRezObject(Packet packet, IClientAPI simClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- public void SendAvatarsToClient(IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void LinkObjects(uint parentPrim, List childPrims)
- {
-
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimPosition(uint localID, LLVector3 pos, IClientAPI remoteClient)
- {
- foreach (Entity ent in Entities.Values)
- {
- if (ent.localid == localID)
- {
- ((OpenSim.Region.Primitive)ent).UpdatePosition(pos);
- break;
- }
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- public void UpdatePrimScale(uint localID, LLVector3 scale, IClientAPI remoteClient)
- {
- }
-
- ///
- /// Sends prims to a client
- ///
- /// Client to send to
- public void GetInitialPrims(IClientAPI RemoteClient)
- {
-
- }
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/World.Scripting.cs b/OpenSim/OpenSim.Region/Scene/World.Scripting.cs
deleted file mode 100644
index e4b5d02..0000000
--- a/OpenSim/OpenSim.Region/Scene/World.Scripting.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Reflection;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using libsecondlife;
-
-namespace OpenSim.Region
-{
- public partial class 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 LLVector3 GetEntityPosition(uint localID)
- {
- LLVector3 res = new LLVector3();
- // Console.WriteLine("script- getting entity " + localID + " position");
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity.localid == localID)
- {
- res.X = entity.Pos.X;
- res.Y = entity.Pos.Y;
- res.Z = entity.Pos.Z;
- }
- }
- return res;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void SetEntityPosition(uint localID, float x , float y, float z)
- {
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity.localid == localID && entity is Primitive)
- {
- LLVector3 pos = entity.Pos;
- pos.X = x;
- pos.Y = y;
- Primitive prim = entity as Primitive;
- // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
- //prim.UpdatePosition(pos);
- // Console.WriteLine("script- setting entity " + localID + " positon");
- }
- }
-
- }
-
- ///
- ///
- ///
- ///
- public uint GetRandomAvatarID()
- {
- //Console.WriteLine("script- getting random avatar id");
- uint res = 0;
- foreach (Entity entity in this.Entities.Values)
- {
- if (entity is Avatar)
- {
- res = entity.localid;
- }
- }
- return res;
- }
-
- #endregion
-
-
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/World.cs b/OpenSim/OpenSim.Region/Scene/World.cs
deleted file mode 100644
index 40eb7ef..0000000
--- a/OpenSim/OpenSim.Region/Scene/World.cs
+++ /dev/null
@@ -1,711 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using libsecondlife;
-using libsecondlife.Packets;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework;
-using OpenSim.Region.Scripting;
-using OpenSim.Terrain;
-using OpenGrid.Framework.Communications;
-using OpenSim.Region.Estate;
-
-
-namespace OpenSim.Region
-{
- public delegate bool FilterAvatarList(Avatar avatar);
-
- public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI
- {
- protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
- protected Dictionary Avatars;
- protected Dictionary Prims;
- private PhysicsScene phyScene;
- private float timeStep = 0.1f;
- public ILocalStorage localStorage;
- private Random Rand = new Random();
- private uint _primCount = 702000;
- private int storageCount;
- private Dictionary m_scriptHandlers;
- private Dictionary m_scripts;
- private Mutex updateLock;
- public string m_datastore;
- protected AuthenticateSessionsBase authenticateHandler;
- protected RegionCommsHostBase regionCommsHost;
- protected RegionServerCommsManager commsManager;
-
- public ParcelManager parcelManager;
- public EstateManager estateManager;
-
- #region Properties
- ///
- ///
- ///
- public PhysicsScene PhysScene
- {
- set
- {
- this.phyScene = value;
- }
- get
- {
- return (this.phyScene);
- }
- }
-
- #endregion
-
- #region Constructors
- ///
- /// Creates a new World class, and a region to go with it.
- ///
- /// Dictionary to contain client threads
- /// Region Handle for this region
- /// Region Name for this region
- public World(Dictionary clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)
- {
- try
- {
- updateLock = new Mutex(false);
- this.authenticateHandler = authen;
- this.commsManager = commsMan;
- m_clientThreads = clientThreads;
- m_regInfo = regInfo;
- m_regionHandle = m_regInfo.RegionHandle;
- m_regionName = m_regInfo.RegionName;
- this.m_datastore = m_regInfo.DataStore;
- this.RegisterRegionWithComms();
-
- parcelManager = new ParcelManager(this, this.m_regInfo);
- estateManager = new EstateManager(this, this.m_regInfo);
-
- m_scriptHandlers = new Dictionary();
- m_scripts = new Dictionary();
-
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance");
- Entities = new Dictionary();
- Avatars = new Dictionary();
- Prims = new Dictionary();
-
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap");
- TerrainManager = new TerrainManager(new SecondLife());
- Terrain = new TerrainEngine();
- Avatar.SetupTemplate("avatar-texture.dat");
-
- Avatar.LoadAnims();
-
- //this.SetDefaultScripts();
- //this.LoadScriptEngines();
-
-
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString());
- }
- }
- #endregion
-
- ///
- ///
- ///
- public void StartTimer()
- {
- m_heartbeatTimer.Enabled = true;
- m_heartbeatTimer.Interval = 100;
- m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
- }
-
-
- #region Update Methods
-
-
- ///
- /// Performs per-frame updates regularly
- ///
- ///
- ///
- void Heartbeat(object sender, System.EventArgs e)
- {
- this.Update();
- }
-
- ///
- /// Performs per-frame updates on the world, this should be the central world loop
- ///
- public override void Update()
- {
- updateLock.WaitOne();
- try
- {
- if (this.phyScene.IsThreaded)
- {
- this.phyScene.GetResults();
-
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].addForces();
- }
-
- lock (this.m_syncRoot)
- {
- this.phyScene.Simulate(timeStep);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].update();
- }
-
- foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
- {
- scriptHandler.OnFrame();
- }
- foreach (IScriptEngine scripteng in this.scriptEngines.Values)
- {
- scripteng.OnFrame();
- }
- //backup world data
- this.storageCount++;
- if (storageCount > 1200) //set to how often you want to backup
- {
- this.Backup();
- storageCount = 0;
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString());
- }
- updateLock.ReleaseMutex();
- }
-
- ///
- ///
- ///
- ///
- public bool Backup()
- {
- try
- {
- // Terrain backup routines
- if (Terrain.tainted > 0)
- {
- Terrain.tainted = 0;
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");
- localStorage.SaveMap(Terrain.getHeights1D());
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");
- lock (this.m_syncRoot)
- {
- phyScene.SetTerrain(Terrain.getHeights1D());
- }
- }
-
- // Primitive backup routines
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives");
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].BackUp();
- }
-
- //Parcel backup routines
- ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
- int i = 0;
- foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
- {
- parcels[i] = parcel.parcelData;
- i++;
- }
- localStorage.SaveParcels(parcels);
-
- // Backup successful
- return true;
- }
- catch (Exception e)
- {
- // Backup failed
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
- return false;
- }
- }
- #endregion
-
- #region Setup Methods
- ///
- /// Loads a new storage subsystem from a named library
- ///
- /// Storage Library
- /// Successful or not
- public bool LoadStorageDLL(string dllName)
- {
- try
- {
- Assembly pluginAssembly = Assembly.LoadFrom(dllName);
- ILocalStorage store = null;
-
- foreach (Type pluginType in pluginAssembly.GetTypes())
- {
- if (pluginType.IsPublic)
- {
- if (!pluginType.IsAbstract)
- {
- Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
-
- if (typeInterface != null)
- {
- ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
- store = plug;
-
- store.Initialise(this.m_datastore);
- break;
- }
-
- typeInterface = null;
- }
- }
- }
- pluginAssembly = null;
- this.localStorage = store;
- return (store == null);
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
- return false;
- }
- }
-
- #endregion
-
-
- #region Regenerate Terrain
-
- ///
- /// Rebuilds the terrain using a procedural algorithm
- ///
- public void RegenerateTerrain()
- {
- try
- {
- Terrain.hills();
-
- lock (this.m_syncRoot)
- {
- this.phyScene.SetTerrain(Terrain.getHeights1D());
- }
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
-
- foreach (IClientAPI client in m_clientThreads.Values)
- {
- this.SendLayerData(client);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].LandRenegerated();
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Rebuilds the terrain using a 2D float array
- ///
- /// 256,256 float array containing heights
- public void RegenerateTerrain(float[,] newMap)
- {
- try
- {
- this.Terrain.setHeights2D(newMap);
- lock (this.m_syncRoot)
- {
- this.phyScene.SetTerrain(this.Terrain.getHeights1D());
- }
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
-
- foreach (IClientAPI client in m_clientThreads.Values)
- {
- this.SendLayerData(client);
- }
-
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
- {
- Entities[UUID].LandRenegerated();
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Rebuilds the terrain assuming changes occured at a specified point[?]
- ///
- /// ???
- /// ???
- /// ???
- public void RegenerateTerrain(bool changes, int pointx, int pointy)
- {
- try
- {
- if (changes)
- {
- /* Dont save here, rely on tainting system instead */
-
- foreach (IClientAPI client in m_clientThreads.Values)
- {
- this.SendLayerData(pointx, pointy, client);
- }
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
- }
- }
-
- #endregion
-
- #region Load Terrain
- ///
- /// Loads the World heightmap
- ///
- public override void LoadWorldMap()
- {
- try
- {
- float[] map = this.localStorage.LoadWorld();
- if (map == null)
- {
- Console.WriteLine("creating new terrain");
- this.Terrain.hills();
-
- this.localStorage.SaveMap(this.Terrain.getHeights1D());
- }
- else
- {
- this.Terrain.setHeights1D(map);
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
- }
- }
- #endregion
-
- #region Primitives Methods
-
-
- ///
- /// Loads the World's objects
- ///
- public void LoadPrimsFromStorage()
- {
- try
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives");
- this.localStorage.LoadPrimitives(this);
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
- }
- }
-
- ///
- /// Loads a specific object from storage
- ///
- /// The object to load
- public void PrimFromStorage(PrimData prim)
- {
-
- }
-
- ///
- ///
- ///
- ///
- ///
- public void AddNewPrim(Packet addPacket, IClientAPI agentClient)
- {
- AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentId);
- }
-
- ///
- ///
- ///
- ///
- ///
- public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
- {
- try
- {
- // MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
- Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
-
- this.Entities.Add(prim.uuid, prim);
- this._primCount++;
- }
- catch (Exception e)
- {
- // MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
- }
- }
-
- #endregion
-
- #region Add/Remove Avatar Methods
-
- ///
- ///
- ///
- ///
- ///
- public override void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)
- {
- remoteClient.OnRegionHandShakeReply += new GenericCall(this.SendLayerData);
- //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
- remoteClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);
- remoteClient.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours);
- remoteClient.OnAddPrim += new GenericCall4(this.AddNewPrim);
- remoteClient.OnUpdatePrimPosition += new UpdatePrimVector(this.UpdatePrimPosition);
-
- /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
- remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
- remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
- remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
- remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
- */
-
- Avatar newAvatar = null;
- try
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
- newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
-
- //newAvatar.SendRegionHandshake();
- this.estateManager.sendRegionHandshake(remoteClient);
-
- PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
- lock (this.m_syncRoot)
- {
- newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
- }
-
- lock (Entities)
- {
- if (!Entities.ContainsKey(agentID))
- {
- this.Entities.Add(agentID, newAvatar);
- }
- else
- {
- Entities[agentID] = newAvatar;
- }
- }
- lock (Avatars)
- {
- if (Avatars.ContainsKey(agentID))
- {
- Avatars[agentID] = newAvatar;
- }
- else
- {
- this.Avatars.Add(agentID, newAvatar);
- }
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
- }
- return;
- }
-
- ///
- ///
- ///
- protected void InformClientOfNeighbours(IClientAPI remoteClient)
- {
- // Console.WriteLine("informing client of neighbouring regions");
- List neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo);
-
- //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
- if (neighbours != null)
- {
- for (int i = 0; i < neighbours.Count; i++)
- {
- // Console.WriteLine("sending neighbours data");
- AgentCircuitData agent = remoteClient.RequestClientInfo();
- agent.BaseFolder = LLUUID.Zero;
- agent.InventoryFolder = LLUUID.Zero;
- agent.startpos = new LLVector3(128, 128, 70);
- this.commsManager.InterSims.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
- remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
- }
- }
- }
-
- ///
- ///
- ///
- ///
- public override void RemoveAvatar(LLUUID agentID)
- {
- return;
- }
- #endregion
-
- #region Request Avatars List Methods
- //The idea is to have a group of method that return a list of avatars meeting some requirement
- // ie it could be all Avatars within a certain range of the calling prim/avatar.
-
- ///
- /// Request a List of all Avatars in this World
- ///
- ///
- public List RequestAvatarList()
- {
- List result = new List();
-
- foreach (Avatar avatar in Avatars.Values)
- {
- result.Add(avatar);
- }
-
- return result;
- }
-
- ///
- /// Request a filtered list of Avatars in this World
- ///
- ///
- public List RequestAvatarList(FilterAvatarList filter)
- {
- List result = new List();
-
- foreach (Avatar avatar in Avatars.Values)
- {
- if (filter(avatar))
- {
- result.Add(avatar);
- }
- }
-
- return result;
- }
-
- public Avatar RequestAvatar(LLUUID avatarID)
- {
- if (this.Avatars.ContainsKey(avatarID))
- {
- return Avatars[avatarID];
- }
- return null;
- }
- #endregion
-
- #region ShutDown
- ///
- /// Tidy before shutdown
- ///
- public override void Close()
- {
- try
- {
- this.localStorage.ShutDown();
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
- }
- }
- #endregion
-
- #region RegionCommsHost
-
- ///
- ///
- ///
- public void RegisterRegionWithComms()
- {
- this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo);
- if (this.regionCommsHost != null)
- {
- this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
- {
- // Console.WriteLine("World.cs - add new user connection");
- //should just check that its meant for this region
- if (regionHandle == this.m_regInfo.RegionHandle)
- {
- this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
- }
- }
-
- #endregion
-
- ///
- ///
- ///
- ///
- ///
- ///
- public override void SendLayerData(int px, int py, IClientAPI RemoteClient)
- {
- RemoteClient.SendLayerData( Terrain.getHeights1D() );
- }
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/WorldBase.cs b/OpenSim/OpenSim.Region/Scene/WorldBase.cs
deleted file mode 100644
index d77d2cf..0000000
--- a/OpenSim/OpenSim.Region/Scene/WorldBase.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using libsecondlife;
-using libsecondlife.Packets;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
-using System.Threading;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Region.Scripting;
-using OpenSim.Terrain;
-
-namespace OpenSim.Region
-{
- public abstract class WorldBase : IWorld
- {
- public Dictionary Entities;
- protected Dictionary m_clientThreads;
- protected ulong m_regionHandle;
- protected string m_regionName;
- protected RegionInfo m_regInfo;
-
- public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
- protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine
- protected object m_syncRoot = new object();
- private uint m_nextLocalId = 8880000;
-
- #region Update Methods
- ///
- /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
- ///
- public abstract void Update();
-
- #endregion
-
- #region Terrain Methods
-
- ///
- /// Loads the World heightmap
- ///
- public abstract void LoadWorldMap();
-
- ///
- /// Send the region heightmap to the client
- ///
- /// Client to send to
- public virtual void SendLayerData(IClientAPI RemoteClient)
- {
- RemoteClient.SendLayerData(Terrain.getHeights1D());
- }
-
- ///
- /// Sends a specified patch to a client
- ///
- /// Patch coordinate (x) 0..16
- /// Patch coordinate (y) 0..16
- /// The client to send to
- public abstract void SendLayerData(int px, int py, IClientAPI RemoteClient);
-
- #endregion
-
- #region Add/Remove Agent/Avatar
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
-
- ///
- ///
- ///
- ///
- public abstract void RemoveAvatar(LLUUID agentID);
-
- #endregion
-
- ///
- ///
- ///
- ///
- public virtual RegionInfo RegionInfo
- {
- get { return null; }
- }
-
- public object SyncRoot
- {
- get { return m_syncRoot; }
- }
-
- public uint NextLocalId
- {
- get { return m_nextLocalId++; }
- }
-
- #region Shutdown
- ///
- /// Tidy before shutdown
- ///
- public abstract void Close();
-
- #endregion
-
-
- }
-}
diff --git a/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs b/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
index f1a236f..e45473b 100644
--- a/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
+++ b/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Scripting
public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
{
- private World m_world;
+ private Scene m_world;
private Script m_script;
private Entity m_entity;
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Scripting
m_script.OnFrame(this);
}
- public ScriptHandler(Script script, Entity entity, World world)
+ public ScriptHandler(Script script, Entity entity, Scene world)
{
m_script = script;
m_entity = entity;
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 0d177b9..b419101 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -180,7 +180,7 @@ namespace OpenSim
protected override void SetupWorld()
{
IGenericConfig regionConfig;
- World LocalWorld;
+ Scene LocalWorld;
UDPServer udpServer;
RegionInfo regionDat = new RegionInfo();
AuthenticateSessionsBase authenBase;
@@ -234,7 +234,7 @@ namespace OpenSim
m_console.componentname = "Region " + regionData.RegionName;
*/
- LocalWorld = new World(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager);
+ LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager);
this.m_localWorld.Add(LocalWorld);
//LocalWorld.InventoryCache = InventoryCache;
//LocalWorld.AssetCache = AssetCache;
@@ -392,7 +392,7 @@ namespace OpenSim
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating");
for (int i = 0; i < m_localWorld.Count; i++)
{
- ((World)m_localWorld[i]).Close();
+ ((Scene)m_localWorld[i]).Close();
}
m_console.Close();
Environment.Exit(0);
--
cgit v1.1