From 646bbbc84b8010e0dacbeed5342cdb045f46cc49 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 27 Jun 2007 15:28:52 +0000
Subject: Some work on restructuring the namespaces / project names. Note this
 doesn't compile yet as not all the code has been changed to use the new
 namespaces. Am committing it now for feedback on the namespaces.

---
 OpenGridServices.sln                               |   95 +
 OpenSim.FxCop                                      | 7241 ++++++++++++++++++++
 OpenSim.sln                                        |  163 +
 OpenSim.suo                                        |  Bin 0 -> 319018 bytes
 .../Communications.OGS1/GridCommsManager.cs        |   18 +
 .../Communications.OGS1/OGS1GridServices.cs        |  248 +
 .../Communications.OGS1/OGSInterSimComms.cs        |   70 +
 .../Communications.OGS1/OGSUserServices.cs         |   25 +
 .../OpenSim.Framework.Communications.OGS1.csproj   |  142 +
 ...enSim.Framework.Communications.OGS1.csproj.user |   12 +
 .../Communications.OGS1/Properties/AssemblyInfo.cs |   35 +
 .../Communications/CommunicationsManager.cs        |   51 +
 OpenSim/Framework/Communications/IGridServices.cs  |   51 +
 .../Communications/IInterRegionCommunications.cs   |   41 +
 OpenSim/Framework/Communications/IUserServices.cs  |   44 +
 .../OpenSim.Framework.Communications.csproj        |  112 +
 .../OpenSim.Framework.Communications.csproj.user   |   12 +
 .../Communications/Properties/AssemblyInfo.cs      |   62 +
 OpenSim/Framework/Console/AssemblyInfo.cs          |   58 +
 OpenSim/Framework/Console/ConsoleCallbacksBase.cs  |   39 +
 OpenSim/Framework/Console/LogBase.cs               |  238 +
 OpenSim/Framework/Console/MainLog.cs               |   49 +
 .../Console/OpenSim.Framework.Console.csproj       |   89 +
 .../Console/OpenSim.Framework.Console.csproj.user  |   12 +
 OpenSim/Framework/Data.DB4o/DB4oGridData.cs        |  166 +
 OpenSim/Framework/Data.DB4o/DB4oManager.cs         |  165 +
 OpenSim/Framework/Data.DB4o/DB4oUserData.cs        |  205 +
 .../Data.DB4o/OpenSim.Framework.Data.DB4o.csproj   |  111 +
 .../OpenSim.Framework.Data.DB4o.csproj.user        |   12 +
 .../Framework/Data.DB4o/Properties/AssemblyInfo.cs |   35 +
 OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs      |  192 +
 OpenSim/Framework/Data.MSSQL/MSSQLManager.cs       |  214 +
 .../Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj |  104 +
 .../OpenSim.Framework.Data.MSSQL.csproj.user       |   12 +
 .../Data.MSSQL/Properties/AssemblyInfo.cs          |   35 +
 OpenSim/Framework/Data.MySQL/MySQLGridData.cs      |  285 +
 OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs |  309 +
 OpenSim/Framework/Data.MySQL/MySQLLogData.cs       |  107 +
 OpenSim/Framework/Data.MySQL/MySQLManager.cs       |  609 ++
 OpenSim/Framework/Data.MySQL/MySQLUserData.cs      |  257 +
 .../Data.MySQL/OpenSim.Framework.Data.MySQL.csproj |  117 +
 .../OpenSim.Framework.Data.MySQL.csproj.user       |   12 +
 .../Data.MySQL/Properties/AssemblyInfo.cs          |   35 +
 .../OpenSim.Framework.Data.SQLite.csproj           |  108 +
 .../OpenSim.Framework.Data.SQLite.csproj.user      |   12 +
 .../Data.SQLite/Properties/AssemblyInfo.cs         |   35 +
 OpenSim/Framework/Data.SQLite/SQLiteGridData.cs    |  195 +
 OpenSim/Framework/Data.SQLite/SQLiteManager.cs     |  209 +
 OpenSim/Framework/Data/GridData.cs                 |  113 +
 OpenSim/Framework/Data/ILogData.cs                 |   94 +
 OpenSim/Framework/Data/IniConfig.cs                |  100 +
 OpenSim/Framework/Data/InventoryData.cs            |  187 +
 .../Framework/Data/OpenSim.Framework.Data.csproj   |  116 +
 .../Data/OpenSim.Framework.Data.csproj.user        |   12 +
 OpenSim/Framework/Data/Properties/AssemblyInfo.cs  |   35 +
 OpenSim/Framework/Data/ReservationData.cs          |   51 +
 OpenSim/Framework/Data/SimProfileData.cs           |  114 +
 OpenSim/Framework/Data/UserData.cs                 |  131 +
 OpenSim/Framework/Data/UserProfileData.cs          |  182 +
 OpenSim/Framework/General/AgentInventory.cs        |  267 +
 .../Framework/General/AuthenticateSessionBase.cs   |  132 +
 OpenSim/Framework/General/BlockingQueue.cs         |   60 +
 OpenSim/Framework/General/IRegionCommsListener.cs  |   47 +
 .../General/Interfaces/AuthenticateResponse.cs     |   51 +
 .../General/Interfaces/Config/IGenericConfig.cs    |   42 +
 .../General/Interfaces/Config/IGridConfig.cs       |   63 +
 .../General/Interfaces/Config/IUserConfig.cs       |   57 +
 .../Framework/General/Interfaces/IAssetServer.cs   |   69 +
 OpenSim/Framework/General/Interfaces/IClientAPI.cs |  160 +
 .../Framework/General/Interfaces/ILocalStorage.cs  |   69 +
 .../Framework/General/Interfaces/IUserServer.cs    |   42 +
 OpenSim/Framework/General/Interfaces/IWorld.cs     |   45 +
 .../General/Interfaces/Scripting/IScriptAPI.cs     |   42 +
 .../General/Interfaces/Scripting/IScriptEngine.cs  |   41 +
 OpenSim/Framework/General/LLSDHelpers.cs           |  246 +
 OpenSim/Framework/General/Logger.cs                |   85 +
 OpenSim/Framework/General/LoginService.cs          |   41 +
 OpenSim/Framework/General/OpenSim.Framework.csproj |  213 +
 .../General/OpenSim.Framework.csproj.user          |   12 +
 .../Framework/General/Properties/AssemblyInfo.cs   |   33 +
 OpenSim/Framework/General/RegionCommsListener.cs   |   69 +
 OpenSim/Framework/General/Remoting.cs              |  136 +
 OpenSim/Framework/General/SimProfile.cs            |  122 +
 OpenSim/Framework/General/Types/AgentCiruitData.cs |   50 +
 OpenSim/Framework/General/Types/AgentWearable.cs   |   60 +
 OpenSim/Framework/General/Types/AssetBase.cs       |   49 +
 OpenSim/Framework/General/Types/AssetLandmark.cs   |   61 +
 OpenSim/Framework/General/Types/AssetStorage.cs    |   50 +
 OpenSim/Framework/General/Types/EstateSettings.cs  |   97 +
 OpenSim/Framework/General/Types/Login.cs           |   52 +
 OpenSim/Framework/General/Types/MapBlockData.cs    |   25 +
 OpenSim/Framework/General/Types/NeighbourInfo.cs   |   50 +
 .../Framework/General/Types/NetworkServersInfo.cs  |  181 +
 OpenSim/Framework/General/Types/ParcelData.cs      |  115 +
 OpenSim/Framework/General/Types/PrimData.cs        |  230 +
 OpenSim/Framework/General/Types/RegionHandle.cs    |  120 +
 OpenSim/Framework/General/Types/RegionInfo.cs      |  304 +
 OpenSim/Framework/General/UserProfile.cs           |   89 +
 OpenSim/Framework/General/Util.cs                  |  186 +
 .../Xml/OpenSim.Framework.GenericConfig.Xml.csproj |   93 +
 ...OpenSim.Framework.GenericConfig.Xml.csproj.user |   12 +
 .../GenericConfig/Xml/Properties/AssemblyInfo.cs   |   35 +
 OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs   |  123 +
 OpenSim/Framework/Servers/BaseHttpServer.cs        |  312 +
 OpenSim/Framework/Servers/CheckSumServer.cs        |  141 +
 OpenSim/Framework/Servers/IRestHandler.cs          |   35 +
 .../Servers/OpenSim.Framework.Servers.csproj       |  116 +
 .../Servers/OpenSim.Framework.Servers.csproj.user  |   12 +
 OpenSim/Framework/Servers/UDPServerBase.cs         |   95 +
 OpenSim/Framework/Servers/XmlRpcMethod.cs          |   34 +
 OpenSim/Framework/UserManager/LoginResponse.cs     |  645 ++
 .../OpenSim.Framework.UserManagement.csproj        |  125 +
 .../OpenSim.Framework.UserManagement.csproj.user   |   12 +
 OpenSim/Framework/UserManager/UserManagerBase.cs   |  641 ++
 OpenSim/Grid/AssetServer/AssetHttpServer.cs        |  130 +
 OpenSim/Grid/AssetServer/Main.cs                   |  337 +
 .../AssetServer/OpenSim.Grid.AssetServer.csproj    |  118 +
 .../OpenSim.Grid.AssetServer.csproj.user           |   12 +
 .../Grid/AssetServer/Properties/AssemblyInfo.cs    |   60 +
 .../Grid/Framework.Manager/GridManagementAgent.cs  |  140 +
 .../Grid/Framework.Manager/GridServerManager.cs    |   94 +
 .../OpenSim.Grid.Framework.Manager.csproj          |   99 +
 .../OpenSim.Grid.Framework.Manager.csproj.user     |   12 +
 OpenSim/Grid/GridServer.Config/AssemblyInfo.cs     |   58 +
 OpenSim/Grid/GridServer.Config/DbGridConfig.cs     |  161 +
 .../OpenSim.Grid.GridServer.Config.csproj          |  107 +
 .../OpenSim.Grid.GridServer.Config.csproj.user     |   12 +
 OpenSim/Grid/GridServer/GridManager.cs             |  599 ++
 OpenSim/Grid/GridServer/Main.cs                    |  271 +
 .../Grid/GridServer/OpenSim.Grid.GridServer.csproj |  134 +
 .../GridServer/OpenSim.Grid.GridServer.csproj.user |   12 +
 OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs |   60 +
 OpenSim/Grid/InventoryServer/InventoryManager.cs   |  125 +
 OpenSim/Grid/InventoryServer/Main.cs               |   87 +
 OpenSim/Grid/Manager/OpenGridServices.Manager.mds  |   16 +
 .../Manager/OpenGridServices.Manager.userprefs     |   39 +
 .../Manager/OpenGridServices.Manager.usertasks     |    2 +
 .../OpenGridServices.Manager/AssemblyInfo.cs       |   32 +
 .../OpenGridServices.Manager/BlockingQueue.cs      |   33 +
 .../Connect to grid server.cs                      |   16 +
 .../ConnectToGridServerDialog.cs                   |   29 +
 .../GridServerConnectionManager.cs                 |  106 +
 .../Grid/Manager/OpenGridServices.Manager/Main.cs  |   96 +
 .../Manager/OpenGridServices.Manager/MainWindow.cs |   76 +
 .../OpenGridServices.Manager.mdp                   |   43 +
 .../OpenGridServices.Manager.pidb                  |  Bin 0 -> 12308 bytes
 .../OpenGridServices.Manager/RegionBlock.cs        |   37 +
 .../Grid/Manager/OpenGridServices.Manager/Util.cs  |  133 +
 ...idServices.Manager.ConnectToGridServerDialog.cs |  226 +
 .../gtk-gui/OpenGridServices.Manager.MainWindow.cs |  256 +
 .../OpenGridServices.Manager/gtk-gui/generated.cs  |   35 +
 .../OpenGridServices.Manager/gtk-gui/gui.stetic    |  502 ++
 OpenSim/Grid/UserServer.Config/AssemblyInfo.cs     |   58 +
 OpenSim/Grid/UserServer.Config/DbUserConfig.cs     |   96 +
 .../OpenSim.Grid.UserServer.Config.csproj          |  107 +
 .../OpenSim.Grid.UserServer.Config.csproj.user     |   12 +
 OpenSim/Grid/UserServer/Main.cs                    |  219 +
 .../Grid/UserServer/OpenSim.Grid.UserServer.csproj |  132 +
 .../UserServer/OpenSim.Grid.UserServer.csproj.user |   12 +
 OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs |   33 +
 OpenSim/Grid/UserServer/UserManager.cs             |  103 +
 OpenSim/Region/Application/Application.cs          |  121 +
 OpenSim/Region/Application/OpenSim.csproj          |  181 +
 OpenSim/Region/Application/OpenSim.csproj.user     |   13 +
 OpenSim/Region/Application/OpenSimMain.cs          |  476 ++
 OpenSim/Region/Caches/AssetCache.cs                |  670 ++
 OpenSim/Region/Caches/OpenSim.Region.Caches.csproj |   97 +
 .../Caches/OpenSim.Region.Caches.csproj.user       |   12 +
 OpenSim/Region/Caches/Properties/AssemblyInfo.cs   |   35 +
 OpenSim/Region/Caps/Caps.cs                        |  258 +
 OpenSim/Region/Caps/LLSDHelpers.cs                 |  246 +
 .../Region/ClientStack/Assets/InventoryCache.cs    |  337 +
 .../ClientStack/ClientStackNetworkHandler.cs       |   46 +
 OpenSim/Region/ClientStack/ClientView.API.cs       |  975 +++
 .../ClientStack/ClientView.AgentAssetUpload.cs     |  358 +
 .../ClientStack/ClientView.PacketHandlers.cs       |  198 +
 .../ClientStack/ClientView.ProcessPackets.cs       |  550 ++
 OpenSim/Region/ClientStack/ClientView.cs           |  273 +
 OpenSim/Region/ClientStack/ClientViewBase.cs       |  327 +
 .../ClientStack/OpenSim.Region.ClientStack.csproj  |  173 +
 .../OpenSim.Region.ClientStack.csproj.user         |   12 +
 OpenSim/Region/ClientStack/PacketServer.cs         |  183 +
 .../Region/ClientStack/RegionApplicationBase.cs    |  129 +
 OpenSim/Region/ClientStack/UDPServer.cs            |  208 +
 OpenSim/Region/ClientStack/VersionInfo.cs          |   38 +
 OpenSim/Region/Examples/SimpleApp/MyWorld.cs       |  113 +
 OpenSim/Region/Examples/SimpleApp/Program.cs       |  128 +
 .../Examples/SimpleApp/Properties/AssemblyInfo.cs  |   33 +
 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj |  154 +
 .../Examples/SimpleApp/SimpleApp.csproj.user       |   12 +
 .../Region/GridInterfaces/Local/AssemblyInfo.cs    |   58 +
 .../GridInterfaces/Local/LocalAssetServer.cs       |  312 +
 .../OpenSim.Region.GridInterfaces.Local.csproj     |  107 +
 ...OpenSim.Region.GridInterfaces.Local.csproj.user |   12 +
 .../Region/GridInterfaces/Remote/AssemblyInfo.cs   |   58 +
 .../OpenSim.Region.GridInterfaces.Remote.csproj    |  107 +
 ...penSim.Region.GridInterfaces.Remote.csproj.user |   12 +
 .../GridInterfaces/Remote/RemoteAssetServer.cs     |  135 +
 .../LocalCommunications/CommunicationsLocal.cs     |   61 +
 .../LocalCommunications/LocalBackEndServices.cs    |  209 +
 .../LocalCommunications/LocalUserServices.cs       |  118 +
 .../OpenSim.Region.LocalCommunications.csproj      |  121 +
 .../OpenSim.Region.LocalCommunications.csproj.user |   12 +
 .../LocalCommunications/Properties/AssemblyInfo.cs |   35 +
 .../Physics/BasicPhysicsPlugin/AssemblyInfo.cs     |   58 +
 .../BasicPhysicsPlugin/BasicPhysicsPlugin.cs       |  294 +
 ...penSim.Region.Physics.BasicPhysicsPlugin.csproj |   93 +
 ...m.Region.Physics.BasicPhysicsPlugin.csproj.user |   12 +
 OpenSim/Region/Physics/Manager/AssemblyInfo.cs     |   58 +
 .../Manager/OpenSim.Region.Physics.Manager.csproj  |  112 +
 .../OpenSim.Region.Physics.Manager.csproj.user     |   12 +
 OpenSim/Region/Physics/Manager/PhysicsActor.cs     |  161 +
 OpenSim/Region/Physics/Manager/PhysicsManager.cs   |  117 +
 OpenSim/Region/Physics/Manager/PhysicsScene.cs     |  113 +
 OpenSim/Region/Physics/Manager/PhysicsVector.cs    |   54 +
 OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs   |   58 +
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs      |  456 ++
 .../OpenSim.Region.Physics.OdePlugin.csproj        |   97 +
 .../OpenSim.Region.Physics.OdePlugin.csproj.user   |   12 +
 OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs |   58 +
 .../OpenSim.Region.Physics.PhysXPlugin.csproj      |   97 +
 .../OpenSim.Region.Physics.PhysXPlugin.csproj.user |   12 +
 OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs  |  424 ++
 .../Region/Scripting/Properties/AssemblyInfo.cs    |   35 +
 OpenSim/Region/Scripting/Script.cs                 |   32 +
 OpenSim/Region/Scripting/ScriptAccess.cs           |   31 +
 OpenSim/Region/Simulation/Caps.cs                  |  258 +
 OpenSim/Region/Simulation/EstateManager.cs         |  301 +
 .../Simulation/OpenSim.Region.Simulation.csproj    |  211 +
 .../OpenSim.Region.Simulation.csproj.user          |   12 +
 OpenSim/Region/Simulation/ParcelManager.cs         |  892 +++
 OpenSim/Region/Simulation/RegionManager.cs         |   30 +
 OpenSim/Region/Simulation/Scenes/Entity.cs         |  194 +
 .../Region/Simulation/Scenes/IScenePresenceBody.cs |   19 +
 OpenSim/Region/Simulation/Scenes/Primitive.cs      |  582 ++
 .../Simulation/Scenes/Scene.PacketHandlers.cs      |  305 +
 .../Region/Simulation/Scenes/Scene.Scripting.cs    |  184 +
 OpenSim/Region/Simulation/Scenes/Scene.cs          |  795 +++
 OpenSim/Region/Simulation/Scenes/SceneBase.cs      |  201 +
 OpenSim/Region/Simulation/Scenes/SceneEvents.cs    |   52 +
 OpenSim/Region/Simulation/Scenes/SceneObject.cs    |  128 +
 .../Simulation/Scenes/ScenePresence.Animations.cs  |   76 +
 .../Region/Simulation/Scenes/ScenePresence.Body.cs |   90 +
 OpenSim/Region/Simulation/Scenes/ScenePresence.cs  |  525 ++
 .../Simulation/Scenes/scripting/IScriptContext.cs  |   40 +
 .../Simulation/Scenes/scripting/IScriptEntity.cs   |   46 +
 .../Simulation/Scenes/scripting/IScriptHandler.cs  |  126 +
 .../Region/Simulation/Scenes/scripting/Script.cs   |   53 +
 .../Simulation/Scenes/scripting/ScriptFactory.cs   |   35 +
 .../Scenes/scripting/Scripts/FollowRandomAvatar.cs |   64 +
 .../LocalStorageBerkeleyDB/BDBLocalStorage.cs      |  117 +
 ...im.Region.Storage.LocalStorageBerkeleyDB.csproj |  112 +
 ...gion.Storage.LocalStorageBerkeleyDB.csproj.user |   12 +
 ...penSim.Storage.LocalStorageBerkeleyDB.dll.build |   46 +
 .../Storage/LocalStorageDb4o/AssemblyInfo.cs       |   58 +
 .../Storage/LocalStorageDb4o/Db4LocalStorage.cs    |  271 +
 .../Region/Storage/LocalStorageDb4o/MapStorage.cs  |   43 +
 .../OpenSim.Region.Storage.LocalStorageDb4o.csproj |  116 +
 ...Sim.Region.Storage.LocalStorageDb4o.csproj.user |   12 +
 .../Storage/LocalStorageDb4o/UUIDParcelQuery.cs    |   52 +
 .../Storage/LocalStorageDb4o/UUIDPrimQuery.cs      |   52 +
 ...penSim.Region.Storage.LocalStorageSQLite.csproj |  111 +
 ...m.Region.Storage.LocalStorageSQLite.csproj.user |   12 +
 .../OpenSim.Storage.LocalStorageSQLite.dll.build   |   46 +
 .../LocalStorageSQLite/Properties/AssemblyInfo.cs  |   62 +
 .../LocalStorageSQLite/SQLiteLocalStorage.cs       |  198 +
 .../OpenSim.Region.Terrain.BasicTerrain.csproj     |  110 +
 ...OpenSim.Region.Terrain.BasicTerrain.csproj.user |   12 +
 .../Properties/AssemblyInfo.cs                     |   62 +
 .../Region/Terrain.BasicTerrain/TerrainEngine.cs   |  786 +++
 .../Region/Terrain.BasicTerrain/TerrainFilter.cs   |  103 +
 Prebuild/Prebuild.build                            |   67 +
 Prebuild/Prebuild.sln                              |   19 +
 Prebuild/Prebuild.suo                              |  Bin 0 -> 21504 bytes
 Prebuild/README                                    |  230 +
 Prebuild/TODO                                      |   21 +
 Prebuild/doc/prebuild-example1.xml                 |  300 +
 Prebuild/doc/prebuild-example2.xml                 |   72 +
 Prebuild/doc/prebuild-example3.xml                 |  113 +
 Prebuild/doc/prebuild-example4.xml                 |  715 ++
 Prebuild/doc/prebuild-example5.xml                 |  187 +
 Prebuild/prebuild                                  |    2 +
 Prebuild/scripts/Clean.bat                         |    2 +
 Prebuild/scripts/Help.bat                          |    2 +
 Prebuild/scripts/MonoDevelop.sh                    |    2 +
 Prebuild/scripts/Prebuild.nsi                      |  231 +
 Prebuild/scripts/SharpDevelop.bat                  |    4 +
 Prebuild/scripts/SharpDevelop2.bat                 |    4 +
 Prebuild/scripts/VS2002.bat                        |    4 +
 Prebuild/scripts/VS2003.bat                        |    4 +
 Prebuild/scripts/VS2005.bat                        |    4 +
 Prebuild/scripts/autotools.bat                     |    4 +
 Prebuild/scripts/autotools.sh                      |    2 +
 Prebuild/scripts/nant.bat                          |    4 +
 Prebuild/scripts/nant.sh                           |    2 +
 Prebuild/src/App.ico                               |  Bin 0 -> 4286 bytes
 Prebuild/src/Core/Attributes/DataNodeAttribute.cs  |   81 +
 .../src/Core/Attributes/OptionNodeAttribute.cs     |   80 +
 Prebuild/src/Core/Attributes/TargetAttribute.cs    |   80 +
 Prebuild/src/Core/FatalException.cs                |   94 +
 Prebuild/src/Core/Interfaces/IDataNode.cs          |   56 +
 Prebuild/src/Core/Interfaces/ITarget.cs            |   60 +
 Prebuild/src/Core/Kernel.cs                        |  758 ++
 Prebuild/src/Core/Nodes/ConfigurationNode.cs       |  187 +
 Prebuild/src/Core/Nodes/DataNode.cs                |   82 +
 Prebuild/src/Core/Nodes/ExcludeNode.cs             |   85 +
 Prebuild/src/Core/Nodes/FileNode.cs                |  238 +
 Prebuild/src/Core/Nodes/FilesNode.cs               |  223 +
 Prebuild/src/Core/Nodes/MatchNode.cs               |  299 +
 Prebuild/src/Core/Nodes/OptionsNode.cs             |  655 ++
 Prebuild/src/Core/Nodes/ProcessNode.cs             |  119 +
 Prebuild/src/Core/Nodes/ProjectNode.cs             |  510 ++
 Prebuild/src/Core/Nodes/ReferenceNode.cs           |  153 +
 Prebuild/src/Core/Nodes/ReferencePathNode.cs       |  108 +
 Prebuild/src/Core/Nodes/SolutionNode.cs            |  288 +
 Prebuild/src/Core/Parse/IfContext.cs               |  163 +
 Prebuild/src/Core/Parse/Preprocessor.cs            |  519 ++
 Prebuild/src/Core/Targets/AutotoolsTarget.cs       |  926 +++
 Prebuild/src/Core/Targets/DebugTarget.cs           |  102 +
 Prebuild/src/Core/Targets/MonoDevelopTarget.cs     |  458 ++
 Prebuild/src/Core/Targets/NAntTarget.cs            |  621 ++
 Prebuild/src/Core/Targets/SharpDevelop2Target.cs   |   90 +
 Prebuild/src/Core/Targets/SharpDevelopTarget.cs    |  437 ++
 Prebuild/src/Core/Targets/VS2002Target.cs          |   96 +
 Prebuild/src/Core/Targets/VS2003Target.cs          |  633 ++
 Prebuild/src/Core/Targets/VS2005Target.cs          |  883 +++
 Prebuild/src/Core/UnknownLanguageException.cs      |   63 +
 .../src/Core/Utilities/CommandLineCollection.cs    |  162 +
 Prebuild/src/Core/Utilities/CurrentDirectory.cs    |   89 +
 Prebuild/src/Core/Utilities/Helper.cs              |  661 ++
 Prebuild/src/Core/Utilities/Log.cs                 |  279 +
 Prebuild/src/Core/WarningException.cs              |   93 +
 Prebuild/src/Prebuild.cs                           |  165 +
 Prebuild/src/Prebuild.csproj                       |  205 +
 Prebuild/src/Prebuild.csproj.user                  |   12 +
 Prebuild/src/Prebuild.exe.build                    |   80 +
 Prebuild/src/Prebuild.snk                          |  Bin 0 -> 596 bytes
 Prebuild/src/Properties/AssemblyInfo.cs            |  101 +
 Prebuild/src/data/dnpb-1.0.xsd                     |  183 +
 Prebuild/src/data/dnpb-1.1.xsd                     |  184 +
 Prebuild/src/data/dnpb-1.2.xsd                     |  198 +
 Prebuild/src/data/dnpb-1.3.xsd                     |  206 +
 Prebuild/src/data/dnpb-1.4.xsd                     |  212 +
 Prebuild/src/data/dnpb-1.5.xsd                     |  215 +
 Prebuild/src/data/prebuild-1.6.xsd                 |  231 +
 Prebuild/src/data/prebuild-1.7.xsd                 |  261 +
 ThirdPartyLicenses/Axiom.txt                       |  141 +
 ThirdPartyLicenses/MySQL.txt                       |   78 +
 ThirdPartyLicenses/ODE.txt                         |   13 +
 ThirdPartyLicenses/OpenJpeg.txt                    |   30 +
 ThirdPartyLicenses/libsl.txt                       |   23 +
 bin/Axiom.MathLib.dll                              |  Bin 0 -> 69632 bytes
 bin/Db4objects.Db4o.dll                            |  Bin 0 -> 593408 bytes
 bin/DotSets.dll                                    |  Bin 0 -> 24576 bytes
 bin/Kds.Serialization.dll                          |  Bin 0 -> 40960 bytes
 bin/Mono.PEToolkit.dll                             |  Bin 0 -> 131072 bytes
 bin/MySql.Data.dll                                 |  Bin 0 -> 143360 bytes
 bin/Ode.NET.dll                                    |  Bin 0 -> 57344 bytes
 bin/PhysX-wrapper.dll                              |  Bin 0 -> 57344 bytes
 bin/PhysX_Wrapper_Dotnet.dll                       |  Bin 0 -> 8704 bytes
 .../OpenSim.Region.Physics.BasicPhysicsPlugin.dll  |  Bin 0 -> 16384 bytes
 bin/Physics/OpenSim.Region.Physics.OdePlugin.dll   |  Bin 0 -> 20480 bytes
 bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll |  Bin 0 -> 20480 bytes
 bin/Prebuild.exe                                   |  Bin 0 -> 176128 bytes
 bin/System.Data.SQLite.dll                         |  Bin 0 -> 568832 bytes
 bin/XMLRPC.dll                                     |  Bin 0 -> 36864 bytes
 bin/defaultstripe.png                              |  Bin 0 -> 887 bytes
 bin/libTerrain-BSD.dll                             |  Bin 0 -> 32768 bytes
 bin/libdb_dotNET43.dll                             |  Bin 0 -> 221184 bytes
 bin/libode.a                                       |  Bin 0 -> 8041800 bytes
 bin/libode.so                                      |  Bin 0 -> 4474949 bytes
 bin/libopenjpeg-1.0.0-x86_64.so                    |  Bin 0 -> 117184 bytes
 bin/libopenjpeg-1.0.0.so                           |  Bin 0 -> 111569 bytes
 bin/libopenjpeg-1.1.0.dylib                        |  Bin 0 -> 238244 bytes
 bin/libsecondlife.dll                              |  Bin 0 -> 2166784 bytes
 bin/log4net.dll                                    |  Bin 0 -> 270336 bytes
 bin/ode.dll                                        |  Bin 0 -> 409600 bytes
 bin/openjpeg.dll                                   |  Bin 0 -> 184320 bytes
 bin/openjpegnet.dll                                |  Bin 0 -> 17408 bytes
 prebuild.xml                                       | 1105 +++
 runprebuild.bat                                    |    2 +
 share/php/generateUserFunction.php                 |   46 +
 share/regions/config_0.xml                         |    3 +
 share/regions/config_1.xml                         |    3 +
 share/regions/config_10.xml                        |    3 +
 share/regions/config_100.xml                       |    3 +
 share/regions/config_1000.xml                      |    3 +
 share/regions/config_1001.xml                      |    3 +
 share/regions/config_1002.xml                      |    3 +
 share/regions/config_1003.xml                      |    3 +
 share/regions/config_1004.xml                      |    3 +
 share/regions/config_1005.xml                      |    3 +
 share/regions/config_1006.xml                      |    3 +
 share/regions/config_1007.xml                      |    3 +
 share/regions/config_1008.xml                      |    3 +
 share/regions/config_1009.xml                      |    3 +
 share/regions/config_101.xml                       |    3 +
 share/regions/config_1010.xml                      |    3 +
 share/regions/config_1011.xml                      |    3 +
 share/regions/config_1012.xml                      |    3 +
 share/regions/config_1013.xml                      |    3 +
 share/regions/config_1014.xml                      |    3 +
 share/regions/config_1015.xml                      |    3 +
 share/regions/config_1016.xml                      |    3 +
 share/regions/config_1017.xml                      |    3 +
 share/regions/config_1018.xml                      |    3 +
 share/regions/config_1019.xml                      |    3 +
 share/regions/config_102.xml                       |    3 +
 share/regions/config_1020.xml                      |    3 +
 share/regions/config_1021.xml                      |    3 +
 share/regions/config_1022.xml                      |    3 +
 share/regions/config_1023.xml                      |    3 +
 share/regions/config_103.xml                       |    3 +
 share/regions/config_104.xml                       |    3 +
 share/regions/config_105.xml                       |    3 +
 share/regions/config_106.xml                       |    3 +
 share/regions/config_107.xml                       |    3 +
 share/regions/config_108.xml                       |    3 +
 share/regions/config_109.xml                       |    3 +
 share/regions/config_11.xml                        |    3 +
 share/regions/config_110.xml                       |    3 +
 share/regions/config_111.xml                       |    3 +
 share/regions/config_112.xml                       |    3 +
 share/regions/config_113.xml                       |    3 +
 share/regions/config_114.xml                       |    3 +
 share/regions/config_115.xml                       |    3 +
 share/regions/config_116.xml                       |    3 +
 share/regions/config_117.xml                       |    3 +
 share/regions/config_118.xml                       |    3 +
 share/regions/config_119.xml                       |    3 +
 share/regions/config_12.xml                        |    3 +
 share/regions/config_120.xml                       |    3 +
 share/regions/config_121.xml                       |    3 +
 share/regions/config_122.xml                       |    3 +
 share/regions/config_123.xml                       |    3 +
 share/regions/config_124.xml                       |    3 +
 share/regions/config_125.xml                       |    3 +
 share/regions/config_126.xml                       |    3 +
 share/regions/config_127.xml                       |    3 +
 share/regions/config_128.xml                       |    3 +
 share/regions/config_129.xml                       |    3 +
 share/regions/config_13.xml                        |    3 +
 share/regions/config_130.xml                       |    3 +
 share/regions/config_131.xml                       |    3 +
 share/regions/config_132.xml                       |    3 +
 share/regions/config_133.xml                       |    3 +
 share/regions/config_134.xml                       |    3 +
 share/regions/config_135.xml                       |    3 +
 share/regions/config_136.xml                       |    3 +
 share/regions/config_137.xml                       |    3 +
 share/regions/config_138.xml                       |    3 +
 share/regions/config_139.xml                       |    3 +
 share/regions/config_14.xml                        |    3 +
 share/regions/config_140.xml                       |    3 +
 share/regions/config_141.xml                       |    3 +
 share/regions/config_142.xml                       |    3 +
 share/regions/config_143.xml                       |    3 +
 share/regions/config_144.xml                       |    3 +
 share/regions/config_145.xml                       |    3 +
 share/regions/config_146.xml                       |    3 +
 share/regions/config_147.xml                       |    3 +
 share/regions/config_148.xml                       |    3 +
 share/regions/config_149.xml                       |    3 +
 share/regions/config_15.xml                        |    3 +
 share/regions/config_150.xml                       |    3 +
 share/regions/config_151.xml                       |    3 +
 share/regions/config_152.xml                       |    3 +
 share/regions/config_153.xml                       |    3 +
 share/regions/config_154.xml                       |    3 +
 share/regions/config_155.xml                       |    3 +
 share/regions/config_156.xml                       |    3 +
 share/regions/config_157.xml                       |    3 +
 share/regions/config_158.xml                       |    3 +
 share/regions/config_159.xml                       |    3 +
 share/regions/config_16.xml                        |    3 +
 share/regions/config_160.xml                       |    3 +
 share/regions/config_161.xml                       |    3 +
 share/regions/config_162.xml                       |    3 +
 share/regions/config_163.xml                       |    3 +
 share/regions/config_164.xml                       |    3 +
 share/regions/config_165.xml                       |    3 +
 share/regions/config_166.xml                       |    3 +
 share/regions/config_167.xml                       |    3 +
 share/regions/config_168.xml                       |    3 +
 share/regions/config_169.xml                       |    3 +
 share/regions/config_17.xml                        |    3 +
 share/regions/config_170.xml                       |    3 +
 share/regions/config_171.xml                       |    3 +
 share/regions/config_172.xml                       |    3 +
 share/regions/config_173.xml                       |    3 +
 share/regions/config_174.xml                       |    3 +
 share/regions/config_175.xml                       |    3 +
 share/regions/config_176.xml                       |    3 +
 share/regions/config_177.xml                       |    3 +
 share/regions/config_178.xml                       |    3 +
 share/regions/config_179.xml                       |    3 +
 share/regions/config_18.xml                        |    3 +
 share/regions/config_180.xml                       |    3 +
 share/regions/config_181.xml                       |    3 +
 share/regions/config_182.xml                       |    3 +
 share/regions/config_183.xml                       |    3 +
 share/regions/config_184.xml                       |    3 +
 share/regions/config_185.xml                       |    3 +
 share/regions/config_186.xml                       |    3 +
 share/regions/config_187.xml                       |    3 +
 share/regions/config_188.xml                       |    3 +
 share/regions/config_189.xml                       |    3 +
 share/regions/config_19.xml                        |    3 +
 share/regions/config_190.xml                       |    3 +
 share/regions/config_191.xml                       |    3 +
 share/regions/config_192.xml                       |    3 +
 share/regions/config_193.xml                       |    3 +
 share/regions/config_194.xml                       |    3 +
 share/regions/config_195.xml                       |    3 +
 share/regions/config_196.xml                       |    3 +
 share/regions/config_197.xml                       |    3 +
 share/regions/config_198.xml                       |    3 +
 share/regions/config_199.xml                       |    3 +
 share/regions/config_2.xml                         |    3 +
 share/regions/config_20.xml                        |    3 +
 share/regions/config_200.xml                       |    3 +
 share/regions/config_201.xml                       |    3 +
 share/regions/config_202.xml                       |    3 +
 share/regions/config_203.xml                       |    3 +
 share/regions/config_204.xml                       |    3 +
 share/regions/config_205.xml                       |    3 +
 share/regions/config_206.xml                       |    3 +
 share/regions/config_207.xml                       |    3 +
 share/regions/config_208.xml                       |    3 +
 share/regions/config_209.xml                       |    3 +
 share/regions/config_21.xml                        |    3 +
 share/regions/config_210.xml                       |    3 +
 share/regions/config_211.xml                       |    3 +
 share/regions/config_212.xml                       |    3 +
 share/regions/config_213.xml                       |    3 +
 share/regions/config_214.xml                       |    3 +
 share/regions/config_215.xml                       |    3 +
 share/regions/config_216.xml                       |    3 +
 share/regions/config_217.xml                       |    3 +
 share/regions/config_218.xml                       |    3 +
 share/regions/config_219.xml                       |    3 +
 share/regions/config_22.xml                        |    3 +
 share/regions/config_220.xml                       |    3 +
 share/regions/config_221.xml                       |    3 +
 share/regions/config_222.xml                       |    3 +
 share/regions/config_223.xml                       |    3 +
 share/regions/config_224.xml                       |    3 +
 share/regions/config_225.xml                       |    3 +
 share/regions/config_226.xml                       |    3 +
 share/regions/config_227.xml                       |    3 +
 share/regions/config_228.xml                       |    3 +
 share/regions/config_229.xml                       |    3 +
 share/regions/config_23.xml                        |    3 +
 share/regions/config_230.xml                       |    3 +
 share/regions/config_231.xml                       |    3 +
 share/regions/config_232.xml                       |    3 +
 share/regions/config_233.xml                       |    3 +
 share/regions/config_234.xml                       |    3 +
 share/regions/config_235.xml                       |    3 +
 share/regions/config_236.xml                       |    3 +
 share/regions/config_237.xml                       |    3 +
 share/regions/config_238.xml                       |    3 +
 share/regions/config_239.xml                       |    3 +
 share/regions/config_24.xml                        |    3 +
 share/regions/config_240.xml                       |    3 +
 share/regions/config_241.xml                       |    3 +
 share/regions/config_242.xml                       |    3 +
 share/regions/config_243.xml                       |    3 +
 share/regions/config_244.xml                       |    3 +
 share/regions/config_245.xml                       |    3 +
 share/regions/config_246.xml                       |    3 +
 share/regions/config_247.xml                       |    3 +
 share/regions/config_248.xml                       |    3 +
 share/regions/config_249.xml                       |    3 +
 share/regions/config_25.xml                        |    3 +
 share/regions/config_250.xml                       |    3 +
 share/regions/config_251.xml                       |    3 +
 share/regions/config_252.xml                       |    3 +
 share/regions/config_253.xml                       |    3 +
 share/regions/config_254.xml                       |    3 +
 share/regions/config_255.xml                       |    3 +
 share/regions/config_256.xml                       |    3 +
 share/regions/config_257.xml                       |    3 +
 share/regions/config_258.xml                       |    3 +
 share/regions/config_259.xml                       |    3 +
 share/regions/config_26.xml                        |    3 +
 share/regions/config_260.xml                       |    3 +
 share/regions/config_261.xml                       |    3 +
 share/regions/config_262.xml                       |    3 +
 share/regions/config_263.xml                       |    3 +
 share/regions/config_264.xml                       |    3 +
 share/regions/config_265.xml                       |    3 +
 share/regions/config_266.xml                       |    3 +
 share/regions/config_267.xml                       |    3 +
 share/regions/config_268.xml                       |    3 +
 share/regions/config_269.xml                       |    3 +
 share/regions/config_27.xml                        |    3 +
 share/regions/config_270.xml                       |    3 +
 share/regions/config_271.xml                       |    3 +
 share/regions/config_272.xml                       |    3 +
 share/regions/config_273.xml                       |    3 +
 share/regions/config_274.xml                       |    3 +
 share/regions/config_275.xml                       |    3 +
 share/regions/config_276.xml                       |    3 +
 share/regions/config_277.xml                       |    3 +
 share/regions/config_278.xml                       |    3 +
 share/regions/config_279.xml                       |    3 +
 share/regions/config_28.xml                        |    3 +
 share/regions/config_280.xml                       |    3 +
 share/regions/config_281.xml                       |    3 +
 share/regions/config_282.xml                       |    3 +
 share/regions/config_283.xml                       |    3 +
 share/regions/config_284.xml                       |    3 +
 share/regions/config_285.xml                       |    3 +
 share/regions/config_286.xml                       |    3 +
 share/regions/config_287.xml                       |    3 +
 share/regions/config_288.xml                       |    3 +
 share/regions/config_289.xml                       |    3 +
 share/regions/config_29.xml                        |    3 +
 share/regions/config_290.xml                       |    3 +
 share/regions/config_291.xml                       |    3 +
 share/regions/config_292.xml                       |    3 +
 share/regions/config_293.xml                       |    3 +
 share/regions/config_294.xml                       |    3 +
 share/regions/config_295.xml                       |    3 +
 share/regions/config_296.xml                       |    3 +
 share/regions/config_297.xml                       |    3 +
 share/regions/config_298.xml                       |    3 +
 share/regions/config_299.xml                       |    3 +
 share/regions/config_3.xml                         |    3 +
 share/regions/config_30.xml                        |    3 +
 share/regions/config_300.xml                       |    3 +
 share/regions/config_301.xml                       |    3 +
 share/regions/config_302.xml                       |    3 +
 share/regions/config_303.xml                       |    3 +
 share/regions/config_304.xml                       |    3 +
 share/regions/config_305.xml                       |    3 +
 share/regions/config_306.xml                       |    3 +
 share/regions/config_307.xml                       |    3 +
 share/regions/config_308.xml                       |    3 +
 share/regions/config_309.xml                       |    3 +
 share/regions/config_31.xml                        |    3 +
 share/regions/config_310.xml                       |    3 +
 share/regions/config_311.xml                       |    3 +
 share/regions/config_312.xml                       |    3 +
 share/regions/config_313.xml                       |    3 +
 share/regions/config_314.xml                       |    3 +
 share/regions/config_315.xml                       |    3 +
 share/regions/config_316.xml                       |    3 +
 share/regions/config_317.xml                       |    3 +
 share/regions/config_318.xml                       |    3 +
 share/regions/config_319.xml                       |    3 +
 share/regions/config_32.xml                        |    3 +
 share/regions/config_320.xml                       |    3 +
 share/regions/config_321.xml                       |    3 +
 share/regions/config_322.xml                       |    3 +
 share/regions/config_323.xml                       |    3 +
 share/regions/config_324.xml                       |    3 +
 share/regions/config_325.xml                       |    3 +
 share/regions/config_326.xml                       |    3 +
 share/regions/config_327.xml                       |    3 +
 share/regions/config_328.xml                       |    3 +
 share/regions/config_329.xml                       |    3 +
 share/regions/config_33.xml                        |    3 +
 share/regions/config_330.xml                       |    3 +
 share/regions/config_331.xml                       |    3 +
 share/regions/config_332.xml                       |    3 +
 share/regions/config_333.xml                       |    3 +
 share/regions/config_334.xml                       |    3 +
 share/regions/config_335.xml                       |    3 +
 share/regions/config_336.xml                       |    3 +
 share/regions/config_337.xml                       |    3 +
 share/regions/config_338.xml                       |    3 +
 share/regions/config_339.xml                       |    3 +
 share/regions/config_34.xml                        |    3 +
 share/regions/config_340.xml                       |    3 +
 share/regions/config_341.xml                       |    3 +
 share/regions/config_342.xml                       |    3 +
 share/regions/config_343.xml                       |    3 +
 share/regions/config_344.xml                       |    3 +
 share/regions/config_345.xml                       |    3 +
 share/regions/config_346.xml                       |    3 +
 share/regions/config_347.xml                       |    3 +
 share/regions/config_348.xml                       |    3 +
 share/regions/config_349.xml                       |    3 +
 share/regions/config_35.xml                        |    3 +
 share/regions/config_350.xml                       |    3 +
 share/regions/config_351.xml                       |    3 +
 share/regions/config_352.xml                       |    3 +
 share/regions/config_353.xml                       |    3 +
 share/regions/config_354.xml                       |    3 +
 share/regions/config_355.xml                       |    3 +
 share/regions/config_356.xml                       |    3 +
 share/regions/config_357.xml                       |    3 +
 share/regions/config_358.xml                       |    3 +
 share/regions/config_359.xml                       |    3 +
 share/regions/config_36.xml                        |    3 +
 share/regions/config_360.xml                       |    3 +
 share/regions/config_361.xml                       |    3 +
 share/regions/config_362.xml                       |    3 +
 share/regions/config_363.xml                       |    3 +
 share/regions/config_364.xml                       |    3 +
 share/regions/config_365.xml                       |    3 +
 share/regions/config_366.xml                       |    3 +
 share/regions/config_367.xml                       |    3 +
 share/regions/config_368.xml                       |    3 +
 share/regions/config_369.xml                       |    3 +
 share/regions/config_37.xml                        |    3 +
 share/regions/config_370.xml                       |    3 +
 share/regions/config_371.xml                       |    3 +
 share/regions/config_372.xml                       |    3 +
 share/regions/config_373.xml                       |    3 +
 share/regions/config_374.xml                       |    3 +
 share/regions/config_375.xml                       |    3 +
 share/regions/config_376.xml                       |    3 +
 share/regions/config_377.xml                       |    3 +
 share/regions/config_378.xml                       |    3 +
 share/regions/config_379.xml                       |    3 +
 share/regions/config_38.xml                        |    3 +
 share/regions/config_380.xml                       |    3 +
 share/regions/config_381.xml                       |    3 +
 share/regions/config_382.xml                       |    3 +
 share/regions/config_383.xml                       |    3 +
 share/regions/config_384.xml                       |    3 +
 share/regions/config_385.xml                       |    3 +
 share/regions/config_386.xml                       |    3 +
 share/regions/config_387.xml                       |    3 +
 share/regions/config_388.xml                       |    3 +
 share/regions/config_389.xml                       |    3 +
 share/regions/config_39.xml                        |    3 +
 share/regions/config_390.xml                       |    3 +
 share/regions/config_391.xml                       |    3 +
 share/regions/config_392.xml                       |    3 +
 share/regions/config_393.xml                       |    3 +
 share/regions/config_394.xml                       |    3 +
 share/regions/config_395.xml                       |    3 +
 share/regions/config_396.xml                       |    3 +
 share/regions/config_397.xml                       |    3 +
 share/regions/config_398.xml                       |    3 +
 share/regions/config_399.xml                       |    3 +
 share/regions/config_4.xml                         |    3 +
 share/regions/config_40.xml                        |    3 +
 share/regions/config_400.xml                       |    3 +
 share/regions/config_401.xml                       |    3 +
 share/regions/config_402.xml                       |    3 +
 share/regions/config_403.xml                       |    3 +
 share/regions/config_404.xml                       |    3 +
 share/regions/config_405.xml                       |    3 +
 share/regions/config_406.xml                       |    3 +
 share/regions/config_407.xml                       |    3 +
 share/regions/config_408.xml                       |    3 +
 share/regions/config_409.xml                       |    3 +
 share/regions/config_41.xml                        |    3 +
 share/regions/config_410.xml                       |    3 +
 share/regions/config_411.xml                       |    3 +
 share/regions/config_412.xml                       |    3 +
 share/regions/config_413.xml                       |    3 +
 share/regions/config_414.xml                       |    3 +
 share/regions/config_415.xml                       |    3 +
 share/regions/config_416.xml                       |    3 +
 share/regions/config_417.xml                       |    3 +
 share/regions/config_418.xml                       |    3 +
 share/regions/config_419.xml                       |    3 +
 share/regions/config_42.xml                        |    3 +
 share/regions/config_420.xml                       |    3 +
 share/regions/config_421.xml                       |    3 +
 share/regions/config_422.xml                       |    3 +
 share/regions/config_423.xml                       |    3 +
 share/regions/config_424.xml                       |    3 +
 share/regions/config_425.xml                       |    3 +
 share/regions/config_426.xml                       |    3 +
 share/regions/config_427.xml                       |    3 +
 share/regions/config_428.xml                       |    3 +
 share/regions/config_429.xml                       |    3 +
 share/regions/config_43.xml                        |    3 +
 share/regions/config_430.xml                       |    3 +
 share/regions/config_431.xml                       |    3 +
 share/regions/config_432.xml                       |    3 +
 share/regions/config_433.xml                       |    3 +
 share/regions/config_434.xml                       |    3 +
 share/regions/config_435.xml                       |    3 +
 share/regions/config_436.xml                       |    3 +
 share/regions/config_437.xml                       |    3 +
 share/regions/config_438.xml                       |    3 +
 share/regions/config_439.xml                       |    3 +
 share/regions/config_44.xml                        |    3 +
 share/regions/config_440.xml                       |    3 +
 share/regions/config_441.xml                       |    3 +
 share/regions/config_442.xml                       |    3 +
 share/regions/config_443.xml                       |    3 +
 share/regions/config_444.xml                       |    3 +
 share/regions/config_445.xml                       |    3 +
 share/regions/config_446.xml                       |    3 +
 share/regions/config_447.xml                       |    3 +
 share/regions/config_448.xml                       |    3 +
 share/regions/config_449.xml                       |    3 +
 share/regions/config_45.xml                        |    3 +
 share/regions/config_450.xml                       |    3 +
 share/regions/config_451.xml                       |    3 +
 share/regions/config_452.xml                       |    3 +
 share/regions/config_453.xml                       |    3 +
 share/regions/config_454.xml                       |    3 +
 share/regions/config_455.xml                       |    3 +
 share/regions/config_456.xml                       |    3 +
 share/regions/config_457.xml                       |    3 +
 share/regions/config_458.xml                       |    3 +
 share/regions/config_459.xml                       |    3 +
 share/regions/config_46.xml                        |    3 +
 share/regions/config_460.xml                       |    3 +
 share/regions/config_461.xml                       |    3 +
 share/regions/config_462.xml                       |    3 +
 share/regions/config_463.xml                       |    3 +
 share/regions/config_464.xml                       |    3 +
 share/regions/config_465.xml                       |    3 +
 share/regions/config_466.xml                       |    3 +
 share/regions/config_467.xml                       |    3 +
 share/regions/config_468.xml                       |    3 +
 share/regions/config_469.xml                       |    3 +
 share/regions/config_47.xml                        |    3 +
 share/regions/config_470.xml                       |    3 +
 share/regions/config_471.xml                       |    3 +
 share/regions/config_472.xml                       |    3 +
 share/regions/config_473.xml                       |    3 +
 share/regions/config_474.xml                       |    3 +
 share/regions/config_475.xml                       |    3 +
 share/regions/config_476.xml                       |    3 +
 share/regions/config_477.xml                       |    3 +
 share/regions/config_478.xml                       |    3 +
 share/regions/config_479.xml                       |    3 +
 share/regions/config_48.xml                        |    3 +
 share/regions/config_480.xml                       |    3 +
 share/regions/config_481.xml                       |    3 +
 share/regions/config_482.xml                       |    3 +
 share/regions/config_483.xml                       |    3 +
 share/regions/config_484.xml                       |    3 +
 share/regions/config_485.xml                       |    3 +
 share/regions/config_486.xml                       |    3 +
 share/regions/config_487.xml                       |    3 +
 share/regions/config_488.xml                       |    3 +
 share/regions/config_489.xml                       |    3 +
 share/regions/config_49.xml                        |    3 +
 share/regions/config_490.xml                       |    3 +
 share/regions/config_491.xml                       |    3 +
 share/regions/config_492.xml                       |    3 +
 share/regions/config_493.xml                       |    3 +
 share/regions/config_494.xml                       |    3 +
 share/regions/config_495.xml                       |    3 +
 share/regions/config_496.xml                       |    3 +
 share/regions/config_497.xml                       |    3 +
 share/regions/config_498.xml                       |    3 +
 share/regions/config_499.xml                       |    3 +
 share/regions/config_5.xml                         |    3 +
 share/regions/config_50.xml                        |    3 +
 share/regions/config_500.xml                       |    3 +
 share/regions/config_501.xml                       |    3 +
 share/regions/config_502.xml                       |    3 +
 share/regions/config_503.xml                       |    3 +
 share/regions/config_504.xml                       |    3 +
 share/regions/config_505.xml                       |    3 +
 share/regions/config_506.xml                       |    3 +
 share/regions/config_507.xml                       |    3 +
 share/regions/config_508.xml                       |    3 +
 share/regions/config_509.xml                       |    3 +
 share/regions/config_51.xml                        |    3 +
 share/regions/config_510.xml                       |    3 +
 share/regions/config_511.xml                       |    3 +
 share/regions/config_512.xml                       |    3 +
 share/regions/config_513.xml                       |    3 +
 share/regions/config_514.xml                       |    3 +
 share/regions/config_515.xml                       |    3 +
 share/regions/config_516.xml                       |    3 +
 share/regions/config_517.xml                       |    3 +
 share/regions/config_518.xml                       |    3 +
 share/regions/config_519.xml                       |    3 +
 share/regions/config_52.xml                        |    3 +
 share/regions/config_520.xml                       |    3 +
 share/regions/config_521.xml                       |    3 +
 share/regions/config_522.xml                       |    3 +
 share/regions/config_523.xml                       |    3 +
 share/regions/config_524.xml                       |    3 +
 share/regions/config_525.xml                       |    3 +
 share/regions/config_526.xml                       |    3 +
 share/regions/config_527.xml                       |    3 +
 share/regions/config_528.xml                       |    3 +
 share/regions/config_529.xml                       |    3 +
 share/regions/config_53.xml                        |    3 +
 share/regions/config_530.xml                       |    3 +
 share/regions/config_531.xml                       |    3 +
 share/regions/config_532.xml                       |    3 +
 share/regions/config_533.xml                       |    3 +
 share/regions/config_534.xml                       |    3 +
 share/regions/config_535.xml                       |    3 +
 share/regions/config_536.xml                       |    3 +
 share/regions/config_537.xml                       |    3 +
 share/regions/config_538.xml                       |    3 +
 share/regions/config_539.xml                       |    3 +
 share/regions/config_54.xml                        |    3 +
 share/regions/config_540.xml                       |    3 +
 share/regions/config_541.xml                       |    3 +
 share/regions/config_542.xml                       |    3 +
 share/regions/config_543.xml                       |    3 +
 share/regions/config_544.xml                       |    3 +
 share/regions/config_545.xml                       |    3 +
 share/regions/config_546.xml                       |    3 +
 share/regions/config_547.xml                       |    3 +
 share/regions/config_548.xml                       |    3 +
 share/regions/config_549.xml                       |    3 +
 share/regions/config_55.xml                        |    3 +
 share/regions/config_550.xml                       |    3 +
 share/regions/config_551.xml                       |    3 +
 share/regions/config_552.xml                       |    3 +
 share/regions/config_553.xml                       |    3 +
 share/regions/config_554.xml                       |    3 +
 share/regions/config_555.xml                       |    3 +
 share/regions/config_556.xml                       |    3 +
 share/regions/config_557.xml                       |    3 +
 share/regions/config_558.xml                       |    3 +
 share/regions/config_559.xml                       |    3 +
 share/regions/config_56.xml                        |    3 +
 share/regions/config_560.xml                       |    3 +
 share/regions/config_561.xml                       |    3 +
 share/regions/config_562.xml                       |    3 +
 share/regions/config_563.xml                       |    3 +
 share/regions/config_564.xml                       |    3 +
 share/regions/config_565.xml                       |    3 +
 share/regions/config_566.xml                       |    3 +
 share/regions/config_567.xml                       |    3 +
 share/regions/config_568.xml                       |    3 +
 share/regions/config_569.xml                       |    3 +
 share/regions/config_57.xml                        |    3 +
 share/regions/config_570.xml                       |    3 +
 share/regions/config_571.xml                       |    3 +
 share/regions/config_572.xml                       |    3 +
 share/regions/config_573.xml                       |    3 +
 share/regions/config_574.xml                       |    3 +
 share/regions/config_575.xml                       |    3 +
 share/regions/config_576.xml                       |    3 +
 share/regions/config_577.xml                       |    3 +
 share/regions/config_578.xml                       |    3 +
 share/regions/config_579.xml                       |    3 +
 share/regions/config_58.xml                        |    3 +
 share/regions/config_580.xml                       |    3 +
 share/regions/config_581.xml                       |    3 +
 share/regions/config_582.xml                       |    3 +
 share/regions/config_583.xml                       |    3 +
 share/regions/config_584.xml                       |    3 +
 share/regions/config_585.xml                       |    3 +
 share/regions/config_586.xml                       |    3 +
 share/regions/config_587.xml                       |    3 +
 share/regions/config_588.xml                       |    3 +
 share/regions/config_589.xml                       |    3 +
 share/regions/config_59.xml                        |    3 +
 share/regions/config_590.xml                       |    3 +
 share/regions/config_591.xml                       |    3 +
 share/regions/config_592.xml                       |    3 +
 share/regions/config_593.xml                       |    3 +
 share/regions/config_594.xml                       |    3 +
 share/regions/config_595.xml                       |    3 +
 share/regions/config_596.xml                       |    3 +
 share/regions/config_597.xml                       |    3 +
 share/regions/config_598.xml                       |    3 +
 share/regions/config_599.xml                       |    3 +
 share/regions/config_6.xml                         |    3 +
 share/regions/config_60.xml                        |    3 +
 share/regions/config_600.xml                       |    3 +
 share/regions/config_601.xml                       |    3 +
 share/regions/config_602.xml                       |    3 +
 share/regions/config_603.xml                       |    3 +
 share/regions/config_604.xml                       |    3 +
 share/regions/config_605.xml                       |    3 +
 share/regions/config_606.xml                       |    3 +
 share/regions/config_607.xml                       |    3 +
 share/regions/config_608.xml                       |    3 +
 share/regions/config_609.xml                       |    3 +
 share/regions/config_61.xml                        |    3 +
 share/regions/config_610.xml                       |    3 +
 share/regions/config_611.xml                       |    3 +
 share/regions/config_612.xml                       |    3 +
 share/regions/config_613.xml                       |    3 +
 share/regions/config_614.xml                       |    3 +
 share/regions/config_615.xml                       |    3 +
 share/regions/config_616.xml                       |    3 +
 share/regions/config_617.xml                       |    3 +
 share/regions/config_618.xml                       |    3 +
 share/regions/config_619.xml                       |    3 +
 share/regions/config_62.xml                        |    3 +
 share/regions/config_620.xml                       |    3 +
 share/regions/config_621.xml                       |    3 +
 share/regions/config_622.xml                       |    3 +
 share/regions/config_623.xml                       |    3 +
 share/regions/config_624.xml                       |    3 +
 share/regions/config_625.xml                       |    3 +
 share/regions/config_626.xml                       |    3 +
 share/regions/config_627.xml                       |    3 +
 share/regions/config_628.xml                       |    3 +
 share/regions/config_629.xml                       |    3 +
 share/regions/config_63.xml                        |    3 +
 share/regions/config_630.xml                       |    3 +
 share/regions/config_631.xml                       |    3 +
 share/regions/config_632.xml                       |    3 +
 share/regions/config_633.xml                       |    3 +
 share/regions/config_634.xml                       |    3 +
 share/regions/config_635.xml                       |    3 +
 share/regions/config_636.xml                       |    3 +
 share/regions/config_637.xml                       |    3 +
 share/regions/config_638.xml                       |    3 +
 share/regions/config_639.xml                       |    3 +
 share/regions/config_64.xml                        |    3 +
 share/regions/config_640.xml                       |    3 +
 share/regions/config_641.xml                       |    3 +
 share/regions/config_642.xml                       |    3 +
 share/regions/config_643.xml                       |    3 +
 share/regions/config_644.xml                       |    3 +
 share/regions/config_645.xml                       |    3 +
 share/regions/config_646.xml                       |    3 +
 share/regions/config_647.xml                       |    3 +
 share/regions/config_648.xml                       |    3 +
 share/regions/config_649.xml                       |    3 +
 share/regions/config_65.xml                        |    3 +
 share/regions/config_650.xml                       |    3 +
 share/regions/config_651.xml                       |    3 +
 share/regions/config_652.xml                       |    3 +
 share/regions/config_653.xml                       |    3 +
 share/regions/config_654.xml                       |    3 +
 share/regions/config_655.xml                       |    3 +
 share/regions/config_656.xml                       |    3 +
 share/regions/config_657.xml                       |    3 +
 share/regions/config_658.xml                       |    3 +
 share/regions/config_659.xml                       |    3 +
 share/regions/config_66.xml                        |    3 +
 share/regions/config_660.xml                       |    3 +
 share/regions/config_661.xml                       |    3 +
 share/regions/config_662.xml                       |    3 +
 share/regions/config_663.xml                       |    3 +
 share/regions/config_664.xml                       |    3 +
 share/regions/config_665.xml                       |    3 +
 share/regions/config_666.xml                       |    3 +
 share/regions/config_667.xml                       |    3 +
 share/regions/config_668.xml                       |    3 +
 share/regions/config_669.xml                       |    3 +
 share/regions/config_67.xml                        |    3 +
 share/regions/config_670.xml                       |    3 +
 share/regions/config_671.xml                       |    3 +
 share/regions/config_672.xml                       |    3 +
 share/regions/config_673.xml                       |    3 +
 share/regions/config_674.xml                       |    3 +
 share/regions/config_675.xml                       |    3 +
 share/regions/config_676.xml                       |    3 +
 share/regions/config_677.xml                       |    3 +
 share/regions/config_678.xml                       |    3 +
 share/regions/config_679.xml                       |    3 +
 share/regions/config_68.xml                        |    3 +
 share/regions/config_680.xml                       |    3 +
 share/regions/config_681.xml                       |    3 +
 share/regions/config_682.xml                       |    3 +
 share/regions/config_683.xml                       |    3 +
 share/regions/config_684.xml                       |    3 +
 share/regions/config_685.xml                       |    3 +
 share/regions/config_686.xml                       |    3 +
 share/regions/config_687.xml                       |    3 +
 share/regions/config_688.xml                       |    3 +
 share/regions/config_689.xml                       |    3 +
 share/regions/config_69.xml                        |    3 +
 share/regions/config_690.xml                       |    3 +
 share/regions/config_691.xml                       |    3 +
 share/regions/config_692.xml                       |    3 +
 share/regions/config_693.xml                       |    3 +
 share/regions/config_694.xml                       |    3 +
 share/regions/config_695.xml                       |    3 +
 share/regions/config_696.xml                       |    3 +
 share/regions/config_697.xml                       |    3 +
 share/regions/config_698.xml                       |    3 +
 share/regions/config_699.xml                       |    3 +
 share/regions/config_7.xml                         |    3 +
 share/regions/config_70.xml                        |    3 +
 share/regions/config_700.xml                       |    3 +
 share/regions/config_701.xml                       |    3 +
 share/regions/config_702.xml                       |    3 +
 share/regions/config_703.xml                       |    3 +
 share/regions/config_704.xml                       |    3 +
 share/regions/config_705.xml                       |    3 +
 share/regions/config_706.xml                       |    3 +
 share/regions/config_707.xml                       |    3 +
 share/regions/config_708.xml                       |    3 +
 share/regions/config_709.xml                       |    3 +
 share/regions/config_71.xml                        |    3 +
 share/regions/config_710.xml                       |    3 +
 share/regions/config_711.xml                       |    3 +
 share/regions/config_712.xml                       |    3 +
 share/regions/config_713.xml                       |    3 +
 share/regions/config_714.xml                       |    3 +
 share/regions/config_715.xml                       |    3 +
 share/regions/config_716.xml                       |    3 +
 share/regions/config_717.xml                       |    3 +
 share/regions/config_718.xml                       |    3 +
 share/regions/config_719.xml                       |    3 +
 share/regions/config_72.xml                        |    3 +
 share/regions/config_720.xml                       |    3 +
 share/regions/config_721.xml                       |    3 +
 share/regions/config_722.xml                       |    3 +
 share/regions/config_723.xml                       |    3 +
 share/regions/config_724.xml                       |    3 +
 share/regions/config_725.xml                       |    3 +
 share/regions/config_726.xml                       |    3 +
 share/regions/config_727.xml                       |    3 +
 share/regions/config_728.xml                       |    3 +
 share/regions/config_729.xml                       |    3 +
 share/regions/config_73.xml                        |    3 +
 share/regions/config_730.xml                       |    3 +
 share/regions/config_731.xml                       |    3 +
 share/regions/config_732.xml                       |    3 +
 share/regions/config_733.xml                       |    3 +
 share/regions/config_734.xml                       |    3 +
 share/regions/config_735.xml                       |    3 +
 share/regions/config_736.xml                       |    3 +
 share/regions/config_737.xml                       |    3 +
 share/regions/config_738.xml                       |    3 +
 share/regions/config_739.xml                       |    3 +
 share/regions/config_74.xml                        |    3 +
 share/regions/config_740.xml                       |    3 +
 share/regions/config_741.xml                       |    3 +
 share/regions/config_742.xml                       |    3 +
 share/regions/config_743.xml                       |    3 +
 share/regions/config_744.xml                       |    3 +
 share/regions/config_745.xml                       |    3 +
 share/regions/config_746.xml                       |    3 +
 share/regions/config_747.xml                       |    3 +
 share/regions/config_748.xml                       |    3 +
 share/regions/config_749.xml                       |    3 +
 share/regions/config_75.xml                        |    3 +
 share/regions/config_750.xml                       |    3 +
 share/regions/config_751.xml                       |    3 +
 share/regions/config_752.xml                       |    3 +
 share/regions/config_753.xml                       |    3 +
 share/regions/config_754.xml                       |    3 +
 share/regions/config_755.xml                       |    3 +
 share/regions/config_756.xml                       |    3 +
 share/regions/config_757.xml                       |    3 +
 share/regions/config_758.xml                       |    3 +
 share/regions/config_759.xml                       |    3 +
 share/regions/config_76.xml                        |    3 +
 share/regions/config_760.xml                       |    3 +
 share/regions/config_761.xml                       |    3 +
 share/regions/config_762.xml                       |    3 +
 share/regions/config_763.xml                       |    3 +
 share/regions/config_764.xml                       |    3 +
 share/regions/config_765.xml                       |    3 +
 share/regions/config_766.xml                       |    3 +
 share/regions/config_767.xml                       |    3 +
 share/regions/config_768.xml                       |    3 +
 share/regions/config_769.xml                       |    3 +
 share/regions/config_77.xml                        |    3 +
 share/regions/config_770.xml                       |    3 +
 share/regions/config_771.xml                       |    3 +
 share/regions/config_772.xml                       |    3 +
 share/regions/config_773.xml                       |    3 +
 share/regions/config_774.xml                       |    3 +
 share/regions/config_775.xml                       |    3 +
 share/regions/config_776.xml                       |    3 +
 share/regions/config_777.xml                       |    3 +
 share/regions/config_778.xml                       |    3 +
 share/regions/config_779.xml                       |    3 +
 share/regions/config_78.xml                        |    3 +
 share/regions/config_780.xml                       |    3 +
 share/regions/config_781.xml                       |    3 +
 share/regions/config_782.xml                       |    3 +
 share/regions/config_783.xml                       |    3 +
 share/regions/config_784.xml                       |    3 +
 share/regions/config_785.xml                       |    3 +
 share/regions/config_786.xml                       |    3 +
 share/regions/config_787.xml                       |    3 +
 share/regions/config_788.xml                       |    3 +
 share/regions/config_789.xml                       |    3 +
 share/regions/config_79.xml                        |    3 +
 share/regions/config_790.xml                       |    3 +
 share/regions/config_791.xml                       |    3 +
 share/regions/config_792.xml                       |    3 +
 share/regions/config_793.xml                       |    3 +
 share/regions/config_794.xml                       |    3 +
 share/regions/config_795.xml                       |    3 +
 share/regions/config_796.xml                       |    3 +
 share/regions/config_797.xml                       |    3 +
 share/regions/config_798.xml                       |    3 +
 share/regions/config_799.xml                       |    3 +
 share/regions/config_8.xml                         |    3 +
 share/regions/config_80.xml                        |    3 +
 share/regions/config_800.xml                       |    3 +
 share/regions/config_801.xml                       |    3 +
 share/regions/config_802.xml                       |    3 +
 share/regions/config_803.xml                       |    3 +
 share/regions/config_804.xml                       |    3 +
 share/regions/config_805.xml                       |    3 +
 share/regions/config_806.xml                       |    3 +
 share/regions/config_807.xml                       |    3 +
 share/regions/config_808.xml                       |    3 +
 share/regions/config_809.xml                       |    3 +
 share/regions/config_81.xml                        |    3 +
 share/regions/config_810.xml                       |    3 +
 share/regions/config_811.xml                       |    3 +
 share/regions/config_812.xml                       |    3 +
 share/regions/config_813.xml                       |    3 +
 share/regions/config_814.xml                       |    3 +
 share/regions/config_815.xml                       |    3 +
 share/regions/config_816.xml                       |    3 +
 share/regions/config_817.xml                       |    3 +
 share/regions/config_818.xml                       |    3 +
 share/regions/config_819.xml                       |    3 +
 share/regions/config_82.xml                        |    3 +
 share/regions/config_820.xml                       |    3 +
 share/regions/config_821.xml                       |    3 +
 share/regions/config_822.xml                       |    3 +
 share/regions/config_823.xml                       |    3 +
 share/regions/config_824.xml                       |    3 +
 share/regions/config_825.xml                       |    3 +
 share/regions/config_826.xml                       |    3 +
 share/regions/config_827.xml                       |    3 +
 share/regions/config_828.xml                       |    3 +
 share/regions/config_829.xml                       |    3 +
 share/regions/config_83.xml                        |    3 +
 share/regions/config_830.xml                       |    3 +
 share/regions/config_831.xml                       |    3 +
 share/regions/config_832.xml                       |    3 +
 share/regions/config_833.xml                       |    3 +
 share/regions/config_834.xml                       |    3 +
 share/regions/config_835.xml                       |    3 +
 share/regions/config_836.xml                       |    3 +
 share/regions/config_837.xml                       |    3 +
 share/regions/config_838.xml                       |    3 +
 share/regions/config_839.xml                       |    3 +
 share/regions/config_84.xml                        |    3 +
 share/regions/config_840.xml                       |    3 +
 share/regions/config_841.xml                       |    3 +
 share/regions/config_842.xml                       |    3 +
 share/regions/config_843.xml                       |    3 +
 share/regions/config_844.xml                       |    3 +
 share/regions/config_845.xml                       |    3 +
 share/regions/config_846.xml                       |    3 +
 share/regions/config_847.xml                       |    3 +
 share/regions/config_848.xml                       |    3 +
 share/regions/config_849.xml                       |    3 +
 share/regions/config_85.xml                        |    3 +
 share/regions/config_850.xml                       |    3 +
 share/regions/config_851.xml                       |    3 +
 share/regions/config_852.xml                       |    3 +
 share/regions/config_853.xml                       |    3 +
 share/regions/config_854.xml                       |    3 +
 share/regions/config_855.xml                       |    3 +
 share/regions/config_856.xml                       |    3 +
 share/regions/config_857.xml                       |    3 +
 share/regions/config_858.xml                       |    3 +
 share/regions/config_859.xml                       |    3 +
 share/regions/config_86.xml                        |    3 +
 share/regions/config_860.xml                       |    3 +
 share/regions/config_861.xml                       |    3 +
 share/regions/config_862.xml                       |    3 +
 share/regions/config_863.xml                       |    3 +
 share/regions/config_864.xml                       |    3 +
 share/regions/config_865.xml                       |    3 +
 share/regions/config_866.xml                       |    3 +
 share/regions/config_867.xml                       |    3 +
 share/regions/config_868.xml                       |    3 +
 share/regions/config_869.xml                       |    3 +
 share/regions/config_87.xml                        |    3 +
 share/regions/config_870.xml                       |    3 +
 share/regions/config_871.xml                       |    3 +
 share/regions/config_872.xml                       |    3 +
 share/regions/config_873.xml                       |    3 +
 share/regions/config_874.xml                       |    3 +
 share/regions/config_875.xml                       |    3 +
 share/regions/config_876.xml                       |    3 +
 share/regions/config_877.xml                       |    3 +
 share/regions/config_878.xml                       |    3 +
 share/regions/config_879.xml                       |    3 +
 share/regions/config_88.xml                        |    3 +
 share/regions/config_880.xml                       |    3 +
 share/regions/config_881.xml                       |    3 +
 share/regions/config_882.xml                       |    3 +
 share/regions/config_883.xml                       |    3 +
 share/regions/config_884.xml                       |    3 +
 share/regions/config_885.xml                       |    3 +
 share/regions/config_886.xml                       |    3 +
 share/regions/config_887.xml                       |    3 +
 share/regions/config_888.xml                       |    3 +
 share/regions/config_889.xml                       |    3 +
 share/regions/config_89.xml                        |    3 +
 share/regions/config_890.xml                       |    3 +
 share/regions/config_891.xml                       |    3 +
 share/regions/config_892.xml                       |    3 +
 share/regions/config_893.xml                       |    3 +
 share/regions/config_894.xml                       |    3 +
 share/regions/config_895.xml                       |    3 +
 share/regions/config_896.xml                       |    3 +
 share/regions/config_897.xml                       |    3 +
 share/regions/config_898.xml                       |    3 +
 share/regions/config_899.xml                       |    3 +
 share/regions/config_9.xml                         |    3 +
 share/regions/config_90.xml                        |    3 +
 share/regions/config_900.xml                       |    3 +
 share/regions/config_901.xml                       |    3 +
 share/regions/config_902.xml                       |    3 +
 share/regions/config_903.xml                       |    3 +
 share/regions/config_904.xml                       |    3 +
 share/regions/config_905.xml                       |    3 +
 share/regions/config_906.xml                       |    3 +
 share/regions/config_907.xml                       |    3 +
 share/regions/config_908.xml                       |    3 +
 share/regions/config_909.xml                       |    3 +
 share/regions/config_91.xml                        |    3 +
 share/regions/config_910.xml                       |    3 +
 share/regions/config_911.xml                       |    3 +
 share/regions/config_912.xml                       |    3 +
 share/regions/config_913.xml                       |    3 +
 share/regions/config_914.xml                       |    3 +
 share/regions/config_915.xml                       |    3 +
 share/regions/config_916.xml                       |    3 +
 share/regions/config_917.xml                       |    3 +
 share/regions/config_918.xml                       |    3 +
 share/regions/config_919.xml                       |    3 +
 share/regions/config_92.xml                        |    3 +
 share/regions/config_920.xml                       |    3 +
 share/regions/config_921.xml                       |    3 +
 share/regions/config_922.xml                       |    3 +
 share/regions/config_923.xml                       |    3 +
 share/regions/config_924.xml                       |    3 +
 share/regions/config_925.xml                       |    3 +
 share/regions/config_926.xml                       |    3 +
 share/regions/config_927.xml                       |    3 +
 share/regions/config_928.xml                       |    3 +
 share/regions/config_929.xml                       |    3 +
 share/regions/config_93.xml                        |    3 +
 share/regions/config_930.xml                       |    3 +
 share/regions/config_931.xml                       |    3 +
 share/regions/config_932.xml                       |    3 +
 share/regions/config_933.xml                       |    3 +
 share/regions/config_934.xml                       |    3 +
 share/regions/config_935.xml                       |    3 +
 share/regions/config_936.xml                       |    3 +
 share/regions/config_937.xml                       |    3 +
 share/regions/config_938.xml                       |    3 +
 share/regions/config_939.xml                       |    3 +
 share/regions/config_94.xml                        |    3 +
 share/regions/config_940.xml                       |    3 +
 share/regions/config_941.xml                       |    3 +
 share/regions/config_942.xml                       |    3 +
 share/regions/config_943.xml                       |    3 +
 share/regions/config_944.xml                       |    3 +
 share/regions/config_945.xml                       |    3 +
 share/regions/config_946.xml                       |    3 +
 share/regions/config_947.xml                       |    3 +
 share/regions/config_948.xml                       |    3 +
 share/regions/config_949.xml                       |    3 +
 share/regions/config_95.xml                        |    3 +
 share/regions/config_950.xml                       |    3 +
 share/regions/config_951.xml                       |    3 +
 share/regions/config_952.xml                       |    3 +
 share/regions/config_953.xml                       |    3 +
 share/regions/config_954.xml                       |    3 +
 share/regions/config_955.xml                       |    3 +
 share/regions/config_956.xml                       |    3 +
 share/regions/config_957.xml                       |    3 +
 share/regions/config_958.xml                       |    3 +
 share/regions/config_959.xml                       |    3 +
 share/regions/config_96.xml                        |    3 +
 share/regions/config_960.xml                       |    3 +
 share/regions/config_961.xml                       |    3 +
 share/regions/config_962.xml                       |    3 +
 share/regions/config_963.xml                       |    3 +
 share/regions/config_964.xml                       |    3 +
 share/regions/config_965.xml                       |    3 +
 share/regions/config_966.xml                       |    3 +
 share/regions/config_967.xml                       |    3 +
 share/regions/config_968.xml                       |    3 +
 share/regions/config_969.xml                       |    3 +
 share/regions/config_97.xml                        |    3 +
 share/regions/config_970.xml                       |    3 +
 share/regions/config_971.xml                       |    3 +
 share/regions/config_972.xml                       |    3 +
 share/regions/config_973.xml                       |    3 +
 share/regions/config_974.xml                       |    3 +
 share/regions/config_975.xml                       |    3 +
 share/regions/config_976.xml                       |    3 +
 share/regions/config_977.xml                       |    3 +
 share/regions/config_978.xml                       |    3 +
 share/regions/config_979.xml                       |    3 +
 share/regions/config_98.xml                        |    3 +
 share/regions/config_980.xml                       |    3 +
 share/regions/config_981.xml                       |    3 +
 share/regions/config_982.xml                       |    3 +
 share/regions/config_983.xml                       |    3 +
 share/regions/config_984.xml                       |    3 +
 share/regions/config_985.xml                       |    3 +
 share/regions/config_986.xml                       |    3 +
 share/regions/config_987.xml                       |    3 +
 share/regions/config_988.xml                       |    3 +
 share/regions/config_989.xml                       |    3 +
 share/regions/config_99.xml                        |    3 +
 share/regions/config_990.xml                       |    3 +
 share/regions/config_991.xml                       |    3 +
 share/regions/config_992.xml                       |    3 +
 share/regions/config_993.xml                       |    3 +
 share/regions/config_994.xml                       |    3 +
 share/regions/config_995.xml                       |    3 +
 share/regions/config_996.xml                       |    3 +
 share/regions/config_997.xml                       |    3 +
 share/regions/config_998.xml                       |    3 +
 share/regions/config_999.xml                       |    3 +
 share/sql/mysql-agents.sql                         |   24 +
 share/sql/mysql-inventoryfolders.sql               |    9 +
 share/sql/mysql-inventoryitems.sql                 |   14 +
 share/sql/mysql-logs.sql                           |   10 +
 share/sql/mysql-regions.sql                        |   29 +
 share/sql/mysql-reservations.txt                   |   16 +
 share/sql/mysql-users.sql                          |   34 +
 1413 files changed, 62000 insertions(+)
 create mode 100644 OpenGridServices.sln
 create mode 100644 OpenSim.FxCop
 create mode 100644 OpenSim.sln
 create mode 100644 OpenSim.suo
 create mode 100644 OpenSim/Framework/Communications.OGS1/GridCommsManager.cs
 create mode 100644 OpenSim/Framework/Communications.OGS1/OGS1GridServices.cs
 create mode 100644 OpenSim/Framework/Communications.OGS1/OGSInterSimComms.cs
 create mode 100644 OpenSim/Framework/Communications.OGS1/OGSUserServices.cs
 create mode 100644 OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj
 create mode 100644 OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj.user
 create mode 100644 OpenSim/Framework/Communications.OGS1/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/Communications/CommunicationsManager.cs
 create mode 100644 OpenSim/Framework/Communications/IGridServices.cs
 create mode 100644 OpenSim/Framework/Communications/IInterRegionCommunications.cs
 create mode 100644 OpenSim/Framework/Communications/IUserServices.cs
 create mode 100644 OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
 create mode 100644 OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj.user
 create mode 100644 OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/Console/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/Console/ConsoleCallbacksBase.cs
 create mode 100644 OpenSim/Framework/Console/LogBase.cs
 create mode 100644 OpenSim/Framework/Console/MainLog.cs
 create mode 100644 OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
 create mode 100644 OpenSim/Framework/Console/OpenSim.Framework.Console.csproj.user
 create mode 100644 OpenSim/Framework/Data.DB4o/DB4oGridData.cs
 create mode 100644 OpenSim/Framework/Data.DB4o/DB4oManager.cs
 create mode 100644 OpenSim/Framework/Data.DB4o/DB4oUserData.cs
 create mode 100644 OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
 create mode 100644 OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj.user
 create mode 100644 OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
 create mode 100644 OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
 create mode 100644 OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
 create mode 100644 OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj.user
 create mode 100644 OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/Data.MySQL/MySQLGridData.cs
 create mode 100644 OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
 create mode 100644 OpenSim/Framework/Data.MySQL/MySQLLogData.cs
 create mode 100644 OpenSim/Framework/Data.MySQL/MySQLManager.cs
 create mode 100644 OpenSim/Framework/Data.MySQL/MySQLUserData.cs
 create mode 100644 OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
 create mode 100644 OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj.user
 create mode 100644 OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
 create mode 100644 OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj.user
 create mode 100644 OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
 create mode 100644 OpenSim/Framework/Data.SQLite/SQLiteManager.cs
 create mode 100644 OpenSim/Framework/Data/GridData.cs
 create mode 100644 OpenSim/Framework/Data/ILogData.cs
 create mode 100644 OpenSim/Framework/Data/IniConfig.cs
 create mode 100644 OpenSim/Framework/Data/InventoryData.cs
 create mode 100644 OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
 create mode 100644 OpenSim/Framework/Data/OpenSim.Framework.Data.csproj.user
 create mode 100644 OpenSim/Framework/Data/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/Data/ReservationData.cs
 create mode 100644 OpenSim/Framework/Data/SimProfileData.cs
 create mode 100644 OpenSim/Framework/Data/UserData.cs
 create mode 100644 OpenSim/Framework/Data/UserProfileData.cs
 create mode 100644 OpenSim/Framework/General/AgentInventory.cs
 create mode 100644 OpenSim/Framework/General/AuthenticateSessionBase.cs
 create mode 100644 OpenSim/Framework/General/BlockingQueue.cs
 create mode 100644 OpenSim/Framework/General/IRegionCommsListener.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/IAssetServer.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/IClientAPI.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/ILocalStorage.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/IUserServer.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/IWorld.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs
 create mode 100644 OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs
 create mode 100644 OpenSim/Framework/General/LLSDHelpers.cs
 create mode 100644 OpenSim/Framework/General/Logger.cs
 create mode 100644 OpenSim/Framework/General/LoginService.cs
 create mode 100644 OpenSim/Framework/General/OpenSim.Framework.csproj
 create mode 100644 OpenSim/Framework/General/OpenSim.Framework.csproj.user
 create mode 100644 OpenSim/Framework/General/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/General/RegionCommsListener.cs
 create mode 100644 OpenSim/Framework/General/Remoting.cs
 create mode 100644 OpenSim/Framework/General/SimProfile.cs
 create mode 100644 OpenSim/Framework/General/Types/AgentCiruitData.cs
 create mode 100644 OpenSim/Framework/General/Types/AgentWearable.cs
 create mode 100644 OpenSim/Framework/General/Types/AssetBase.cs
 create mode 100644 OpenSim/Framework/General/Types/AssetLandmark.cs
 create mode 100644 OpenSim/Framework/General/Types/AssetStorage.cs
 create mode 100644 OpenSim/Framework/General/Types/EstateSettings.cs
 create mode 100644 OpenSim/Framework/General/Types/Login.cs
 create mode 100644 OpenSim/Framework/General/Types/MapBlockData.cs
 create mode 100644 OpenSim/Framework/General/Types/NeighbourInfo.cs
 create mode 100644 OpenSim/Framework/General/Types/NetworkServersInfo.cs
 create mode 100644 OpenSim/Framework/General/Types/ParcelData.cs
 create mode 100644 OpenSim/Framework/General/Types/PrimData.cs
 create mode 100644 OpenSim/Framework/General/Types/RegionHandle.cs
 create mode 100644 OpenSim/Framework/General/Types/RegionInfo.cs
 create mode 100644 OpenSim/Framework/General/UserProfile.cs
 create mode 100644 OpenSim/Framework/General/Util.cs
 create mode 100644 OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
 create mode 100644 OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj.user
 create mode 100644 OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
 create mode 100644 OpenSim/Framework/Servers/BaseHttpServer.cs
 create mode 100644 OpenSim/Framework/Servers/CheckSumServer.cs
 create mode 100644 OpenSim/Framework/Servers/IRestHandler.cs
 create mode 100644 OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
 create mode 100644 OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj.user
 create mode 100644 OpenSim/Framework/Servers/UDPServerBase.cs
 create mode 100644 OpenSim/Framework/Servers/XmlRpcMethod.cs
 create mode 100644 OpenSim/Framework/UserManager/LoginResponse.cs
 create mode 100644 OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
 create mode 100644 OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj.user
 create mode 100644 OpenSim/Framework/UserManager/UserManagerBase.cs
 create mode 100644 OpenSim/Grid/AssetServer/AssetHttpServer.cs
 create mode 100644 OpenSim/Grid/AssetServer/Main.cs
 create mode 100644 OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
 create mode 100644 OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user
 create mode 100644 OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
 create mode 100644 OpenSim/Grid/Framework.Manager/GridServerManager.cs
 create mode 100644 OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
 create mode 100644 OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj.user
 create mode 100644 OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
 create mode 100644 OpenSim/Grid/GridServer.Config/DbGridConfig.cs
 create mode 100644 OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj
 create mode 100644 OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj.user
 create mode 100644 OpenSim/Grid/GridServer/GridManager.cs
 create mode 100644 OpenSim/Grid/GridServer/Main.cs
 create mode 100644 OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
 create mode 100644 OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj.user
 create mode 100644 OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Grid/InventoryServer/InventoryManager.cs
 create mode 100644 OpenSim/Grid/InventoryServer/Main.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager.mds
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/Connect to grid server.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
 create mode 100644 OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
 create mode 100644 OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
 create mode 100644 OpenSim/Grid/UserServer.Config/DbUserConfig.cs
 create mode 100644 OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj
 create mode 100644 OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj.user
 create mode 100644 OpenSim/Grid/UserServer/Main.cs
 create mode 100644 OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
 create mode 100644 OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj.user
 create mode 100644 OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Grid/UserServer/UserManager.cs
 create mode 100644 OpenSim/Region/Application/Application.cs
 create mode 100644 OpenSim/Region/Application/OpenSim.csproj
 create mode 100644 OpenSim/Region/Application/OpenSim.csproj.user
 create mode 100644 OpenSim/Region/Application/OpenSimMain.cs
 create mode 100644 OpenSim/Region/Caches/AssetCache.cs
 create mode 100644 OpenSim/Region/Caches/OpenSim.Region.Caches.csproj
 create mode 100644 OpenSim/Region/Caches/OpenSim.Region.Caches.csproj.user
 create mode 100644 OpenSim/Region/Caches/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Caps/Caps.cs
 create mode 100644 OpenSim/Region/Caps/LLSDHelpers.cs
 create mode 100644 OpenSim/Region/ClientStack/Assets/InventoryCache.cs
 create mode 100644 OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
 create mode 100644 OpenSim/Region/ClientStack/ClientView.API.cs
 create mode 100644 OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
 create mode 100644 OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
 create mode 100644 OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
 create mode 100644 OpenSim/Region/ClientStack/ClientView.cs
 create mode 100644 OpenSim/Region/ClientStack/ClientViewBase.cs
 create mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
 create mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
 create mode 100644 OpenSim/Region/ClientStack/PacketServer.cs
 create mode 100644 OpenSim/Region/ClientStack/RegionApplicationBase.cs
 create mode 100644 OpenSim/Region/ClientStack/UDPServer.cs
 create mode 100644 OpenSim/Region/ClientStack/VersionInfo.cs
 create mode 100644 OpenSim/Region/Examples/SimpleApp/MyWorld.cs
 create mode 100644 OpenSim/Region/Examples/SimpleApp/Program.cs
 create mode 100644 OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
 create mode 100644 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj.user
 create mode 100644 OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
 create mode 100644 OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj
 create mode 100644 OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj.user
 create mode 100644 OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj
 create mode 100644 OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj.user
 create mode 100644 OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
 create mode 100644 OpenSim/Region/LocalCommunications/CommunicationsLocal.cs
 create mode 100644 OpenSim/Region/LocalCommunications/LocalBackEndServices.cs
 create mode 100644 OpenSim/Region/LocalCommunications/LocalUserServices.cs
 create mode 100644 OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj
 create mode 100644 OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user
 create mode 100644 OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
 create mode 100644 OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
 create mode 100644 OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj.user
 create mode 100644 OpenSim/Region/Physics/Manager/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
 create mode 100644 OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj.user
 create mode 100644 OpenSim/Region/Physics/Manager/PhysicsActor.cs
 create mode 100644 OpenSim/Region/Physics/Manager/PhysicsManager.cs
 create mode 100644 OpenSim/Region/Physics/Manager/PhysicsScene.cs
 create mode 100644 OpenSim/Region/Physics/Manager/PhysicsVector.cs
 create mode 100644 OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
 create mode 100644 OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
 create mode 100644 OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj.user
 create mode 100644 OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
 create mode 100644 OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj.user
 create mode 100644 OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
 create mode 100644 OpenSim/Region/Scripting/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Scripting/Script.cs
 create mode 100644 OpenSim/Region/Scripting/ScriptAccess.cs
 create mode 100644 OpenSim/Region/Simulation/Caps.cs
 create mode 100644 OpenSim/Region/Simulation/EstateManager.cs
 create mode 100644 OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj
 create mode 100644 OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user
 create mode 100644 OpenSim/Region/Simulation/ParcelManager.cs
 create mode 100644 OpenSim/Region/Simulation/RegionManager.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/Entity.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/Primitive.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/Scene.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/SceneBase.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/SceneEvents.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/SceneObject.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/ScenePresence.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/scripting/Script.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
 create mode 100644 OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
 create mode 100644 OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
 create mode 100644 OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
 create mode 100644 OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj.user
 create mode 100644 OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
 create mode 100644 OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
 create mode 100644 OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
 create mode 100644 OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
 create mode 100644 OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj.user
 create mode 100644 OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
 create mode 100644 OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
 create mode 100644 OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj
 create mode 100644 OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj.user
 create mode 100644 OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
 create mode 100644 OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
 create mode 100644 OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
 create mode 100644 OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj.user
 create mode 100644 OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
 create mode 100644 OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
 create mode 100644 Prebuild/Prebuild.build
 create mode 100644 Prebuild/Prebuild.sln
 create mode 100644 Prebuild/Prebuild.suo
 create mode 100644 Prebuild/README
 create mode 100644 Prebuild/TODO
 create mode 100644 Prebuild/doc/prebuild-example1.xml
 create mode 100644 Prebuild/doc/prebuild-example2.xml
 create mode 100644 Prebuild/doc/prebuild-example3.xml
 create mode 100644 Prebuild/doc/prebuild-example4.xml
 create mode 100644 Prebuild/doc/prebuild-example5.xml
 create mode 100644 Prebuild/prebuild
 create mode 100644 Prebuild/scripts/Clean.bat
 create mode 100644 Prebuild/scripts/Help.bat
 create mode 100644 Prebuild/scripts/MonoDevelop.sh
 create mode 100644 Prebuild/scripts/Prebuild.nsi
 create mode 100644 Prebuild/scripts/SharpDevelop.bat
 create mode 100644 Prebuild/scripts/SharpDevelop2.bat
 create mode 100644 Prebuild/scripts/VS2002.bat
 create mode 100644 Prebuild/scripts/VS2003.bat
 create mode 100644 Prebuild/scripts/VS2005.bat
 create mode 100644 Prebuild/scripts/autotools.bat
 create mode 100644 Prebuild/scripts/autotools.sh
 create mode 100644 Prebuild/scripts/nant.bat
 create mode 100644 Prebuild/scripts/nant.sh
 create mode 100644 Prebuild/src/App.ico
 create mode 100644 Prebuild/src/Core/Attributes/DataNodeAttribute.cs
 create mode 100644 Prebuild/src/Core/Attributes/OptionNodeAttribute.cs
 create mode 100644 Prebuild/src/Core/Attributes/TargetAttribute.cs
 create mode 100644 Prebuild/src/Core/FatalException.cs
 create mode 100644 Prebuild/src/Core/Interfaces/IDataNode.cs
 create mode 100644 Prebuild/src/Core/Interfaces/ITarget.cs
 create mode 100644 Prebuild/src/Core/Kernel.cs
 create mode 100644 Prebuild/src/Core/Nodes/ConfigurationNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/DataNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/ExcludeNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/FileNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/FilesNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/MatchNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/OptionsNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/ProcessNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/ProjectNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/ReferenceNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/ReferencePathNode.cs
 create mode 100644 Prebuild/src/Core/Nodes/SolutionNode.cs
 create mode 100644 Prebuild/src/Core/Parse/IfContext.cs
 create mode 100644 Prebuild/src/Core/Parse/Preprocessor.cs
 create mode 100644 Prebuild/src/Core/Targets/AutotoolsTarget.cs
 create mode 100644 Prebuild/src/Core/Targets/DebugTarget.cs
 create mode 100644 Prebuild/src/Core/Targets/MonoDevelopTarget.cs
 create mode 100644 Prebuild/src/Core/Targets/NAntTarget.cs
 create mode 100644 Prebuild/src/Core/Targets/SharpDevelop2Target.cs
 create mode 100644 Prebuild/src/Core/Targets/SharpDevelopTarget.cs
 create mode 100644 Prebuild/src/Core/Targets/VS2002Target.cs
 create mode 100644 Prebuild/src/Core/Targets/VS2003Target.cs
 create mode 100644 Prebuild/src/Core/Targets/VS2005Target.cs
 create mode 100644 Prebuild/src/Core/UnknownLanguageException.cs
 create mode 100644 Prebuild/src/Core/Utilities/CommandLineCollection.cs
 create mode 100644 Prebuild/src/Core/Utilities/CurrentDirectory.cs
 create mode 100644 Prebuild/src/Core/Utilities/Helper.cs
 create mode 100644 Prebuild/src/Core/Utilities/Log.cs
 create mode 100644 Prebuild/src/Core/WarningException.cs
 create mode 100644 Prebuild/src/Prebuild.cs
 create mode 100644 Prebuild/src/Prebuild.csproj
 create mode 100644 Prebuild/src/Prebuild.csproj.user
 create mode 100644 Prebuild/src/Prebuild.exe.build
 create mode 100644 Prebuild/src/Prebuild.snk
 create mode 100644 Prebuild/src/Properties/AssemblyInfo.cs
 create mode 100644 Prebuild/src/data/dnpb-1.0.xsd
 create mode 100644 Prebuild/src/data/dnpb-1.1.xsd
 create mode 100644 Prebuild/src/data/dnpb-1.2.xsd
 create mode 100644 Prebuild/src/data/dnpb-1.3.xsd
 create mode 100644 Prebuild/src/data/dnpb-1.4.xsd
 create mode 100644 Prebuild/src/data/dnpb-1.5.xsd
 create mode 100644 Prebuild/src/data/prebuild-1.6.xsd
 create mode 100644 Prebuild/src/data/prebuild-1.7.xsd
 create mode 100644 ThirdPartyLicenses/Axiom.txt
 create mode 100644 ThirdPartyLicenses/MySQL.txt
 create mode 100644 ThirdPartyLicenses/ODE.txt
 create mode 100644 ThirdPartyLicenses/OpenJpeg.txt
 create mode 100644 ThirdPartyLicenses/libsl.txt
 create mode 100644 bin/Axiom.MathLib.dll
 create mode 100644 bin/Db4objects.Db4o.dll
 create mode 100644 bin/DotSets.dll
 create mode 100644 bin/Kds.Serialization.dll
 create mode 100644 bin/Mono.PEToolkit.dll
 create mode 100644 bin/MySql.Data.dll
 create mode 100644 bin/Ode.NET.dll
 create mode 100644 bin/PhysX-wrapper.dll
 create mode 100644 bin/PhysX_Wrapper_Dotnet.dll
 create mode 100644 bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll
 create mode 100644 bin/Physics/OpenSim.Region.Physics.OdePlugin.dll
 create mode 100644 bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll
 create mode 100644 bin/Prebuild.exe
 create mode 100644 bin/System.Data.SQLite.dll
 create mode 100644 bin/XMLRPC.dll
 create mode 100644 bin/defaultstripe.png
 create mode 100644 bin/libTerrain-BSD.dll
 create mode 100644 bin/libdb_dotNET43.dll
 create mode 100644 bin/libode.a
 create mode 100644 bin/libode.so
 create mode 100644 bin/libopenjpeg-1.0.0-x86_64.so
 create mode 100644 bin/libopenjpeg-1.0.0.so
 create mode 100644 bin/libopenjpeg-1.1.0.dylib
 create mode 100644 bin/libsecondlife.dll
 create mode 100644 bin/log4net.dll
 create mode 100644 bin/ode.dll
 create mode 100644 bin/openjpeg.dll
 create mode 100644 bin/openjpegnet.dll
 create mode 100644 prebuild.xml
 create mode 100644 runprebuild.bat
 create mode 100644 share/php/generateUserFunction.php
 create mode 100644 share/regions/config_0.xml
 create mode 100644 share/regions/config_1.xml
 create mode 100644 share/regions/config_10.xml
 create mode 100644 share/regions/config_100.xml
 create mode 100644 share/regions/config_1000.xml
 create mode 100644 share/regions/config_1001.xml
 create mode 100644 share/regions/config_1002.xml
 create mode 100644 share/regions/config_1003.xml
 create mode 100644 share/regions/config_1004.xml
 create mode 100644 share/regions/config_1005.xml
 create mode 100644 share/regions/config_1006.xml
 create mode 100644 share/regions/config_1007.xml
 create mode 100644 share/regions/config_1008.xml
 create mode 100644 share/regions/config_1009.xml
 create mode 100644 share/regions/config_101.xml
 create mode 100644 share/regions/config_1010.xml
 create mode 100644 share/regions/config_1011.xml
 create mode 100644 share/regions/config_1012.xml
 create mode 100644 share/regions/config_1013.xml
 create mode 100644 share/regions/config_1014.xml
 create mode 100644 share/regions/config_1015.xml
 create mode 100644 share/regions/config_1016.xml
 create mode 100644 share/regions/config_1017.xml
 create mode 100644 share/regions/config_1018.xml
 create mode 100644 share/regions/config_1019.xml
 create mode 100644 share/regions/config_102.xml
 create mode 100644 share/regions/config_1020.xml
 create mode 100644 share/regions/config_1021.xml
 create mode 100644 share/regions/config_1022.xml
 create mode 100644 share/regions/config_1023.xml
 create mode 100644 share/regions/config_103.xml
 create mode 100644 share/regions/config_104.xml
 create mode 100644 share/regions/config_105.xml
 create mode 100644 share/regions/config_106.xml
 create mode 100644 share/regions/config_107.xml
 create mode 100644 share/regions/config_108.xml
 create mode 100644 share/regions/config_109.xml
 create mode 100644 share/regions/config_11.xml
 create mode 100644 share/regions/config_110.xml
 create mode 100644 share/regions/config_111.xml
 create mode 100644 share/regions/config_112.xml
 create mode 100644 share/regions/config_113.xml
 create mode 100644 share/regions/config_114.xml
 create mode 100644 share/regions/config_115.xml
 create mode 100644 share/regions/config_116.xml
 create mode 100644 share/regions/config_117.xml
 create mode 100644 share/regions/config_118.xml
 create mode 100644 share/regions/config_119.xml
 create mode 100644 share/regions/config_12.xml
 create mode 100644 share/regions/config_120.xml
 create mode 100644 share/regions/config_121.xml
 create mode 100644 share/regions/config_122.xml
 create mode 100644 share/regions/config_123.xml
 create mode 100644 share/regions/config_124.xml
 create mode 100644 share/regions/config_125.xml
 create mode 100644 share/regions/config_126.xml
 create mode 100644 share/regions/config_127.xml
 create mode 100644 share/regions/config_128.xml
 create mode 100644 share/regions/config_129.xml
 create mode 100644 share/regions/config_13.xml
 create mode 100644 share/regions/config_130.xml
 create mode 100644 share/regions/config_131.xml
 create mode 100644 share/regions/config_132.xml
 create mode 100644 share/regions/config_133.xml
 create mode 100644 share/regions/config_134.xml
 create mode 100644 share/regions/config_135.xml
 create mode 100644 share/regions/config_136.xml
 create mode 100644 share/regions/config_137.xml
 create mode 100644 share/regions/config_138.xml
 create mode 100644 share/regions/config_139.xml
 create mode 100644 share/regions/config_14.xml
 create mode 100644 share/regions/config_140.xml
 create mode 100644 share/regions/config_141.xml
 create mode 100644 share/regions/config_142.xml
 create mode 100644 share/regions/config_143.xml
 create mode 100644 share/regions/config_144.xml
 create mode 100644 share/regions/config_145.xml
 create mode 100644 share/regions/config_146.xml
 create mode 100644 share/regions/config_147.xml
 create mode 100644 share/regions/config_148.xml
 create mode 100644 share/regions/config_149.xml
 create mode 100644 share/regions/config_15.xml
 create mode 100644 share/regions/config_150.xml
 create mode 100644 share/regions/config_151.xml
 create mode 100644 share/regions/config_152.xml
 create mode 100644 share/regions/config_153.xml
 create mode 100644 share/regions/config_154.xml
 create mode 100644 share/regions/config_155.xml
 create mode 100644 share/regions/config_156.xml
 create mode 100644 share/regions/config_157.xml
 create mode 100644 share/regions/config_158.xml
 create mode 100644 share/regions/config_159.xml
 create mode 100644 share/regions/config_16.xml
 create mode 100644 share/regions/config_160.xml
 create mode 100644 share/regions/config_161.xml
 create mode 100644 share/regions/config_162.xml
 create mode 100644 share/regions/config_163.xml
 create mode 100644 share/regions/config_164.xml
 create mode 100644 share/regions/config_165.xml
 create mode 100644 share/regions/config_166.xml
 create mode 100644 share/regions/config_167.xml
 create mode 100644 share/regions/config_168.xml
 create mode 100644 share/regions/config_169.xml
 create mode 100644 share/regions/config_17.xml
 create mode 100644 share/regions/config_170.xml
 create mode 100644 share/regions/config_171.xml
 create mode 100644 share/regions/config_172.xml
 create mode 100644 share/regions/config_173.xml
 create mode 100644 share/regions/config_174.xml
 create mode 100644 share/regions/config_175.xml
 create mode 100644 share/regions/config_176.xml
 create mode 100644 share/regions/config_177.xml
 create mode 100644 share/regions/config_178.xml
 create mode 100644 share/regions/config_179.xml
 create mode 100644 share/regions/config_18.xml
 create mode 100644 share/regions/config_180.xml
 create mode 100644 share/regions/config_181.xml
 create mode 100644 share/regions/config_182.xml
 create mode 100644 share/regions/config_183.xml
 create mode 100644 share/regions/config_184.xml
 create mode 100644 share/regions/config_185.xml
 create mode 100644 share/regions/config_186.xml
 create mode 100644 share/regions/config_187.xml
 create mode 100644 share/regions/config_188.xml
 create mode 100644 share/regions/config_189.xml
 create mode 100644 share/regions/config_19.xml
 create mode 100644 share/regions/config_190.xml
 create mode 100644 share/regions/config_191.xml
 create mode 100644 share/regions/config_192.xml
 create mode 100644 share/regions/config_193.xml
 create mode 100644 share/regions/config_194.xml
 create mode 100644 share/regions/config_195.xml
 create mode 100644 share/regions/config_196.xml
 create mode 100644 share/regions/config_197.xml
 create mode 100644 share/regions/config_198.xml
 create mode 100644 share/regions/config_199.xml
 create mode 100644 share/regions/config_2.xml
 create mode 100644 share/regions/config_20.xml
 create mode 100644 share/regions/config_200.xml
 create mode 100644 share/regions/config_201.xml
 create mode 100644 share/regions/config_202.xml
 create mode 100644 share/regions/config_203.xml
 create mode 100644 share/regions/config_204.xml
 create mode 100644 share/regions/config_205.xml
 create mode 100644 share/regions/config_206.xml
 create mode 100644 share/regions/config_207.xml
 create mode 100644 share/regions/config_208.xml
 create mode 100644 share/regions/config_209.xml
 create mode 100644 share/regions/config_21.xml
 create mode 100644 share/regions/config_210.xml
 create mode 100644 share/regions/config_211.xml
 create mode 100644 share/regions/config_212.xml
 create mode 100644 share/regions/config_213.xml
 create mode 100644 share/regions/config_214.xml
 create mode 100644 share/regions/config_215.xml
 create mode 100644 share/regions/config_216.xml
 create mode 100644 share/regions/config_217.xml
 create mode 100644 share/regions/config_218.xml
 create mode 100644 share/regions/config_219.xml
 create mode 100644 share/regions/config_22.xml
 create mode 100644 share/regions/config_220.xml
 create mode 100644 share/regions/config_221.xml
 create mode 100644 share/regions/config_222.xml
 create mode 100644 share/regions/config_223.xml
 create mode 100644 share/regions/config_224.xml
 create mode 100644 share/regions/config_225.xml
 create mode 100644 share/regions/config_226.xml
 create mode 100644 share/regions/config_227.xml
 create mode 100644 share/regions/config_228.xml
 create mode 100644 share/regions/config_229.xml
 create mode 100644 share/regions/config_23.xml
 create mode 100644 share/regions/config_230.xml
 create mode 100644 share/regions/config_231.xml
 create mode 100644 share/regions/config_232.xml
 create mode 100644 share/regions/config_233.xml
 create mode 100644 share/regions/config_234.xml
 create mode 100644 share/regions/config_235.xml
 create mode 100644 share/regions/config_236.xml
 create mode 100644 share/regions/config_237.xml
 create mode 100644 share/regions/config_238.xml
 create mode 100644 share/regions/config_239.xml
 create mode 100644 share/regions/config_24.xml
 create mode 100644 share/regions/config_240.xml
 create mode 100644 share/regions/config_241.xml
 create mode 100644 share/regions/config_242.xml
 create mode 100644 share/regions/config_243.xml
 create mode 100644 share/regions/config_244.xml
 create mode 100644 share/regions/config_245.xml
 create mode 100644 share/regions/config_246.xml
 create mode 100644 share/regions/config_247.xml
 create mode 100644 share/regions/config_248.xml
 create mode 100644 share/regions/config_249.xml
 create mode 100644 share/regions/config_25.xml
 create mode 100644 share/regions/config_250.xml
 create mode 100644 share/regions/config_251.xml
 create mode 100644 share/regions/config_252.xml
 create mode 100644 share/regions/config_253.xml
 create mode 100644 share/regions/config_254.xml
 create mode 100644 share/regions/config_255.xml
 create mode 100644 share/regions/config_256.xml
 create mode 100644 share/regions/config_257.xml
 create mode 100644 share/regions/config_258.xml
 create mode 100644 share/regions/config_259.xml
 create mode 100644 share/regions/config_26.xml
 create mode 100644 share/regions/config_260.xml
 create mode 100644 share/regions/config_261.xml
 create mode 100644 share/regions/config_262.xml
 create mode 100644 share/regions/config_263.xml
 create mode 100644 share/regions/config_264.xml
 create mode 100644 share/regions/config_265.xml
 create mode 100644 share/regions/config_266.xml
 create mode 100644 share/regions/config_267.xml
 create mode 100644 share/regions/config_268.xml
 create mode 100644 share/regions/config_269.xml
 create mode 100644 share/regions/config_27.xml
 create mode 100644 share/regions/config_270.xml
 create mode 100644 share/regions/config_271.xml
 create mode 100644 share/regions/config_272.xml
 create mode 100644 share/regions/config_273.xml
 create mode 100644 share/regions/config_274.xml
 create mode 100644 share/regions/config_275.xml
 create mode 100644 share/regions/config_276.xml
 create mode 100644 share/regions/config_277.xml
 create mode 100644 share/regions/config_278.xml
 create mode 100644 share/regions/config_279.xml
 create mode 100644 share/regions/config_28.xml
 create mode 100644 share/regions/config_280.xml
 create mode 100644 share/regions/config_281.xml
 create mode 100644 share/regions/config_282.xml
 create mode 100644 share/regions/config_283.xml
 create mode 100644 share/regions/config_284.xml
 create mode 100644 share/regions/config_285.xml
 create mode 100644 share/regions/config_286.xml
 create mode 100644 share/regions/config_287.xml
 create mode 100644 share/regions/config_288.xml
 create mode 100644 share/regions/config_289.xml
 create mode 100644 share/regions/config_29.xml
 create mode 100644 share/regions/config_290.xml
 create mode 100644 share/regions/config_291.xml
 create mode 100644 share/regions/config_292.xml
 create mode 100644 share/regions/config_293.xml
 create mode 100644 share/regions/config_294.xml
 create mode 100644 share/regions/config_295.xml
 create mode 100644 share/regions/config_296.xml
 create mode 100644 share/regions/config_297.xml
 create mode 100644 share/regions/config_298.xml
 create mode 100644 share/regions/config_299.xml
 create mode 100644 share/regions/config_3.xml
 create mode 100644 share/regions/config_30.xml
 create mode 100644 share/regions/config_300.xml
 create mode 100644 share/regions/config_301.xml
 create mode 100644 share/regions/config_302.xml
 create mode 100644 share/regions/config_303.xml
 create mode 100644 share/regions/config_304.xml
 create mode 100644 share/regions/config_305.xml
 create mode 100644 share/regions/config_306.xml
 create mode 100644 share/regions/config_307.xml
 create mode 100644 share/regions/config_308.xml
 create mode 100644 share/regions/config_309.xml
 create mode 100644 share/regions/config_31.xml
 create mode 100644 share/regions/config_310.xml
 create mode 100644 share/regions/config_311.xml
 create mode 100644 share/regions/config_312.xml
 create mode 100644 share/regions/config_313.xml
 create mode 100644 share/regions/config_314.xml
 create mode 100644 share/regions/config_315.xml
 create mode 100644 share/regions/config_316.xml
 create mode 100644 share/regions/config_317.xml
 create mode 100644 share/regions/config_318.xml
 create mode 100644 share/regions/config_319.xml
 create mode 100644 share/regions/config_32.xml
 create mode 100644 share/regions/config_320.xml
 create mode 100644 share/regions/config_321.xml
 create mode 100644 share/regions/config_322.xml
 create mode 100644 share/regions/config_323.xml
 create mode 100644 share/regions/config_324.xml
 create mode 100644 share/regions/config_325.xml
 create mode 100644 share/regions/config_326.xml
 create mode 100644 share/regions/config_327.xml
 create mode 100644 share/regions/config_328.xml
 create mode 100644 share/regions/config_329.xml
 create mode 100644 share/regions/config_33.xml
 create mode 100644 share/regions/config_330.xml
 create mode 100644 share/regions/config_331.xml
 create mode 100644 share/regions/config_332.xml
 create mode 100644 share/regions/config_333.xml
 create mode 100644 share/regions/config_334.xml
 create mode 100644 share/regions/config_335.xml
 create mode 100644 share/regions/config_336.xml
 create mode 100644 share/regions/config_337.xml
 create mode 100644 share/regions/config_338.xml
 create mode 100644 share/regions/config_339.xml
 create mode 100644 share/regions/config_34.xml
 create mode 100644 share/regions/config_340.xml
 create mode 100644 share/regions/config_341.xml
 create mode 100644 share/regions/config_342.xml
 create mode 100644 share/regions/config_343.xml
 create mode 100644 share/regions/config_344.xml
 create mode 100644 share/regions/config_345.xml
 create mode 100644 share/regions/config_346.xml
 create mode 100644 share/regions/config_347.xml
 create mode 100644 share/regions/config_348.xml
 create mode 100644 share/regions/config_349.xml
 create mode 100644 share/regions/config_35.xml
 create mode 100644 share/regions/config_350.xml
 create mode 100644 share/regions/config_351.xml
 create mode 100644 share/regions/config_352.xml
 create mode 100644 share/regions/config_353.xml
 create mode 100644 share/regions/config_354.xml
 create mode 100644 share/regions/config_355.xml
 create mode 100644 share/regions/config_356.xml
 create mode 100644 share/regions/config_357.xml
 create mode 100644 share/regions/config_358.xml
 create mode 100644 share/regions/config_359.xml
 create mode 100644 share/regions/config_36.xml
 create mode 100644 share/regions/config_360.xml
 create mode 100644 share/regions/config_361.xml
 create mode 100644 share/regions/config_362.xml
 create mode 100644 share/regions/config_363.xml
 create mode 100644 share/regions/config_364.xml
 create mode 100644 share/regions/config_365.xml
 create mode 100644 share/regions/config_366.xml
 create mode 100644 share/regions/config_367.xml
 create mode 100644 share/regions/config_368.xml
 create mode 100644 share/regions/config_369.xml
 create mode 100644 share/regions/config_37.xml
 create mode 100644 share/regions/config_370.xml
 create mode 100644 share/regions/config_371.xml
 create mode 100644 share/regions/config_372.xml
 create mode 100644 share/regions/config_373.xml
 create mode 100644 share/regions/config_374.xml
 create mode 100644 share/regions/config_375.xml
 create mode 100644 share/regions/config_376.xml
 create mode 100644 share/regions/config_377.xml
 create mode 100644 share/regions/config_378.xml
 create mode 100644 share/regions/config_379.xml
 create mode 100644 share/regions/config_38.xml
 create mode 100644 share/regions/config_380.xml
 create mode 100644 share/regions/config_381.xml
 create mode 100644 share/regions/config_382.xml
 create mode 100644 share/regions/config_383.xml
 create mode 100644 share/regions/config_384.xml
 create mode 100644 share/regions/config_385.xml
 create mode 100644 share/regions/config_386.xml
 create mode 100644 share/regions/config_387.xml
 create mode 100644 share/regions/config_388.xml
 create mode 100644 share/regions/config_389.xml
 create mode 100644 share/regions/config_39.xml
 create mode 100644 share/regions/config_390.xml
 create mode 100644 share/regions/config_391.xml
 create mode 100644 share/regions/config_392.xml
 create mode 100644 share/regions/config_393.xml
 create mode 100644 share/regions/config_394.xml
 create mode 100644 share/regions/config_395.xml
 create mode 100644 share/regions/config_396.xml
 create mode 100644 share/regions/config_397.xml
 create mode 100644 share/regions/config_398.xml
 create mode 100644 share/regions/config_399.xml
 create mode 100644 share/regions/config_4.xml
 create mode 100644 share/regions/config_40.xml
 create mode 100644 share/regions/config_400.xml
 create mode 100644 share/regions/config_401.xml
 create mode 100644 share/regions/config_402.xml
 create mode 100644 share/regions/config_403.xml
 create mode 100644 share/regions/config_404.xml
 create mode 100644 share/regions/config_405.xml
 create mode 100644 share/regions/config_406.xml
 create mode 100644 share/regions/config_407.xml
 create mode 100644 share/regions/config_408.xml
 create mode 100644 share/regions/config_409.xml
 create mode 100644 share/regions/config_41.xml
 create mode 100644 share/regions/config_410.xml
 create mode 100644 share/regions/config_411.xml
 create mode 100644 share/regions/config_412.xml
 create mode 100644 share/regions/config_413.xml
 create mode 100644 share/regions/config_414.xml
 create mode 100644 share/regions/config_415.xml
 create mode 100644 share/regions/config_416.xml
 create mode 100644 share/regions/config_417.xml
 create mode 100644 share/regions/config_418.xml
 create mode 100644 share/regions/config_419.xml
 create mode 100644 share/regions/config_42.xml
 create mode 100644 share/regions/config_420.xml
 create mode 100644 share/regions/config_421.xml
 create mode 100644 share/regions/config_422.xml
 create mode 100644 share/regions/config_423.xml
 create mode 100644 share/regions/config_424.xml
 create mode 100644 share/regions/config_425.xml
 create mode 100644 share/regions/config_426.xml
 create mode 100644 share/regions/config_427.xml
 create mode 100644 share/regions/config_428.xml
 create mode 100644 share/regions/config_429.xml
 create mode 100644 share/regions/config_43.xml
 create mode 100644 share/regions/config_430.xml
 create mode 100644 share/regions/config_431.xml
 create mode 100644 share/regions/config_432.xml
 create mode 100644 share/regions/config_433.xml
 create mode 100644 share/regions/config_434.xml
 create mode 100644 share/regions/config_435.xml
 create mode 100644 share/regions/config_436.xml
 create mode 100644 share/regions/config_437.xml
 create mode 100644 share/regions/config_438.xml
 create mode 100644 share/regions/config_439.xml
 create mode 100644 share/regions/config_44.xml
 create mode 100644 share/regions/config_440.xml
 create mode 100644 share/regions/config_441.xml
 create mode 100644 share/regions/config_442.xml
 create mode 100644 share/regions/config_443.xml
 create mode 100644 share/regions/config_444.xml
 create mode 100644 share/regions/config_445.xml
 create mode 100644 share/regions/config_446.xml
 create mode 100644 share/regions/config_447.xml
 create mode 100644 share/regions/config_448.xml
 create mode 100644 share/regions/config_449.xml
 create mode 100644 share/regions/config_45.xml
 create mode 100644 share/regions/config_450.xml
 create mode 100644 share/regions/config_451.xml
 create mode 100644 share/regions/config_452.xml
 create mode 100644 share/regions/config_453.xml
 create mode 100644 share/regions/config_454.xml
 create mode 100644 share/regions/config_455.xml
 create mode 100644 share/regions/config_456.xml
 create mode 100644 share/regions/config_457.xml
 create mode 100644 share/regions/config_458.xml
 create mode 100644 share/regions/config_459.xml
 create mode 100644 share/regions/config_46.xml
 create mode 100644 share/regions/config_460.xml
 create mode 100644 share/regions/config_461.xml
 create mode 100644 share/regions/config_462.xml
 create mode 100644 share/regions/config_463.xml
 create mode 100644 share/regions/config_464.xml
 create mode 100644 share/regions/config_465.xml
 create mode 100644 share/regions/config_466.xml
 create mode 100644 share/regions/config_467.xml
 create mode 100644 share/regions/config_468.xml
 create mode 100644 share/regions/config_469.xml
 create mode 100644 share/regions/config_47.xml
 create mode 100644 share/regions/config_470.xml
 create mode 100644 share/regions/config_471.xml
 create mode 100644 share/regions/config_472.xml
 create mode 100644 share/regions/config_473.xml
 create mode 100644 share/regions/config_474.xml
 create mode 100644 share/regions/config_475.xml
 create mode 100644 share/regions/config_476.xml
 create mode 100644 share/regions/config_477.xml
 create mode 100644 share/regions/config_478.xml
 create mode 100644 share/regions/config_479.xml
 create mode 100644 share/regions/config_48.xml
 create mode 100644 share/regions/config_480.xml
 create mode 100644 share/regions/config_481.xml
 create mode 100644 share/regions/config_482.xml
 create mode 100644 share/regions/config_483.xml
 create mode 100644 share/regions/config_484.xml
 create mode 100644 share/regions/config_485.xml
 create mode 100644 share/regions/config_486.xml
 create mode 100644 share/regions/config_487.xml
 create mode 100644 share/regions/config_488.xml
 create mode 100644 share/regions/config_489.xml
 create mode 100644 share/regions/config_49.xml
 create mode 100644 share/regions/config_490.xml
 create mode 100644 share/regions/config_491.xml
 create mode 100644 share/regions/config_492.xml
 create mode 100644 share/regions/config_493.xml
 create mode 100644 share/regions/config_494.xml
 create mode 100644 share/regions/config_495.xml
 create mode 100644 share/regions/config_496.xml
 create mode 100644 share/regions/config_497.xml
 create mode 100644 share/regions/config_498.xml
 create mode 100644 share/regions/config_499.xml
 create mode 100644 share/regions/config_5.xml
 create mode 100644 share/regions/config_50.xml
 create mode 100644 share/regions/config_500.xml
 create mode 100644 share/regions/config_501.xml
 create mode 100644 share/regions/config_502.xml
 create mode 100644 share/regions/config_503.xml
 create mode 100644 share/regions/config_504.xml
 create mode 100644 share/regions/config_505.xml
 create mode 100644 share/regions/config_506.xml
 create mode 100644 share/regions/config_507.xml
 create mode 100644 share/regions/config_508.xml
 create mode 100644 share/regions/config_509.xml
 create mode 100644 share/regions/config_51.xml
 create mode 100644 share/regions/config_510.xml
 create mode 100644 share/regions/config_511.xml
 create mode 100644 share/regions/config_512.xml
 create mode 100644 share/regions/config_513.xml
 create mode 100644 share/regions/config_514.xml
 create mode 100644 share/regions/config_515.xml
 create mode 100644 share/regions/config_516.xml
 create mode 100644 share/regions/config_517.xml
 create mode 100644 share/regions/config_518.xml
 create mode 100644 share/regions/config_519.xml
 create mode 100644 share/regions/config_52.xml
 create mode 100644 share/regions/config_520.xml
 create mode 100644 share/regions/config_521.xml
 create mode 100644 share/regions/config_522.xml
 create mode 100644 share/regions/config_523.xml
 create mode 100644 share/regions/config_524.xml
 create mode 100644 share/regions/config_525.xml
 create mode 100644 share/regions/config_526.xml
 create mode 100644 share/regions/config_527.xml
 create mode 100644 share/regions/config_528.xml
 create mode 100644 share/regions/config_529.xml
 create mode 100644 share/regions/config_53.xml
 create mode 100644 share/regions/config_530.xml
 create mode 100644 share/regions/config_531.xml
 create mode 100644 share/regions/config_532.xml
 create mode 100644 share/regions/config_533.xml
 create mode 100644 share/regions/config_534.xml
 create mode 100644 share/regions/config_535.xml
 create mode 100644 share/regions/config_536.xml
 create mode 100644 share/regions/config_537.xml
 create mode 100644 share/regions/config_538.xml
 create mode 100644 share/regions/config_539.xml
 create mode 100644 share/regions/config_54.xml
 create mode 100644 share/regions/config_540.xml
 create mode 100644 share/regions/config_541.xml
 create mode 100644 share/regions/config_542.xml
 create mode 100644 share/regions/config_543.xml
 create mode 100644 share/regions/config_544.xml
 create mode 100644 share/regions/config_545.xml
 create mode 100644 share/regions/config_546.xml
 create mode 100644 share/regions/config_547.xml
 create mode 100644 share/regions/config_548.xml
 create mode 100644 share/regions/config_549.xml
 create mode 100644 share/regions/config_55.xml
 create mode 100644 share/regions/config_550.xml
 create mode 100644 share/regions/config_551.xml
 create mode 100644 share/regions/config_552.xml
 create mode 100644 share/regions/config_553.xml
 create mode 100644 share/regions/config_554.xml
 create mode 100644 share/regions/config_555.xml
 create mode 100644 share/regions/config_556.xml
 create mode 100644 share/regions/config_557.xml
 create mode 100644 share/regions/config_558.xml
 create mode 100644 share/regions/config_559.xml
 create mode 100644 share/regions/config_56.xml
 create mode 100644 share/regions/config_560.xml
 create mode 100644 share/regions/config_561.xml
 create mode 100644 share/regions/config_562.xml
 create mode 100644 share/regions/config_563.xml
 create mode 100644 share/regions/config_564.xml
 create mode 100644 share/regions/config_565.xml
 create mode 100644 share/regions/config_566.xml
 create mode 100644 share/regions/config_567.xml
 create mode 100644 share/regions/config_568.xml
 create mode 100644 share/regions/config_569.xml
 create mode 100644 share/regions/config_57.xml
 create mode 100644 share/regions/config_570.xml
 create mode 100644 share/regions/config_571.xml
 create mode 100644 share/regions/config_572.xml
 create mode 100644 share/regions/config_573.xml
 create mode 100644 share/regions/config_574.xml
 create mode 100644 share/regions/config_575.xml
 create mode 100644 share/regions/config_576.xml
 create mode 100644 share/regions/config_577.xml
 create mode 100644 share/regions/config_578.xml
 create mode 100644 share/regions/config_579.xml
 create mode 100644 share/regions/config_58.xml
 create mode 100644 share/regions/config_580.xml
 create mode 100644 share/regions/config_581.xml
 create mode 100644 share/regions/config_582.xml
 create mode 100644 share/regions/config_583.xml
 create mode 100644 share/regions/config_584.xml
 create mode 100644 share/regions/config_585.xml
 create mode 100644 share/regions/config_586.xml
 create mode 100644 share/regions/config_587.xml
 create mode 100644 share/regions/config_588.xml
 create mode 100644 share/regions/config_589.xml
 create mode 100644 share/regions/config_59.xml
 create mode 100644 share/regions/config_590.xml
 create mode 100644 share/regions/config_591.xml
 create mode 100644 share/regions/config_592.xml
 create mode 100644 share/regions/config_593.xml
 create mode 100644 share/regions/config_594.xml
 create mode 100644 share/regions/config_595.xml
 create mode 100644 share/regions/config_596.xml
 create mode 100644 share/regions/config_597.xml
 create mode 100644 share/regions/config_598.xml
 create mode 100644 share/regions/config_599.xml
 create mode 100644 share/regions/config_6.xml
 create mode 100644 share/regions/config_60.xml
 create mode 100644 share/regions/config_600.xml
 create mode 100644 share/regions/config_601.xml
 create mode 100644 share/regions/config_602.xml
 create mode 100644 share/regions/config_603.xml
 create mode 100644 share/regions/config_604.xml
 create mode 100644 share/regions/config_605.xml
 create mode 100644 share/regions/config_606.xml
 create mode 100644 share/regions/config_607.xml
 create mode 100644 share/regions/config_608.xml
 create mode 100644 share/regions/config_609.xml
 create mode 100644 share/regions/config_61.xml
 create mode 100644 share/regions/config_610.xml
 create mode 100644 share/regions/config_611.xml
 create mode 100644 share/regions/config_612.xml
 create mode 100644 share/regions/config_613.xml
 create mode 100644 share/regions/config_614.xml
 create mode 100644 share/regions/config_615.xml
 create mode 100644 share/regions/config_616.xml
 create mode 100644 share/regions/config_617.xml
 create mode 100644 share/regions/config_618.xml
 create mode 100644 share/regions/config_619.xml
 create mode 100644 share/regions/config_62.xml
 create mode 100644 share/regions/config_620.xml
 create mode 100644 share/regions/config_621.xml
 create mode 100644 share/regions/config_622.xml
 create mode 100644 share/regions/config_623.xml
 create mode 100644 share/regions/config_624.xml
 create mode 100644 share/regions/config_625.xml
 create mode 100644 share/regions/config_626.xml
 create mode 100644 share/regions/config_627.xml
 create mode 100644 share/regions/config_628.xml
 create mode 100644 share/regions/config_629.xml
 create mode 100644 share/regions/config_63.xml
 create mode 100644 share/regions/config_630.xml
 create mode 100644 share/regions/config_631.xml
 create mode 100644 share/regions/config_632.xml
 create mode 100644 share/regions/config_633.xml
 create mode 100644 share/regions/config_634.xml
 create mode 100644 share/regions/config_635.xml
 create mode 100644 share/regions/config_636.xml
 create mode 100644 share/regions/config_637.xml
 create mode 100644 share/regions/config_638.xml
 create mode 100644 share/regions/config_639.xml
 create mode 100644 share/regions/config_64.xml
 create mode 100644 share/regions/config_640.xml
 create mode 100644 share/regions/config_641.xml
 create mode 100644 share/regions/config_642.xml
 create mode 100644 share/regions/config_643.xml
 create mode 100644 share/regions/config_644.xml
 create mode 100644 share/regions/config_645.xml
 create mode 100644 share/regions/config_646.xml
 create mode 100644 share/regions/config_647.xml
 create mode 100644 share/regions/config_648.xml
 create mode 100644 share/regions/config_649.xml
 create mode 100644 share/regions/config_65.xml
 create mode 100644 share/regions/config_650.xml
 create mode 100644 share/regions/config_651.xml
 create mode 100644 share/regions/config_652.xml
 create mode 100644 share/regions/config_653.xml
 create mode 100644 share/regions/config_654.xml
 create mode 100644 share/regions/config_655.xml
 create mode 100644 share/regions/config_656.xml
 create mode 100644 share/regions/config_657.xml
 create mode 100644 share/regions/config_658.xml
 create mode 100644 share/regions/config_659.xml
 create mode 100644 share/regions/config_66.xml
 create mode 100644 share/regions/config_660.xml
 create mode 100644 share/regions/config_661.xml
 create mode 100644 share/regions/config_662.xml
 create mode 100644 share/regions/config_663.xml
 create mode 100644 share/regions/config_664.xml
 create mode 100644 share/regions/config_665.xml
 create mode 100644 share/regions/config_666.xml
 create mode 100644 share/regions/config_667.xml
 create mode 100644 share/regions/config_668.xml
 create mode 100644 share/regions/config_669.xml
 create mode 100644 share/regions/config_67.xml
 create mode 100644 share/regions/config_670.xml
 create mode 100644 share/regions/config_671.xml
 create mode 100644 share/regions/config_672.xml
 create mode 100644 share/regions/config_673.xml
 create mode 100644 share/regions/config_674.xml
 create mode 100644 share/regions/config_675.xml
 create mode 100644 share/regions/config_676.xml
 create mode 100644 share/regions/config_677.xml
 create mode 100644 share/regions/config_678.xml
 create mode 100644 share/regions/config_679.xml
 create mode 100644 share/regions/config_68.xml
 create mode 100644 share/regions/config_680.xml
 create mode 100644 share/regions/config_681.xml
 create mode 100644 share/regions/config_682.xml
 create mode 100644 share/regions/config_683.xml
 create mode 100644 share/regions/config_684.xml
 create mode 100644 share/regions/config_685.xml
 create mode 100644 share/regions/config_686.xml
 create mode 100644 share/regions/config_687.xml
 create mode 100644 share/regions/config_688.xml
 create mode 100644 share/regions/config_689.xml
 create mode 100644 share/regions/config_69.xml
 create mode 100644 share/regions/config_690.xml
 create mode 100644 share/regions/config_691.xml
 create mode 100644 share/regions/config_692.xml
 create mode 100644 share/regions/config_693.xml
 create mode 100644 share/regions/config_694.xml
 create mode 100644 share/regions/config_695.xml
 create mode 100644 share/regions/config_696.xml
 create mode 100644 share/regions/config_697.xml
 create mode 100644 share/regions/config_698.xml
 create mode 100644 share/regions/config_699.xml
 create mode 100644 share/regions/config_7.xml
 create mode 100644 share/regions/config_70.xml
 create mode 100644 share/regions/config_700.xml
 create mode 100644 share/regions/config_701.xml
 create mode 100644 share/regions/config_702.xml
 create mode 100644 share/regions/config_703.xml
 create mode 100644 share/regions/config_704.xml
 create mode 100644 share/regions/config_705.xml
 create mode 100644 share/regions/config_706.xml
 create mode 100644 share/regions/config_707.xml
 create mode 100644 share/regions/config_708.xml
 create mode 100644 share/regions/config_709.xml
 create mode 100644 share/regions/config_71.xml
 create mode 100644 share/regions/config_710.xml
 create mode 100644 share/regions/config_711.xml
 create mode 100644 share/regions/config_712.xml
 create mode 100644 share/regions/config_713.xml
 create mode 100644 share/regions/config_714.xml
 create mode 100644 share/regions/config_715.xml
 create mode 100644 share/regions/config_716.xml
 create mode 100644 share/regions/config_717.xml
 create mode 100644 share/regions/config_718.xml
 create mode 100644 share/regions/config_719.xml
 create mode 100644 share/regions/config_72.xml
 create mode 100644 share/regions/config_720.xml
 create mode 100644 share/regions/config_721.xml
 create mode 100644 share/regions/config_722.xml
 create mode 100644 share/regions/config_723.xml
 create mode 100644 share/regions/config_724.xml
 create mode 100644 share/regions/config_725.xml
 create mode 100644 share/regions/config_726.xml
 create mode 100644 share/regions/config_727.xml
 create mode 100644 share/regions/config_728.xml
 create mode 100644 share/regions/config_729.xml
 create mode 100644 share/regions/config_73.xml
 create mode 100644 share/regions/config_730.xml
 create mode 100644 share/regions/config_731.xml
 create mode 100644 share/regions/config_732.xml
 create mode 100644 share/regions/config_733.xml
 create mode 100644 share/regions/config_734.xml
 create mode 100644 share/regions/config_735.xml
 create mode 100644 share/regions/config_736.xml
 create mode 100644 share/regions/config_737.xml
 create mode 100644 share/regions/config_738.xml
 create mode 100644 share/regions/config_739.xml
 create mode 100644 share/regions/config_74.xml
 create mode 100644 share/regions/config_740.xml
 create mode 100644 share/regions/config_741.xml
 create mode 100644 share/regions/config_742.xml
 create mode 100644 share/regions/config_743.xml
 create mode 100644 share/regions/config_744.xml
 create mode 100644 share/regions/config_745.xml
 create mode 100644 share/regions/config_746.xml
 create mode 100644 share/regions/config_747.xml
 create mode 100644 share/regions/config_748.xml
 create mode 100644 share/regions/config_749.xml
 create mode 100644 share/regions/config_75.xml
 create mode 100644 share/regions/config_750.xml
 create mode 100644 share/regions/config_751.xml
 create mode 100644 share/regions/config_752.xml
 create mode 100644 share/regions/config_753.xml
 create mode 100644 share/regions/config_754.xml
 create mode 100644 share/regions/config_755.xml
 create mode 100644 share/regions/config_756.xml
 create mode 100644 share/regions/config_757.xml
 create mode 100644 share/regions/config_758.xml
 create mode 100644 share/regions/config_759.xml
 create mode 100644 share/regions/config_76.xml
 create mode 100644 share/regions/config_760.xml
 create mode 100644 share/regions/config_761.xml
 create mode 100644 share/regions/config_762.xml
 create mode 100644 share/regions/config_763.xml
 create mode 100644 share/regions/config_764.xml
 create mode 100644 share/regions/config_765.xml
 create mode 100644 share/regions/config_766.xml
 create mode 100644 share/regions/config_767.xml
 create mode 100644 share/regions/config_768.xml
 create mode 100644 share/regions/config_769.xml
 create mode 100644 share/regions/config_77.xml
 create mode 100644 share/regions/config_770.xml
 create mode 100644 share/regions/config_771.xml
 create mode 100644 share/regions/config_772.xml
 create mode 100644 share/regions/config_773.xml
 create mode 100644 share/regions/config_774.xml
 create mode 100644 share/regions/config_775.xml
 create mode 100644 share/regions/config_776.xml
 create mode 100644 share/regions/config_777.xml
 create mode 100644 share/regions/config_778.xml
 create mode 100644 share/regions/config_779.xml
 create mode 100644 share/regions/config_78.xml
 create mode 100644 share/regions/config_780.xml
 create mode 100644 share/regions/config_781.xml
 create mode 100644 share/regions/config_782.xml
 create mode 100644 share/regions/config_783.xml
 create mode 100644 share/regions/config_784.xml
 create mode 100644 share/regions/config_785.xml
 create mode 100644 share/regions/config_786.xml
 create mode 100644 share/regions/config_787.xml
 create mode 100644 share/regions/config_788.xml
 create mode 100644 share/regions/config_789.xml
 create mode 100644 share/regions/config_79.xml
 create mode 100644 share/regions/config_790.xml
 create mode 100644 share/regions/config_791.xml
 create mode 100644 share/regions/config_792.xml
 create mode 100644 share/regions/config_793.xml
 create mode 100644 share/regions/config_794.xml
 create mode 100644 share/regions/config_795.xml
 create mode 100644 share/regions/config_796.xml
 create mode 100644 share/regions/config_797.xml
 create mode 100644 share/regions/config_798.xml
 create mode 100644 share/regions/config_799.xml
 create mode 100644 share/regions/config_8.xml
 create mode 100644 share/regions/config_80.xml
 create mode 100644 share/regions/config_800.xml
 create mode 100644 share/regions/config_801.xml
 create mode 100644 share/regions/config_802.xml
 create mode 100644 share/regions/config_803.xml
 create mode 100644 share/regions/config_804.xml
 create mode 100644 share/regions/config_805.xml
 create mode 100644 share/regions/config_806.xml
 create mode 100644 share/regions/config_807.xml
 create mode 100644 share/regions/config_808.xml
 create mode 100644 share/regions/config_809.xml
 create mode 100644 share/regions/config_81.xml
 create mode 100644 share/regions/config_810.xml
 create mode 100644 share/regions/config_811.xml
 create mode 100644 share/regions/config_812.xml
 create mode 100644 share/regions/config_813.xml
 create mode 100644 share/regions/config_814.xml
 create mode 100644 share/regions/config_815.xml
 create mode 100644 share/regions/config_816.xml
 create mode 100644 share/regions/config_817.xml
 create mode 100644 share/regions/config_818.xml
 create mode 100644 share/regions/config_819.xml
 create mode 100644 share/regions/config_82.xml
 create mode 100644 share/regions/config_820.xml
 create mode 100644 share/regions/config_821.xml
 create mode 100644 share/regions/config_822.xml
 create mode 100644 share/regions/config_823.xml
 create mode 100644 share/regions/config_824.xml
 create mode 100644 share/regions/config_825.xml
 create mode 100644 share/regions/config_826.xml
 create mode 100644 share/regions/config_827.xml
 create mode 100644 share/regions/config_828.xml
 create mode 100644 share/regions/config_829.xml
 create mode 100644 share/regions/config_83.xml
 create mode 100644 share/regions/config_830.xml
 create mode 100644 share/regions/config_831.xml
 create mode 100644 share/regions/config_832.xml
 create mode 100644 share/regions/config_833.xml
 create mode 100644 share/regions/config_834.xml
 create mode 100644 share/regions/config_835.xml
 create mode 100644 share/regions/config_836.xml
 create mode 100644 share/regions/config_837.xml
 create mode 100644 share/regions/config_838.xml
 create mode 100644 share/regions/config_839.xml
 create mode 100644 share/regions/config_84.xml
 create mode 100644 share/regions/config_840.xml
 create mode 100644 share/regions/config_841.xml
 create mode 100644 share/regions/config_842.xml
 create mode 100644 share/regions/config_843.xml
 create mode 100644 share/regions/config_844.xml
 create mode 100644 share/regions/config_845.xml
 create mode 100644 share/regions/config_846.xml
 create mode 100644 share/regions/config_847.xml
 create mode 100644 share/regions/config_848.xml
 create mode 100644 share/regions/config_849.xml
 create mode 100644 share/regions/config_85.xml
 create mode 100644 share/regions/config_850.xml
 create mode 100644 share/regions/config_851.xml
 create mode 100644 share/regions/config_852.xml
 create mode 100644 share/regions/config_853.xml
 create mode 100644 share/regions/config_854.xml
 create mode 100644 share/regions/config_855.xml
 create mode 100644 share/regions/config_856.xml
 create mode 100644 share/regions/config_857.xml
 create mode 100644 share/regions/config_858.xml
 create mode 100644 share/regions/config_859.xml
 create mode 100644 share/regions/config_86.xml
 create mode 100644 share/regions/config_860.xml
 create mode 100644 share/regions/config_861.xml
 create mode 100644 share/regions/config_862.xml
 create mode 100644 share/regions/config_863.xml
 create mode 100644 share/regions/config_864.xml
 create mode 100644 share/regions/config_865.xml
 create mode 100644 share/regions/config_866.xml
 create mode 100644 share/regions/config_867.xml
 create mode 100644 share/regions/config_868.xml
 create mode 100644 share/regions/config_869.xml
 create mode 100644 share/regions/config_87.xml
 create mode 100644 share/regions/config_870.xml
 create mode 100644 share/regions/config_871.xml
 create mode 100644 share/regions/config_872.xml
 create mode 100644 share/regions/config_873.xml
 create mode 100644 share/regions/config_874.xml
 create mode 100644 share/regions/config_875.xml
 create mode 100644 share/regions/config_876.xml
 create mode 100644 share/regions/config_877.xml
 create mode 100644 share/regions/config_878.xml
 create mode 100644 share/regions/config_879.xml
 create mode 100644 share/regions/config_88.xml
 create mode 100644 share/regions/config_880.xml
 create mode 100644 share/regions/config_881.xml
 create mode 100644 share/regions/config_882.xml
 create mode 100644 share/regions/config_883.xml
 create mode 100644 share/regions/config_884.xml
 create mode 100644 share/regions/config_885.xml
 create mode 100644 share/regions/config_886.xml
 create mode 100644 share/regions/config_887.xml
 create mode 100644 share/regions/config_888.xml
 create mode 100644 share/regions/config_889.xml
 create mode 100644 share/regions/config_89.xml
 create mode 100644 share/regions/config_890.xml
 create mode 100644 share/regions/config_891.xml
 create mode 100644 share/regions/config_892.xml
 create mode 100644 share/regions/config_893.xml
 create mode 100644 share/regions/config_894.xml
 create mode 100644 share/regions/config_895.xml
 create mode 100644 share/regions/config_896.xml
 create mode 100644 share/regions/config_897.xml
 create mode 100644 share/regions/config_898.xml
 create mode 100644 share/regions/config_899.xml
 create mode 100644 share/regions/config_9.xml
 create mode 100644 share/regions/config_90.xml
 create mode 100644 share/regions/config_900.xml
 create mode 100644 share/regions/config_901.xml
 create mode 100644 share/regions/config_902.xml
 create mode 100644 share/regions/config_903.xml
 create mode 100644 share/regions/config_904.xml
 create mode 100644 share/regions/config_905.xml
 create mode 100644 share/regions/config_906.xml
 create mode 100644 share/regions/config_907.xml
 create mode 100644 share/regions/config_908.xml
 create mode 100644 share/regions/config_909.xml
 create mode 100644 share/regions/config_91.xml
 create mode 100644 share/regions/config_910.xml
 create mode 100644 share/regions/config_911.xml
 create mode 100644 share/regions/config_912.xml
 create mode 100644 share/regions/config_913.xml
 create mode 100644 share/regions/config_914.xml
 create mode 100644 share/regions/config_915.xml
 create mode 100644 share/regions/config_916.xml
 create mode 100644 share/regions/config_917.xml
 create mode 100644 share/regions/config_918.xml
 create mode 100644 share/regions/config_919.xml
 create mode 100644 share/regions/config_92.xml
 create mode 100644 share/regions/config_920.xml
 create mode 100644 share/regions/config_921.xml
 create mode 100644 share/regions/config_922.xml
 create mode 100644 share/regions/config_923.xml
 create mode 100644 share/regions/config_924.xml
 create mode 100644 share/regions/config_925.xml
 create mode 100644 share/regions/config_926.xml
 create mode 100644 share/regions/config_927.xml
 create mode 100644 share/regions/config_928.xml
 create mode 100644 share/regions/config_929.xml
 create mode 100644 share/regions/config_93.xml
 create mode 100644 share/regions/config_930.xml
 create mode 100644 share/regions/config_931.xml
 create mode 100644 share/regions/config_932.xml
 create mode 100644 share/regions/config_933.xml
 create mode 100644 share/regions/config_934.xml
 create mode 100644 share/regions/config_935.xml
 create mode 100644 share/regions/config_936.xml
 create mode 100644 share/regions/config_937.xml
 create mode 100644 share/regions/config_938.xml
 create mode 100644 share/regions/config_939.xml
 create mode 100644 share/regions/config_94.xml
 create mode 100644 share/regions/config_940.xml
 create mode 100644 share/regions/config_941.xml
 create mode 100644 share/regions/config_942.xml
 create mode 100644 share/regions/config_943.xml
 create mode 100644 share/regions/config_944.xml
 create mode 100644 share/regions/config_945.xml
 create mode 100644 share/regions/config_946.xml
 create mode 100644 share/regions/config_947.xml
 create mode 100644 share/regions/config_948.xml
 create mode 100644 share/regions/config_949.xml
 create mode 100644 share/regions/config_95.xml
 create mode 100644 share/regions/config_950.xml
 create mode 100644 share/regions/config_951.xml
 create mode 100644 share/regions/config_952.xml
 create mode 100644 share/regions/config_953.xml
 create mode 100644 share/regions/config_954.xml
 create mode 100644 share/regions/config_955.xml
 create mode 100644 share/regions/config_956.xml
 create mode 100644 share/regions/config_957.xml
 create mode 100644 share/regions/config_958.xml
 create mode 100644 share/regions/config_959.xml
 create mode 100644 share/regions/config_96.xml
 create mode 100644 share/regions/config_960.xml
 create mode 100644 share/regions/config_961.xml
 create mode 100644 share/regions/config_962.xml
 create mode 100644 share/regions/config_963.xml
 create mode 100644 share/regions/config_964.xml
 create mode 100644 share/regions/config_965.xml
 create mode 100644 share/regions/config_966.xml
 create mode 100644 share/regions/config_967.xml
 create mode 100644 share/regions/config_968.xml
 create mode 100644 share/regions/config_969.xml
 create mode 100644 share/regions/config_97.xml
 create mode 100644 share/regions/config_970.xml
 create mode 100644 share/regions/config_971.xml
 create mode 100644 share/regions/config_972.xml
 create mode 100644 share/regions/config_973.xml
 create mode 100644 share/regions/config_974.xml
 create mode 100644 share/regions/config_975.xml
 create mode 100644 share/regions/config_976.xml
 create mode 100644 share/regions/config_977.xml
 create mode 100644 share/regions/config_978.xml
 create mode 100644 share/regions/config_979.xml
 create mode 100644 share/regions/config_98.xml
 create mode 100644 share/regions/config_980.xml
 create mode 100644 share/regions/config_981.xml
 create mode 100644 share/regions/config_982.xml
 create mode 100644 share/regions/config_983.xml
 create mode 100644 share/regions/config_984.xml
 create mode 100644 share/regions/config_985.xml
 create mode 100644 share/regions/config_986.xml
 create mode 100644 share/regions/config_987.xml
 create mode 100644 share/regions/config_988.xml
 create mode 100644 share/regions/config_989.xml
 create mode 100644 share/regions/config_99.xml
 create mode 100644 share/regions/config_990.xml
 create mode 100644 share/regions/config_991.xml
 create mode 100644 share/regions/config_992.xml
 create mode 100644 share/regions/config_993.xml
 create mode 100644 share/regions/config_994.xml
 create mode 100644 share/regions/config_995.xml
 create mode 100644 share/regions/config_996.xml
 create mode 100644 share/regions/config_997.xml
 create mode 100644 share/regions/config_998.xml
 create mode 100644 share/regions/config_999.xml
 create mode 100644 share/sql/mysql-agents.sql
 create mode 100644 share/sql/mysql-inventoryfolders.sql
 create mode 100644 share/sql/mysql-inventoryitems.sql
 create mode 100644 share/sql/mysql-logs.sql
 create mode 100644 share/sql/mysql-regions.sql
 create mode 100644 share/sql/mysql-reservations.txt
 create mode 100644 share/sql/mysql-users.sql

diff --git a/OpenGridServices.sln b/OpenGridServices.sln
new file mode 100644
index 0000000..2a6079e
--- /dev/null
+++ b/OpenGridServices.sln
@@ -0,0 +1,95 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.MSSQL", "OpenSim\Framework\Data.MSSQL\OpenSim.Framework.Data.MSSQL.csproj", "{17F7F694-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.MySQL", "OpenSim\Framework\Data.MySQL\OpenSim.Framework.Data.MySQL.csproj", "{17F7F6BE-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.SQLite", "OpenSim\Framework\Data.SQLite\OpenSim.Framework.Data.SQLite.csproj", "{6ECC56A9-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.UserManagement", "OpenSim\Framework\UserManager\OpenSim.Framework.UserManagement.csproj", "{586E2916-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.AssetServer", "OpenSim\Grid\AssetServer\OpenSim.Grid.AssetServer.csproj", "{E5F1A03B-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.Framework.Manager", "OpenSim\Grid\Framework.Manager\OpenSim.Grid.Framework.Manager.csproj", "{4B7BFD1C-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.GridServer", "OpenSim\Grid\GridServer\OpenSim.Grid.GridServer.csproj", "{60FCC3A6-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.GridServer.Config", "OpenSim\Grid\GridServer.Config\OpenSim.Grid.GridServer.Config.csproj", "{1442B635-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer", "OpenSim\Grid\UserServer\OpenSim.Grid.UserServer.csproj", "{2FC96F92-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
+EndProject
+Global
+  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+    Debug|Any CPU = Debug|Any CPU
+    Release|Any CPU = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(ProjectDependencies) = postSolution
+    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
+    ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
+EndGlobal
diff --git a/OpenSim.FxCop b/OpenSim.FxCop
new file mode 100644
index 0000000..1e2ea2d
--- /dev/null
+++ b/OpenSim.FxCop
@@ -0,0 +1,7241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FxCopProject Version="1.35" Name="OpenSim">
+ <ProjectOptions>
+  <SharedProject>True</SharedProject>
+  <Stylesheet Apply="False">http://www.gotdotnet.com/team/fxcop//xsl/1.35/FxCopReport.xsl</Stylesheet>
+  <SaveMessages>
+   <Project Status="Active, Excluded" NewOnly="False" />
+   <Report Status="Active" NewOnly="False" />
+  </SaveMessages>
+  <ProjectFile Compress="True" DefaultTargetCheck="True" DefaultRuleCheck="True" SaveByRuleGroup="" Deterministic="True" />
+  <EnableMultithreadedLoad>True</EnableMultithreadedLoad>
+  <EnableMultithreadedAnalysis>True</EnableMultithreadedAnalysis>
+  <SourceLookup>True</SourceLookup>
+  <AnalysisExceptionsThreshold>10</AnalysisExceptionsThreshold>
+  <RuleExceptionsThreshold>1</RuleExceptionsThreshold>
+  <Spelling Locale="en-us" />
+  <VersionAware>False</VersionAware>
+  <OverrideRuleVisibilities>False</OverrideRuleVisibilities>
+  <CustomDictionaries SearchFxCopDir="True" SearchUserProfile="True" SearchProjectDir="True" />
+  <SearchGlobalAssemblyCache>False</SearchGlobalAssemblyCache>
+  <DeadlockDetectionTimeout>120</DeadlockDetectionTimeout>
+ </ProjectOptions>
+ <Targets>
+  <AssemblyReferenceDirectories>
+   <Directory>$(ProjectDir)/lib/</Directory>
+  </AssemblyReferenceDirectories>
+  <Target Name="$(ProjectDir)/bin/OpenGridServices.ServerConsole.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/OpenSim.Config.SimConfigDb4o.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/OpenSim.exe" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/OpenSim.Framework.Console.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/OpenSim.Framework.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/OpenSim.GridInterfaces.Local.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/OpenSim.GridInterfaces.Remote.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/OpenSim.Physics.Manager.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/OpenSim.RegionServer.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/OpenSim.Storage.LocalStorageDb4o.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.BasicPhysicsPlugin.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.OdePlugin.dll" Analyze="True" AnalyzeAllChildren="True" />
+  <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.PhysXPlugin.dll" Analyze="True" AnalyzeAllChildren="True" />
+ </Targets>
+ <Rules>
+  <RuleFiles>
+   <RuleFile Name="$(FxCopDir)\Rules\DesignRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\GlobalizationRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\InteroperabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\MobilityRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\NamingRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\PerformanceRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\PortabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\SecurityRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\UsageRules.dll" Enabled="True" AllRulesEnabled="True" />
+  </RuleFiles>
+  <Groups />
+  <Settings />
+ </Rules>
+ <FxCopReport Version="1.35">
+  <Namespaces>
+   <Namespace Name="OpenSim">
+    <Messages>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Assets">
+    <Messages>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Assets</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.CAPS">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.CAPS</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.CAPS</Item>
+      </Issue>
+     </Message>
+     <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>OpenSim.CAPS</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Config.SimConfigDb4o">
+    <Messages>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Config.SimConfigDb4o</Item>
+      </Issue>
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Config.SimConfigDb4o</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Framework.Assets">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.Framework.Assets</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Framework.Assets</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Framework.Console">
+    <Messages>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Framework.Console</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Framework.Grid">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.Framework.Grid</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Framework.Grid</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Framework.Interfaces">
+    <Messages>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Framework.Interfaces</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Framework.Inventory">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.Framework.Inventory</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Framework.Inventory</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Framework.Sims">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.Framework.Sims</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Framework.Sims</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Framework.Terrain">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.Framework.Terrain</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Framework.Terrain</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Framework.User">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.Framework.User</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Framework.User</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Framework.Utilities">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.Framework.Utilities</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Framework.Utilities</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.GridInterfaces.Local">
+    <Messages>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.GridInterfaces.Local</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.GridInterfaces.Remote">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.GridInterfaces.Remote</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.GridInterfaces.Remote</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Physics.BasicPhysicsPlugin">
+    <Messages>
+     <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Plugin</Item>
+       <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Physics.Manager">
+    <Messages>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Physics.Manager</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Physics.OdePlugin">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.Physics.OdePlugin</Item>
+      </Issue>
+     </Message>
+     <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Plugin</Item>
+       <Item>OpenSim.Physics.OdePlugin</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Physics.OdePlugin</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Physics.PhysXPlugin">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.Physics.PhysXPlugin</Item>
+      </Issue>
+     </Message>
+     <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Plugin</Item>
+       <Item>OpenSim.Physics.PhysXPlugin</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Physics.PhysXPlugin</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.Storage.LocalStorageDb4o">
+    <Messages>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.Storage.LocalStorageDb4o</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.types">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.types</Item>
+      </Issue>
+     </Message>
+     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>OpenSim.types</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.types</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.UserServer">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.UserServer</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.UserServer</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.world">
+    <Messages>
+     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>OpenSim.world</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.world</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="OpenSim.world.scripting">
+    <Messages>
+     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2007-03-27 04:29:04Z">
+      <Issue>
+       <Item>OpenSim.world.scripting</Item>
+      </Issue>
+     </Message>
+     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>OpenSim.world.scripting</Item>
+      </Issue>
+      <Issue Name="Namespace">
+       <Item>OpenSim.world.scripting</Item>
+      </Issue>
+     </Message>
+     <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+      <Issue Name="Namespace">
+       <Item>Sim</Item>
+       <Item>OpenSim.world.scripting</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+  </Namespaces>
+  <Targets>
+   <Target Name="$(ProjectDir)/bin/OpenGridServices.ServerConsole.dll">
+    <Modules>
+     <Module Name="opengridservices.serverconsole.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenGridServices.ServerConsole</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenGridServices.ServerConsole</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenGridServices.ServerConsole</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="ServerConsole">
+        <Types>
+         <Type Name="conscmd_callback">
+          <Messages>
+           <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>conscmd_callback</Item>
+            </Issue>
+           </Message>
+           <Message Id="conscmd" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>conscmd</Item>
+             <Item>ServerConsole.conscmd_callback</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>conscmd_callback</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="RunCmd(System.String,System.String[]):System.Void">
+            <Messages>
+             <Message Id="1#cmdparams" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>conscmd_callback.RunCmd(String, String[]):Void</Item>
+               <Item>cmdparams</Item>
+               <Item>cmdparams</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Show(System.String):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ShowWhat</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ConsoleBase">
+          <Members>
+           <Member Name="CmdPrompt(System.String,System.String):System.String">
+            <Messages>
+             <Message Id="1#defaultresponse" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ConsoleBase.CmdPrompt(String, String):String</Item>
+               <Item>defaultresponse</Item>
+               <Item>defaultresponse</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CmdPrompt(System.String,System.String,System.String,System.String):System.String">
+            <Messages>
+             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>OptionA</Item>
+              </Issue>
+             </Message>
+             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>OptionB</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#defaultresponse" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ConsoleBase.CmdPrompt(String, String, String, String):String</Item>
+               <Item>defaultresponse</Item>
+               <Item>defaultresponse</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PasswdPrompt(System.String):System.String">
+            <Messages>
+             <Message Id="Passwd" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Passwd</Item>
+               <Item>ConsoleBase.PasswdPrompt(String):String</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RunCmd(System.String,System.String[]):System.Object">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>Cmd</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#cmdparams" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ConsoleBase.RunCmd(String, String[]):Object</Item>
+               <Item>cmdparams</Item>
+               <Item>cmdparams</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ShowCommands(System.String):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ShowWhat</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Write(System.String):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>Line</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="WriteLine(System.String):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>Line</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ConsoleBase+ConsoleType">
+          <Members>
+           <Member Name="SimChat">
+            <Messages>
+             <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Sim</Item>
+               <Item>ConsoleType.SimChat</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="TCP">
+            <Messages>
+             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>ConsoleType.TCP</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="MainConsole">
+          <Messages>
+           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>MainConsole</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/OpenSim.Config.SimConfigDb4o.dll">
+    <Modules>
+     <Module Name="opensim.config.simconfigdb4o.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.Config.SimConfigDb4o</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.Config.SimConfigDb4o</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.Config.SimConfigDb4o</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.Config.SimConfigDb4o">
+        <Types>
+         <Type Name="Db40ConfigPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.Config.SimConfigDb4o.Db40ConfigPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="DbSimConfig">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.Config.SimConfigDb4o.DbSimConfig</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Db</Item>
+             <Item>OpenSim.Config.SimConfigDb4o.DbSimConfig</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="InitConfig(System.Boolean):System.Void">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>DbSimConfig.InitConfig(Boolean):Void</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.UInt32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>DbSimConfig.InitConfig(Boolean):Void</Item>
+               <Item>System.UInt32.ToString</Item>
+               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.UInt64.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>DbSimConfig.InitConfig(Boolean):Void</Item>
+               <Item>System.UInt64.ToString</Item>
+               <Item>System.UInt64.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadDefaults():System.Void">
+            <Messages>
+             <Message Id="System.Convert.ToInt32(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>DbSimConfig.LoadDefaults():Void</Item>
+               <Item>System.Convert.ToInt32(System.String)</Item>
+               <Item>System.Convert.ToInt32(System.String,System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>DbSimConfig.LoadDefaults():Void</Item>
+               <Item>System.Convert.ToInt32(System.String)</Item>
+               <Item>System.Convert.ToInt32(System.String,System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>DbSimConfig.LoadDefaults():Void</Item>
+               <Item>System.Convert.ToInt32(System.String)</Item>
+               <Item>System.Convert.ToInt32(System.String,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="MapStorage">
+          <Members>
+           <Member Name="Map">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Map</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/OpenSim.exe">
+    <Modules>
+     <Module Name="opensim.exe">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithAssemblyVersion" Category="Microsoft.Design" CheckId="CA1016" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithComVisible" Category="Microsoft.Design" CheckId="CA1017" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttribute" Level="CriticalError">
+         <Item>OpenSim</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim">
+        <Types>
+         <Type Name="RegionServer">
+          <Members>
+           <Member Name="Main(System.String[]):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'args'</Item>
+               <Item>RegionServer.Main(String[]):Void</Item>
+              </Issue>
+              <Issue>
+               <Item>'args'</Item>
+               <Item>RegionServer.Main(String[]):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/OpenSim.Framework.Console.dll">
+    <Modules>
+     <Module Name="opensim.framework.console.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.Framework.Console</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.Framework.Console</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.Framework.Console</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.Framework.Console">
+        <Types>
+         <Type Name="ConsoleBase">
+          <Members>
+           <Member Name="CmdPrompt(System.String,System.String):System.String">
+            <Messages>
+             <Message Id="1#defaultresponse" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ConsoleBase.CmdPrompt(String, String):String</Item>
+               <Item>defaultresponse</Item>
+               <Item>defaultresponse</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CmdPrompt(System.String,System.String,System.String,System.String):System.String">
+            <Messages>
+             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>OptionA</Item>
+              </Issue>
+             </Message>
+             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>OptionB</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#defaultresponse" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ConsoleBase.CmdPrompt(String, String, String, String):String</Item>
+               <Item>defaultresponse</Item>
+               <Item>defaultresponse</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RunCmd(System.String,System.String[]):System.Object">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>Cmd</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#cmdparams" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ConsoleBase.RunCmd(String, String[]):Object</Item>
+               <Item>cmdparams</Item>
+               <Item>cmdparams</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ShowCommands(System.String):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ShowWhat</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ConsoleBase+ConsoleType">
+          <Members>
+           <Member Name="SimChat">
+            <Messages>
+             <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Sim</Item>
+               <Item>ConsoleType.SimChat</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="TCP">
+            <Messages>
+             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>ConsoleType.TCP</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="MainConsole">
+          <Messages>
+           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>MainConsole</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/OpenSim.Framework.dll">
+    <Modules>
+     <Module Name="opensim.framework.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.Framework</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.Framework</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.Framework</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.Framework.Assets">
+        <Types>
+         <Type Name="AssetBase">
+          <Members>
+           <Member Name="Data">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Data</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Description">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Description</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="FullID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>FullID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InvType">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>InvType</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Name">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Name</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Type">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Type</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PrimData">
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PrimData.PrimData()</Item>
+               <Item>ParentID</Item>
+               <Item>System.UInt32</Item>
+               <Item>0</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="FullID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>FullID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LocalID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LocalID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="OwnerID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OwnerID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ParentID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ParentID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathBegin">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathBegin</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathCurve">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathCurve</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathEnd">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathEnd</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathRadiusOffset">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathRadiusOffset</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathRevolutions">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathRevolutions</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathScaleX">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathScaleX</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathScaleY">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathScaleY</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathShearX">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathShearX</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathShearY">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathShearY</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathSkew">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathSkew</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathTaperX">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathTaperX</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathTaperY">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathTaperY</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathTwist">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathTwist</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PathTwistBegin">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PathTwistBegin</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PCode">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PCode</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Position">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Position</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ProfileBegin">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ProfileBegin</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ProfileCurve">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ProfileCurve</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ProfileEnd">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ProfileEnd</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ProfileHollow">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ProfileHollow</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Rotation">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Rotation</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Scale">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Scale</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Texture">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Texture</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.Framework.Grid">
+        <Types>
+         <Type Name="LoginService">
+          <Messages>
+           <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Login</Item>
+             <Item>LoginService</Item>
+             <Item>LogOn</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.Framework.Interfaces">
+        <Types>
+         <Type Name="AgentCircuitData">
+          <Members>
+           <Member Name="AgentID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AgentID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="circuitcode">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>circuitcode</Item>
+              </Issue>
+             </Message>
+             <Message Id="circuitcode" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>circuitcode</Item>
+               <Item>AgentCircuitData.circuitcode</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="firstname">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>firstname</Item>
+              </Issue>
+             </Message>
+             <Message Id="firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>firstname</Item>
+               <Item>AgentCircuitData.firstname</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="lastname">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>lastname</Item>
+              </Issue>
+             </Message>
+             <Message Id="lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>lastname</Item>
+               <Item>AgentCircuitData.lastname</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SecureSessionID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SecureSessionID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SessionID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SessionID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ARequest">
+          <Messages>
+           <Message TypeName="OverrideEqualsAndOperatorEqualsOnValueTypes" Category="Microsoft.Performance" CheckId="CA1815" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Equals">
+             <Item>OpenSim.Framework.Interfaces.ARequest</Item>
+            </Issue>
+            <Issue Name="op_Equality">
+             <Item>OpenSim.Framework.Interfaces.ARequest</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="AssetID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="IsTexture">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>IsTexture</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AuthenticateResponse">
+          <Members>
+           <Member Name="Authorised">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Authorised</Item>
+              </Issue>
+             </Message>
+             <Message Id="Authorised" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Authorised</Item>
+               <Item>AuthenticateResponse.Authorised</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoginInfo">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginInfo</Item>
+              </Issue>
+             </Message>
+             <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Login</Item>
+               <Item>LoginInfo</Item>
+               <Item>LogOn</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IAssetPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.Framework.Interfaces.IAssetPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="GetAssetServer():OpenSim.Framework.Interfaces.IAssetServer">
+            <Messages>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
+              <Issue Certainty="50">
+               <Item>GetAssetServer</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IAssetReceiver">
+          <Members>
+           <Member Name="AssetReceived(OpenSim.Framework.Assets.AssetBase,System.Boolean):System.Void">
+            <Messages>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>IsTexture</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IAssetServer">
+          <Members>
+           <Member Name="RequestAsset(libsecondlife.LLUUID,System.Boolean):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>assetID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetServerInfo(System.String,System.String):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ServerUrl</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ServerKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ServerUrl</Item>
+               <Item>IAssetServer.SetServerInfo(String, String):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IGridPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.Framework.Interfaces.IGridPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="GetGridServer():OpenSim.Framework.Interfaces.IGridServer">
+            <Messages>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
+              <Issue Certainty="50">
+               <Item>GetGridServer</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IGridServer">
+          <Members>
+           <Member Name="AuthenticateSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):OpenSim.Framework.Interfaces.AuthenticateResponse">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>sessionID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>agentID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetName():System.String">
+            <Messages>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
+              <Issue Certainty="50">
+               <Item>GetName</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>sessionID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>agentID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Logout</Item>
+               <Item>LogoutSession</Item>
+               <Item>LogOff</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RequestNeighbours():OpenSim.Framework.Interfaces.NeighbourInfo[]">
+            <Messages>
+             <Message Id="Neighbours" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Neighbours</Item>
+               <Item>IGridServer.RequestNeighbours():NeighbourInfo[]</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RequestUUIDBlock():OpenSim.Framework.Interfaces.UUIDBlock">
+            <Messages>
+             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>IGridServer.RequestUUIDBlock():UUIDBlock</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetServerInfo(System.String,System.String,System.String):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ServerUrl</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SendKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>RecvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>IGridServer.SetServerInfo(String, String, String):Void</Item>
+               <Item>Recv</Item>
+               <Item>RecvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ServerUrl</Item>
+               <Item>IGridServer.SetServerInfo(String, String, String):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ILocalStorage">
+          <Members>
+           <Member Name="RemovePrim(libsecondlife.LLUUID):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>primID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ShutDown():System.Void">
+            <Messages>
+             <Message Id="ShutDown" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ShouldBeDiscreteTerm">
+               <Item>ShutDown</Item>
+               <Item>method</Item>
+               <Item>ShutDown</Item>
+               <Item>Shutdown</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ISimConfig">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.Framework.Interfaces.ISimConfig</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="GetConfigObject():OpenSim.Framework.Interfaces.SimConfig">
+            <Messages>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
+              <Issue Certainty="50">
+               <Item>GetConfigObject</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IUserServer">
+          <Members>
+           <Member Name="RequestAgentsInventory(libsecondlife.LLUUID):OpenSim.Framework.Inventory.AgentInventory">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>agentID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetServerInfo(System.String,System.String,System.String):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ServerUrl</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SendKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>RecvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>IUserServer.SetServerInfo(String, String, String):Void</Item>
+               <Item>Recv</Item>
+               <Item>RecvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ServerUrl</Item>
+               <Item>IUserServer.SetServerInfo(String, String, String):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="LocalGridBase">
+          <Members>
+           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
+            <Messages>
+             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Logout</Item>
+               <Item>LogoutSession</Item>
+               <Item>LogOff</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Login">
+          <Messages>
+           <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Login</Item>
+             <Item>Login</Item>
+             <Item>LogOn</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="Agent">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Agent</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="BaseFolder">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>BaseFolder</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="First">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>First</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InventoryFolder">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>InventoryFolder</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Last">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Last</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SecureSession">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SecureSession</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Session">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Session</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="NeighbourInfo">
+          <Messages>
+           <Message Id="Neighbour" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Neighbour</Item>
+             <Item>OpenSim.Framework.Interfaces.NeighbourInfo</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="regionhandle">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>regionhandle</Item>
+              </Issue>
+             </Message>
+             <Message Id="regionhandle" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>regionhandle</Item>
+               <Item>NeighbourInfo.regionhandle</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RegionLocX">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RegionLocX</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RegionLocY">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RegionLocY</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="sim_ip">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>sim_ip</Item>
+              </Issue>
+             </Message>
+             <Message Id="sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>sim</Item>
+               <Item>NeighbourInfo.sim_ip</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>sim_ip</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="sim_port">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>sim_port</Item>
+              </Issue>
+             </Message>
+             <Message Id="sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>sim</Item>
+               <Item>NeighbourInfo.sim_port</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>sim_port</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="RemoteGridBase">
+          <Members>
+           <Member Name="agentcircuits">
+            <Messages>
+             <Message TypeName="CollectionPropertiesShouldBeReadOnly" Category="Microsoft.Usage" CheckId="CA2227" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>agentcircuits</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>agentcircuits</Item>
+              </Issue>
+             </Message>
+             <Message Id="agentcircuits" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>agentcircuits</Item>
+               <Item>RemoteGridBase.agentcircuits:Dictionary`2&lt;System.UInt32,OpenSim.Framework.Interfaces.AgentCircuitData&gt;</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
+            <Messages>
+             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Logout</Item>
+               <Item>LogoutSession</Item>
+               <Item>LogOff</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SimConfig">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.Framework.Interfaces.SimConfig</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="AssetSendKey">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetSendKey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AssetURL">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetURL</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridRecvKey">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GridRecvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Recv</Item>
+               <Item>SimConfig.GridRecvKey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridSendKey">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GridSendKey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridURL">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GridURL</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="IPListenAddr">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>IPListenAddr</Item>
+              </Issue>
+             </Message>
+             <Message Id="Addr" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Addr</Item>
+               <Item>SimConfig.IPListenAddr</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="IPListenPort">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>IPListenPort</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RegionHandle">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RegionHandle</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RegionLocX">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RegionLocX</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RegionLocY">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RegionLocY</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RegionName">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RegionName</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SaveMap(System.Single[]):System.Void">
+            <Messages>
+             <Message Id="0#heightmap" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SimConfig.SaveMap(Single[]):Void</Item>
+               <Item>heightmap</Item>
+               <Item>heightmap</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UserRecvKey">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserRecvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Recv</Item>
+               <Item>SimConfig.UserRecvKey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UserSendKey">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserSendKey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UserURL">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserURL</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="UUIDBlock">
+          <Messages>
+           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>UUIDBlock</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OverrideEqualsAndOperatorEqualsOnValueTypes" Category="Microsoft.Performance" CheckId="CA1815" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Equals">
+             <Item>OpenSim.Framework.Interfaces.UUIDBlock</Item>
+            </Issue>
+            <Issue Name="op_Equality">
+             <Item>OpenSim.Framework.Interfaces.UUIDBlock</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="BlockEnd">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>BlockEnd</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="BlockStart">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>BlockStart</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.Framework.Inventory">
+        <Types>
+         <Type Name="AgentInventory">
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotCallOverridableMethodsInConstructors" Category="Microsoft.Usage" CheckId="CA2214" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AgentInventory.AgentInventory()</Item>
+               <Item>&#xD;&#xA;&#xD;&#xA;AgentInventory.AgentInventory()&#xD;&#xA;AgentInventory.Initialise():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AddToInventory(libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):libsecondlife.LLUUID">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>folderID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AgentID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AgentID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CreateNewFolder(libsecondlife.LLUUID,System.UInt16):System.Boolean">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>folderID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Initialise():System.Void">
+            <Messages>
+             <Message Id="Initialise" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Initialise</Item>
+               <Item>AgentInventory.Initialise():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InventoryFolders">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>InventoryFolders</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InventoryItems">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>InventoryItems</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InventoryRoot">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>InventoryRoot</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LastCached">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LastCached</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UpdateItem(libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):System.Boolean">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>itemID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Wearables">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Wearables</Item>
+              </Issue>
+             </Message>
+             <Message Id="Wearables" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Wearables</Item>
+               <Item>AgentInventory.Wearables</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AvatarWearable">
+          <Members>
+           <Member Name="AssetID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ItemID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ItemID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="InventoryFolder">
+          <Members>
+           <Member Name="DefaultType">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>DefaultType</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="FolderID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>FolderID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="FolderName">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>FolderName</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Items">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Items</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>System.Collections.Generic.List`1&lt;OpenSim.Framework.Inventory.InventoryItem&gt;</Item>
+               <Item>InventoryFolder.Items</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="OwnerID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OwnerID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ParentID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ParentID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Version">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Version</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="InventoryItem">
+          <Members>
+           <Member Name="AssetID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CreatorID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>CreatorID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Description">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Description</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="FolderID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>FolderID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InvType">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>InvType</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ItemID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ItemID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Name">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Name</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="OwnerID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OwnerID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Type">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Type</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.Framework.Sims">
+        <Types>
+         <Type Name="SimProfile">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.Framework.Sims.SimProfile</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="LoadFromGrid(System.UInt64,System.String,System.String,System.String):OpenSim.Framework.Sims.SimProfile">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>GridURL</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SendKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>RecvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="3#Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
+               <Item>Recv</Item>
+               <Item>RecvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>region_handle</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>GridURL</Item>
+              </Issue>
+             </Message>
+             <Message Id="RecvKey" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>RecvKey</Item>
+               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Convert.ToUInt16(System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
+               <Item>System.Convert.ToUInt16(System.Object)</Item>
+               <Item>System.Convert.ToUInt16(System.Object,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Convert.ToUInt32(System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
+               <Item>System.Convert.ToUInt32(System.Object)</Item>
+               <Item>System.Convert.ToUInt32(System.Object,System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
+               <Item>System.Convert.ToUInt32(System.Object)</Item>
+               <Item>System.Convert.ToUInt32(System.Object,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Convert.ToUInt64(System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
+               <Item>System.Convert.ToUInt64(System.Object)</Item>
+               <Item>System.Convert.ToUInt64(System.Object,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.UInt64.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimProfile.LoadFromGrid(UInt64, String, String, String):SimProfile</Item>
+               <Item>System.UInt64.ToString</Item>
+               <Item>System.UInt64.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SimProfileBase">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.Framework.Sims.SimProfileBase</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="caps_url">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>caps_url</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>caps_url</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="recvkey">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>recvkey</Item>
+              </Issue>
+             </Message>
+             <Message Id="recvkey" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>recvkey</Item>
+               <Item>SimProfileBase.recvkey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="regionhandle">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>regionhandle</Item>
+              </Issue>
+             </Message>
+             <Message Id="regionhandle" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>regionhandle</Item>
+               <Item>SimProfileBase.regionhandle</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RegionLocX">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RegionLocX</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RegionLocY">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RegionLocY</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="regionname">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>regionname</Item>
+              </Issue>
+             </Message>
+             <Message Id="regionname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>regionname</Item>
+               <Item>SimProfileBase.regionname</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="sendkey">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>sendkey</Item>
+              </Issue>
+             </Message>
+             <Message Id="sendkey" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>sendkey</Item>
+               <Item>SimProfileBase.sendkey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="sim_ip">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>sim_ip</Item>
+              </Issue>
+             </Message>
+             <Message Id="sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>sim</Item>
+               <Item>SimProfileBase.sim_ip</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>sim_ip</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="sim_port">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>sim_port</Item>
+              </Issue>
+             </Message>
+             <Message Id="sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>sim</Item>
+               <Item>SimProfileBase.sim_port</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>sim_port</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UUID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UUID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.Framework.Terrain">
+        <Types>
+         <Type Name="HeightmapGenHills">
+          <Messages>
+           <Message Id="Heightmap" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Heightmap</Item>
+             <Item>OpenSim.Framework.Terrain.HeightmapGenHills</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="GenerateHeightmap(System.Int32,System.Single,System.Single,System.Boolean):System.Single[]">
+            <Messages>
+             <Message Id="0#num" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>HeightmapGenHills.GenerateHeightmap(Int32, Single, Single, Boolean):Single[]</Item>
+               <Item>num</Item>
+               <Item>numHills</Item>
+              </Issue>
+             </Message>
+             <Message Id="Heightmap" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Heightmap</Item>
+               <Item>HeightmapGenHills.GenerateHeightmap(Int32, Single, Single, Boolean):Single[]</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="NumHills">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>HeightmapGenHills.NumHills</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.Framework.User">
+        <Types>
+         <Type Name="UserProfile">
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserProfile.UserProfile()</Item>
+               <Item>IsGridGod</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AddSimCircuit(System.UInt32,libsecondlife.LLUUID):System.Void">
+            <Messages>
+             <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Sim</Item>
+               <Item>UserProfile.AddSimCircuit(UInt32, LLUUID):Void</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>regionUUID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AssetURL">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetURL</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Circuits">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Circuits</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CurrentSecureSessionID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>CurrentSecureSessionID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CurrentSessionID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>CurrentSessionID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="firstname">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>firstname</Item>
+              </Issue>
+             </Message>
+             <Message Id="firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>firstname</Item>
+               <Item>UserProfile.firstname</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="homelookat">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>homelookat</Item>
+              </Issue>
+             </Message>
+             <Message Id="homelookat" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>homelookat</Item>
+               <Item>UserProfile.homelookat</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="homepos">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>homepos</Item>
+              </Issue>
+             </Message>
+             <Message Id="homepos" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>homepos</Item>
+               <Item>UserProfile.homepos</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="homeregionhandle">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>homeregionhandle</Item>
+              </Issue>
+             </Message>
+             <Message Id="homeregionhandle" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>homeregionhandle</Item>
+               <Item>UserProfile.homeregionhandle</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Inventory">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Inventory</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="IsGridGod">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>IsGridGod</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="IsLocal">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>IsLocal</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="lastname">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>lastname</Item>
+              </Issue>
+             </Message>
+             <Message Id="lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>lastname</Item>
+               <Item>UserProfile.lastname</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="MD5passwd">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>MD5passwd</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UUID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UUID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="UserProfileManager">
+          <Members>
+           <Member Name="CustomiseResponse(System.Collections.Hashtable&amp;,OpenSim.Framework.User.UserProfile):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="DoNotPassTypesByReference" Category="Microsoft.Design" CheckId="CA1045" Created="2007-03-27 04:29:04Z">
+              <Issue Level="CriticalWarning">
+               <Item>response</Item>
+              </Issue>
+             </Message>
+             <Message Id="Customise" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Customise</Item>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+              </Issue>
+             </Message>
+             <Message Id="GridResp" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>GridResp</Item>
+               <Item>Nwc.XmlRpc.XmlRpcResponse</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Single.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.UInt32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.UInt32.ToString</Item>
+               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.UInt32.ToString</Item>
+               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="DefaultStartupMsg">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>DefaultStartupMsg</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridRecvKey">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GridRecvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="Recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Recv</Item>
+               <Item>UserProfileManager.GridRecvKey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridSendKey">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GridSendKey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridURL">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GridURL</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ParseXMLRPC(System.String):System.String">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Int32.ToString</Item>
+               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Int32.ToString</Item>
+               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Single.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>UserProfileManager.ParseXMLRPC(String):String</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetKeys(System.String,System.String,System.String,System.String):System.Void">
+            <Messages>
+             <Message Id="1#recv" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>UserProfileManager.SetKeys(String, String, String, String):Void</Item>
+               <Item>recv</Item>
+               <Item>recvKey</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>url</Item>
+               <Item>UserProfileManager.SetKeys(String, String, String, String):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="UserProfileManagerBase">
+          <Members>
+           <Member Name="AuthenticateUser(System.String,System.String,System.String):System.Boolean">
+            <Messages>
+             <Message Id="0#firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>UserProfileManagerBase.AuthenticateUser(String, String, String):Boolean</Item>
+               <Item>firstname</Item>
+               <Item>firstname</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>UserProfileManagerBase.AuthenticateUser(String, String, String):Boolean</Item>
+               <Item>lastname</Item>
+               <Item>lastname</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#passwd" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>UserProfileManagerBase.AuthenticateUser(String, String, String):Boolean</Item>
+               <Item>passwd</Item>
+               <Item>passwd</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CreateNewProfile(System.String,System.String,System.String):OpenSim.Framework.User.UserProfile">
+            <Messages>
+             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>MD5passwd</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>UserProfileManagerBase.CreateNewProfile(String, String, String):UserProfile</Item>
+               <Item>firstname</Item>
+               <Item>firstname</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>UserProfileManagerBase.CreateNewProfile(String, String, String):UserProfile</Item>
+               <Item>lastname</Item>
+               <Item>lastname</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#M" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>UserProfileManagerBase.CreateNewProfile(String, String, String):UserProfile</Item>
+               <Item>M</Item>
+               <Item>MD5passwd</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetProfileByLLUUID(libsecondlife.LLUUID):OpenSim.Framework.User.UserProfile">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ProfileLLUUID</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ProfileLLUUID</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>UserProfileManagerBase.GetProfileByLLUUID(LLUUID):UserProfile</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetProfileByName(System.String,System.String):OpenSim.Framework.User.UserProfile">
+            <Messages>
+             <Message Id="0#firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>UserProfileManagerBase.GetProfileByName(String, String):UserProfile</Item>
+               <Item>firstname</Item>
+               <Item>firstname</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>UserProfileManagerBase.GetProfileByName(String, String):UserProfile</Item>
+               <Item>lastname</Item>
+               <Item>lastname</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetUsersInventory(libsecondlife.LLUUID):OpenSim.Framework.Inventory.AgentInventory">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>agentID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetGod(libsecondlife.LLUUID):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>GodID</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>GodID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UserProfiles">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UserProfiles</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.Framework.Utilities">
+        <Types>
+         <Type Name="BlockingQueue`1">
+          <Messages>
+           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>OpenSim.Framework.Utilities.BlockingQueue`1</Item>
+             <Item>Queue</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="Util">
+          <Messages>
+           <Message Id="Util" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Util</Item>
+             <Item>OpenSim.Framework.Utilities.Util</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>Util</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>Util</Item>
+             <Item>System.Web.Util</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="GetNextXferID():System.UInt32">
+            <Messages>
+             <Message Id="Xfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Xfer</Item>
+               <Item>Util.GetNextXferID():UInt32</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="MemberId">
+               <Item>Util.GetNextXferID():UInt32</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GetNextXferID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UIntsToLong(System.UInt32,System.UInt32):System.UInt64">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>X</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>Y</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>Util.UIntsToLong(UInt32, UInt32):UInt64</Item>
+               <Item>X</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>Util.UIntsToLong(UInt32, UInt32):UInt64</Item>
+               <Item>Y</Item>
+              </Issue>
+             </Message>
+             <Message Id="Ints" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Ints</Item>
+               <Item>Util.UIntsToLong(UInt32, UInt32):UInt64</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/OpenSim.GridInterfaces.Local.dll">
+    <Modules>
+     <Module Name="opensim.gridinterfaces.local.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.GridInterfaces.Local</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.GridInterfaces.Local</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.GridInterfaces.Local</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.GridInterfaces.Local">
+        <Types>
+         <Type Name="AssetStorage">
+          <Members>
+           <Member Name="Data">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Data</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Name">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Name</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Type">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Type</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UUID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UUID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AssetUUIDQuery">
+          <Messages>
+           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>AssetUUIDQuery</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="Match(OpenSim.GridInterfaces.Local.AssetStorage):System.Boolean">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'asset'</Item>
+               <Item>AssetUUIDQuery.Match(AssetStorage):Boolean</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="LocalAssetPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.GridInterfaces.Local.LocalAssetPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="LocalAssetServer">
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LocalAssetServer.LocalAssetServer()</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadAsset(OpenSim.Framework.Assets.AssetBase,System.Boolean,System.String):System.Void">
+            <Messages>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
+              <Issue>
+               <Item>LocalAssetServer.LoadAsset(AssetBase, Boolean, String):Void</Item>
+              </Issue>
+             </Message>
+             <Message Id="image" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
+              <Issue>
+               <Item>image</Item>
+               <Item>LocalAssetServer.LoadAsset(AssetBase, Boolean, String):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UploadNewAsset(OpenSim.Framework.Assets.AssetBase):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'asset'</Item>
+               <Item>LocalAssetServer.UploadNewAsset(AssetBase):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="LocalGridPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.GridInterfaces.Local.LocalGridPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="LocalGridServer">
+          <Members>
+           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
+            <Messages>
+             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Logout</Item>
+               <Item>LogoutSession</Item>
+               <Item>LogOff</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Sessions">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Sessions</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>System.Collections.Generic.List`1&lt;OpenSim.Framework.Interfaces.Login&gt;</Item>
+               <Item>LocalGridServer.Sessions</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/OpenSim.GridInterfaces.Remote.dll">
+    <Modules>
+     <Module Name="opensim.gridinterfaces.remote.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.GridInterfaces.Remote</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.GridInterfaces.Remote</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.GridInterfaces.Remote</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.GridInterfaces.Remote">
+        <Types>
+         <Type Name="RemoteAssetPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.GridInterfaces.Remote.RemoteAssetPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="RemoteGridPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.GridInterfaces.Remote.RemoteGridPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="RemoteGridServer">
+          <Members>
+           <Member Name="agentcircuits">
+            <Messages>
+             <Message TypeName="CollectionPropertiesShouldBeReadOnly" Category="Microsoft.Usage" CheckId="CA2227" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>agentcircuits</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AuthenticateSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):OpenSim.Framework.Interfaces.AuthenticateResponse">
+            <Messages>
+             <Message Id="2#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>circuitcode</Item>
+               <Item>RemoteGridServer.AuthenticateSession(LLUUID, LLUUID, UInt32):AuthenticateResponse</Item>
+               <Item>circuitCode</Item>
+               <Item>IGridServer.AuthenticateSession(LLUUID, LLUUID, UInt32):AuthenticateResponse</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridRecvKey">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RemoteGridServer.GridRecvKey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridSendKey">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RemoteGridServer.GridSendKey</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LogoutSession(libsecondlife.LLUUID,libsecondlife.LLUUID,System.UInt32):System.Boolean">
+            <Messages>
+             <Message TypeName="PassSystemUriObjectsInsteadOfStrings" Category="Microsoft.Usage" CheckId="CA2234" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RemoteGridServer.LogoutSession(LLUUID, LLUUID, UInt32):Boolean</Item>
+               <Item>WebRequest.Create(Uri):WebRequest</Item>
+               <Item>WebRequest.Create(String):WebRequest</Item>
+              </Issue>
+             </Message>
+             <Message Id="GridResponse" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RemoteGridServer.LogoutSession(LLUUID, LLUUID, UInt32):Boolean</Item>
+               <Item>GridResponse</Item>
+               <Item>System.String</Item>
+              </Issue>
+             </Message>
+             <Message Id="Logout" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Logout</Item>
+               <Item>LogoutSession</Item>
+               <Item>LogOff</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'sessionID'</Item>
+               <Item>RemoteGridServer.LogoutSession(LLUUID, LLUUID, UInt32):Boolean</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/OpenSim.Physics.Manager.dll">
+    <Modules>
+     <Module Name="opensim.physics.manager.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.Physics.Manager</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.Physics.Manager</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.Physics.Manager</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.Physics.Manager">
+        <Types>
+         <Type Name="IPhysicsPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.Physics.Manager.IPhysicsPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="GetName():System.String">
+            <Messages>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
+              <Issue Certainty="50">
+               <Item>GetName</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetScene():OpenSim.Physics.Manager.PhysicsScene">
+            <Messages>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2007-03-27 04:29:04Z">
+              <Issue Certainty="50">
+               <Item>GetScene</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="NullPhysicsScene">
+          <Members>
+           <Member Name="SetTerrain(System.Single[]):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'heightMap'</Item>
+               <Item>NullPhysicsScene.SetTerrain(Single[]):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Simulate(System.Single):System.Void">
+            <Messages>
+             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>NullPhysicsScene.Simulate(Single):Void</Item>
+               <Item>System.Int32.ToString</Item>
+               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PhysicsActor">
+          <Members>
+           <Member Name="Kinematic">
+            <Messages>
+             <Message Id="Kinematic" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Kinematic</Item>
+               <Item>PhysicsActor.Kinematic:Boolean</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PhysicsManager">
+          <Members>
+           <Member Name="GetPhysicsScene(System.String):OpenSim.Physics.Manager.PhysicsScene">
+            <Messages>
+             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PhysicsManager.GetPhysicsScene(String):PhysicsScene</Item>
+               <Item>System.String.Format(System.String,System.Object)</Item>
+               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadPlugins():System.Void">
+            <Messages>
+             <Message Id="Plugins" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Plugins</Item>
+               <Item>PhysicsManager.LoadPlugins():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PhysicsVector">
+          <Members>
+           <Member Name=".ctor(System.Single,System.Single,System.Single)">
+            <Messages>
+             <Message Id="0#x" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>PhysicsVector.PhysicsVector(Single, Single, Single)</Item>
+               <Item>x</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>PhysicsVector.PhysicsVector(Single, Single, Single)</Item>
+               <Item>y</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>PhysicsVector.PhysicsVector(Single, Single, Single)</Item>
+               <Item>z</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="X">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>X</Item>
+              </Issue>
+             </Message>
+             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="MemberOneLetter">
+               <Item>X</Item>
+               <Item>PhysicsVector.X</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Y">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Y</Item>
+              </Issue>
+             </Message>
+             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="MemberOneLetter">
+               <Item>Y</Item>
+               <Item>PhysicsVector.Y</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Z">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Z</Item>
+              </Issue>
+             </Message>
+             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="MemberOneLetter">
+               <Item>Z</Item>
+               <Item>PhysicsVector.Z</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Zero">
+            <Messages>
+             <Message TypeName="DoNotDeclareReadOnlyMutableReferenceTypes" Category="Microsoft.Security" CheckId="CA2104" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PhysicsVector.Zero</Item>
+               <Item>OpenSim.Physics.Manager.PhysicsVector</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/OpenSim.RegionServer.dll">
+    <Modules>
+     <Module Name="opensim.regionserver.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.RegionServer</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.RegionServer</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithAssemblyVersion" Category="Microsoft.Design" CheckId="CA1016" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.RegionServer</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.RegionServer</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithComVisible" Category="Microsoft.Design" CheckId="CA1017" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttribute" Level="CriticalError">
+         <Item>OpenSim.RegionServer</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim">
+        <Types>
+         <Type Name="AgentAssetUpload">
+          <Members>
+           <Member Name="AddUpload(libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>transactionID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AddUploadToAssetCache(libsecondlife.LLUUID):OpenSim.Framework.Assets.AssetBase">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>transactionID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetUpload(libsecondlife.LLUUID):OpenSim.Framework.Assets.AssetBase">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>transactionID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="HandleUploadPacket(libsecondlife.Packets.AssetUploadRequestPacket,libsecondlife.LLUUID):System.Void">
+            <Messages>
+             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>assetID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Int32.ToString(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AgentAssetUpload.HandleUploadPacket(AssetUploadRequestPacket, LLUUID):Void</Item>
+               <Item>System.Int32.ToString(System.String)</Item>
+               <Item>System.Int32.ToString(System.String,System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>AgentAssetUpload.HandleUploadPacket(AssetUploadRequestPacket, LLUUID):Void</Item>
+               <Item>System.Int32.ToString(System.String)</Item>
+               <Item>System.Int32.ToString(System.String,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'assetID'</Item>
+               <Item>AgentAssetUpload.HandleUploadPacket(AssetUploadRequestPacket, LLUUID):Void</Item>
+              </Issue>
+              <Issue>
+               <Item>'pack'</Item>
+               <Item>AgentAssetUpload.HandleUploadPacket(AssetUploadRequestPacket, LLUUID):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="HandleXferPacket(libsecondlife.Packets.SendXferPacketPacket):System.Void">
+            <Messages>
+             <Message Id="0#xfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>AgentAssetUpload.HandleXferPacket(SendXferPacketPacket):Void</Item>
+               <Item>xfer</Item>
+               <Item>xferPacket</Item>
+              </Issue>
+             </Message>
+             <Message Id="Xfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Xfer</Item>
+               <Item>AgentAssetUpload.HandleXferPacket(SendXferPacketPacket):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AssetTransaction">
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetTransaction.AssetTransaction()</Item>
+               <Item>UploadComplete</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AddToInventory">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AddToInventory</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Asset">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Asset</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InventFolder">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>InventFolder</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="TransactionID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>TransactionID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UploadComplete">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>UploadComplete</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="XferID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>XferID</Item>
+              </Issue>
+             </Message>
+             <Message Id="Xfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Xfer</Item>
+               <Item>AssetTransaction.XferID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Grid">
+          <Messages>
+           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>Grid</Item>
+             <Item>OpenSim.Framework.Grid</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="AssetDll">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetDll</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AssetServer">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetServer</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridDll">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GridDll</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridServer">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GridServer</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Initialise():System.Void">
+            <Messages>
+             <Message Id="Initialise" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Initialise</Item>
+               <Item>Grid.Initialise():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadAssetDll(System.String):OpenSim.Framework.Interfaces.IAssetServer">
+            <Messages>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
+              <Issue>
+               <Item>Grid.LoadAssetDll(String):IAssetServer</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadGridDll(System.String):OpenSim.Framework.Interfaces.IGridServer">
+            <Messages>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
+              <Issue>
+               <Item>Grid.LoadGridDll(String):IGridServer</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="OpenSimApplication">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.OpenSimApplication</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="RemoveClientCircuit(System.UInt32):System.Void">
+            <Messages>
+             <Message Id="0#circuitcode" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>OpenSimApplication.RemoveClientCircuit(UInt32):Void</Item>
+               <Item>circuitcode</Item>
+               <Item>circuitcode</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SendPacketTo(System.Byte[],System.Int32,System.Net.Sockets.SocketFlags,System.UInt32):System.Void">
+            <Messages>
+             <Message Id="3#circuitcode" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>OpenSimApplication.SendPacketTo(Byte[], Int32, SocketFlags, UInt32):Void</Item>
+               <Item>circuitcode</Item>
+               <Item>circuitcode</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="StartUp():System.Void">
+            <Messages>
+             <Message Id="StartUp" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ShouldBeDiscreteTerm">
+               <Item>StartUp</Item>
+               <Item>method</Item>
+               <Item>StartUp</Item>
+               <Item>Startup</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="OpenSimMain">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.OpenSimMain</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+            <Issue>
+             <Item>OpenSim.OpenSimMain</Item>
+             <Item>System.Timers.Timer, System.Net.Sockets.Socket</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OpenSimMain.OpenSimMain()</Item>
+               <Item>loginserver</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+              <Issue>
+               <Item>OpenSimMain.OpenSimMain()</Item>
+               <Item>sandbox</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="_physicsEngine">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>_physicsEngine</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>_physicsEngine</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadConfigDll(System.String):OpenSim.Framework.Interfaces.SimConfig">
+            <Messages>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
+              <Issue>
+               <Item>OpenSimMain.LoadConfigDll(String):SimConfig</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="loginserver">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>loginserver</Item>
+              </Issue>
+             </Message>
+             <Message Id="loginserver" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>loginserver</Item>
+               <Item>OpenSimMain.loginserver</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="sandbox">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>sandbox</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Server">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Server</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="StartUp():System.Void">
+            <Messages>
+             <Message TypeName="DoNotUseTimersThatPreventPowerStateChanges" Category="Microsoft.Mobility" CheckId="CA1601" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Timer.set_Interval(Double):Void</Item>
+               <Item>OpenSimMain.StartUp():Void</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.UInt32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OpenSimMain.StartUp():Void</Item>
+               <Item>System.UInt32.ToString</Item>
+               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>OpenSimMain.StartUp():Void</Item>
+               <Item>System.UInt32.ToString</Item>
+               <Item>System.UInt32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="OpenSimRoot">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.OpenSimRoot</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OpenSimRoot.OpenSimRoot()</Item>
+               <Item>Sandbox</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Application">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Application</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AssetCache">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetCache</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Cfg">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Cfg</Item>
+              </Issue>
+             </Message>
+             <Message Id="Cfg" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Cfg</Item>
+               <Item>OpenSimRoot.Cfg</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ClientThreads">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ClientThreads</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GridServers">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>GridServers</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="HttpServer">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>HttpServer</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InventoryCache">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>InventoryCache</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LocalWorld">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LocalWorld</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Sandbox">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Sandbox</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="StartUp():System.Void">
+            <Messages>
+             <Message Id="StartUp" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ShouldBeDiscreteTerm">
+               <Item>StartUp</Item>
+               <Item>method</Item>
+               <Item>StartUp</Item>
+               <Item>Startup</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="startuptime">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>startuptime</Item>
+              </Issue>
+             </Message>
+             <Message Id="startuptime" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>startuptime</Item>
+               <Item>OpenSimRoot.startuptime</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="QueItem">
+          <Messages>
+           <Message Id="Que" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Que</Item>
+             <Item>OpenSim.QueItem</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="Incoming">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Incoming</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Packet">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Packet</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SimClient">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.SimClient</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+            <Issue>
+             <Item>OpenSim.SimClient</Item>
+             <Item>System.Timers.Timer</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor(System.Net.EndPoint,libsecondlife.Packets.UseCircuitCodePacket)">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimClient.SimClient(EndPoint, UseCircuitCodePacket)</Item>
+               <Item>Sequence</Item>
+               <Item>System.UInt32</Item>
+               <Item>0</Item>
+              </Issue>
+              <Issue>
+               <Item>SimClient.SimClient(EndPoint, UseCircuitCodePacket)</Item>
+               <Item>debug</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotUseTimersThatPreventPowerStateChanges" Category="Microsoft.Mobility" CheckId="CA1601" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Timer.Timer(Double)</Item>
+               <Item>SimClient.SimClient(EndPoint, UseCircuitCodePacket)</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#initialcirpack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SimClient.SimClient(EndPoint, UseCircuitCodePacket)</Item>
+               <Item>initialcirpack</Item>
+               <Item>initialcirpack</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AgentID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AgentID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CircuitCode">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>CircuitCode</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ClientAvatar">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ClientAvatar</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InPacket(libsecondlife.Packets.Packet):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>NewPack</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="newAssetFolder">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimClient.newAssetFolder</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="OutPacket(libsecondlife.Packets.Packet):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>NewPack</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ProcessInPacket(libsecondlife.Packets.Packet):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>Pack</Item>
+              </Issue>
+             </Message>
+             <Message Id="wear" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimClient.ProcessInPacket(Packet):Void</Item>
+               <Item>wear</Item>
+               <Item>libsecondlife.Packets.AgentIsNowWearingPacket</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820" Created="2007-03-27 04:29:04Z">
+              <Issue Name="IsNullOrEmpty">
+               <Item>op_Equality</Item>
+               <Item>""</Item>
+               <Item>SimClient.ProcessInPacket(Packet):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ProcessOutPacket(libsecondlife.Packets.Packet):System.Void">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimClient.ProcessOutPacket(Packet):Void</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>Pack</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SecureSessionID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SecureSessionID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SessionID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SessionID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="userEP">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>userEP</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SimConsole">
+          <Messages>
+           <Message TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>OpenSim.SimConsole</Item>
+             <Item> OpenSim.Framework.Console.ConsoleBase</Item>
+            </Issue>
+           </Message>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.SimConsole</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor(OpenSim.Framework.Console.ConsoleBase+ConsoleType,System.String,System.Int32)">
+            <Messages>
+             <Message Id="0#constype" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
+               <Item>constype</Item>
+               <Item>constype</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#sparam" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
+               <Item>sparam</Item>
+               <Item>sparam</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#iparam" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
+               <Item>iparam</Item>
+               <Item>iparam</Item>
+              </Issue>
+             </Message>
+             <Message Id="iparam" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>iparam</Item>
+               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
+              </Issue>
+             </Message>
+             <Message Id="sparam" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>sparam</Item>
+               <Item>SimConsole.SimConsole(ConsoleType, String, Int32)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CmdPrompt(System.String,System.String):System.String">
+            <Messages>
+             <Message TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820" Created="2007-03-27 04:29:04Z">
+              <Issue Name="IsNullOrEmpty">
+               <Item>op_Equality</Item>
+               <Item>""</Item>
+               <Item>SimConsole.CmdPrompt(String, String):String</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ConsType">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimConsole.ConsType</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="MainConsolePrompt():System.Void">
+            <Messages>
+             <Message Id="System.UInt64.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimConsole.MainConsolePrompt():Void</Item>
+               <Item>System.UInt64.ToString</Item>
+               <Item>System.UInt64.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RunCmd(System.String,System.String[]):System.Object">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'cmdparams'</Item>
+               <Item>SimConsole.RunCmd(String, String[]):Object</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ShowCommands(System.String):System.Void">
+            <Messages>
+             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimConsole.ShowCommands(String):Void</Item>
+               <Item>System.String.Format(System.String,System.Object[])</Item>
+               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>
+              </Issue>
+              <Issue>
+               <Item>SimConsole.ShowCommands(String):Void</Item>
+               <Item>System.String.Format(System.String,System.Object[])</Item>
+               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="VersionInfo">
+          <Members>
+           <Member Name="Version">
+            <Messages>
+             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Version</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.Assets">
+        <Types>
+         <Type Name="AssetCache">
+          <Members>
+           <Member Name="AddTextureRequest(OpenSim.SimClient,libsecondlife.LLUUID):System.Void">
+            <Messages>
+             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>imageID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AssetRequests">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetRequests</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>System.Collections.Generic.List`1&lt;OpenSim.Assets.AssetRequest&gt;</Item>
+               <Item>AssetCache.AssetRequests</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Assets">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Assets</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CloneAsset(libsecondlife.LLUUID,OpenSim.Assets.AssetInfo):OpenSim.Assets.AssetInfo">
+            <Messages>
+             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>sourceAsset</Item>
+               <Item>AssetCache.CloneAsset(LLUUID, AssetInfo):AssetInfo</Item>
+               <Item>OpenSim.Assets.AssetInfo</Item>
+               <Item>OpenSim.Framework.Assets.AssetBase</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>AssetCache.CloneAsset(LLUUID, AssetInfo):AssetInfo</Item>
+              </Issue>
+             </Message>
+             <Message Id="newOwner" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>newOwner</Item>
+               <Item>AssetCache.CloneAsset(LLUUID, AssetInfo):AssetInfo</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'sourceAsset'</Item>
+               <Item>AssetCache.CloneAsset(LLUUID, AssetInfo):AssetInfo</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CloneImage(libsecondlife.LLUUID,OpenSim.Assets.TextureImage):OpenSim.Assets.TextureImage">
+            <Messages>
+             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>source</Item>
+               <Item>AssetCache.CloneImage(LLUUID, TextureImage):TextureImage</Item>
+               <Item>OpenSim.Assets.TextureImage</Item>
+               <Item>OpenSim.Framework.Assets.AssetBase</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>AssetCache.CloneImage(LLUUID, TextureImage):TextureImage</Item>
+              </Issue>
+             </Message>
+             <Message Id="newOwner" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>newOwner</Item>
+               <Item>AssetCache.CloneImage(LLUUID, TextureImage):TextureImage</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'source'</Item>
+               <Item>AssetCache.CloneImage(LLUUID, TextureImage):TextureImage</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CreateNewInventorySet(libsecondlife.LLUUID):OpenSim.Framework.Assets.AssetBase[]">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>agentID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetAsset(libsecondlife.LLUUID):OpenSim.Framework.Assets.AssetBase">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>assetID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RequestedAssets">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RequestedAssets</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RequestedTextures">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RequestedTextures</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RunAssetManager():System.Void">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetCache.RunAssetManager():Void</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="TextureRequests">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>TextureRequests</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>System.Collections.Generic.List`1&lt;OpenSim.Assets.AssetRequest&gt;</Item>
+               <Item>AssetCache.TextureRequests</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Textures">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Textures</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AssetInfo">
+          <Messages>
+           <Message TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>OpenSim.Assets.AssetInfo</Item>
+             <Item> OpenSim.Framework.Assets.AssetBase</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor(OpenSim.Framework.Assets.AssetBase)">
+            <Messages>
+             <Message Id="0#a" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>AssetInfo.AssetInfo(AssetBase)</Item>
+               <Item>a</Item>
+               <Item>aBase</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'aBase'</Item>
+               <Item>AssetInfo.AssetInfo(AssetBase)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AssetRequest">
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetRequest.AssetRequest()</Item>
+               <Item>DataPointer</Item>
+               <Item>System.Int64</Item>
+               <Item>0</Item>
+              </Issue>
+              <Issue>
+               <Item>AssetRequest.AssetRequest()</Item>
+               <Item>NumPackets</Item>
+               <Item>System.Int32</Item>
+               <Item>0</Item>
+              </Issue>
+              <Issue>
+               <Item>AssetRequest.AssetRequest()</Item>
+               <Item>PacketCounter</Item>
+               <Item>System.Int32</Item>
+               <Item>0</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AssetInf">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AssetInf</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="DataPointer">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>DataPointer</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ImageInfo">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ImageInfo</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="IsTextureRequest">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>IsTextureRequest</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="NumPackets">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>NumPackets</Item>
+              </Issue>
+             </Message>
+             <Message Id="Num" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Num</Item>
+               <Item>AssetRequest.NumPackets</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PacketCounter">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PacketCounter</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RequestAssetID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RequestAssetID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RequestUser">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>RequestUser</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="TransferRequestID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>TransferRequestID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="InventoryCache">
+          <Members>
+           <Member Name="AddNewInventoryItem(OpenSim.SimClient,libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):libsecondlife.LLUUID">
+            <Messages>
+             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>folderID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ClientLeaving(libsecondlife.LLUUID):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>clientID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CreateNewInventoryFolder(OpenSim.SimClient,libsecondlife.LLUUID):System.Boolean">
+            <Messages>
+             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>folderID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CreateNewInventoryFolder(OpenSim.SimClient,libsecondlife.LLUUID,System.UInt16):System.Boolean">
+            <Messages>
+             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>folderID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="FetchInventory(OpenSim.SimClient,libsecondlife.Packets.FetchInventoryPacket):System.Void">
+            <Messages>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>FetchItems</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="FetchInventoryDescendents(OpenSim.SimClient,libsecondlife.Packets.FetchInventoryDescendentsPacket):System.Void">
+            <Messages>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>FetchDescend</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetAgentsInventory(libsecondlife.LLUUID):OpenSim.Framework.Inventory.AgentInventory">
+            <Messages>
+             <Message Id="0#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>agentID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UpdateInventoryItem(OpenSim.SimClient,libsecondlife.LLUUID,OpenSim.Framework.Assets.AssetBase):System.Boolean">
+            <Messages>
+             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>itemID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="TextureImage">
+          <Messages>
+           <Message TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>OpenSim.Assets.TextureImage</Item>
+             <Item> OpenSim.Framework.Assets.AssetBase</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor(OpenSim.Framework.Assets.AssetBase)">
+            <Messages>
+             <Message Id="0#a" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>TextureImage.TextureImage(AssetBase)</Item>
+               <Item>a</Item>
+               <Item>aBase</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'aBase'</Item>
+               <Item>TextureImage.TextureImage(AssetBase)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.CAPS">
+        <Types>
+         <Type Name="SimCAPSHTTPServer">
+          <Messages>
+           <Message Id="Sim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Sim</Item>
+             <Item>OpenSim.CAPS.SimCAPSHTTPServer</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>SimCAPSHTTPServer</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+            <Issue>
+             <Item>OpenSim.CAPS.SimCAPSHTTPServer</Item>
+             <Item>System.Net.HttpListener</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="HandleRequest(System.Object):System.Void">
+            <Messages>
+             <Message Id="0#stateinfo" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>SimCAPSHTTPServer.HandleRequest(Object):Void</Item>
+               <Item>stateinfo</Item>
+               <Item>stateinfo</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="HTTPD">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>HTTPD</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Listener">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Listener</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadAdminPage():System.Void">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimCAPSHTTPServer.LoadAdminPage():Void</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ParseLLSDXML(System.String):System.String">
+            <Messages>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
+              <Issue>
+               <Item>SimCAPSHTTPServer.ParseLLSDXML(String):String</Item>
+              </Issue>
+             </Message>
+             <Message Id="requestBody" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
+              <Issue>
+               <Item>requestBody</Item>
+               <Item>SimCAPSHTTPServer.ParseLLSDXML(String):String</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ParseREST(System.String,System.String,System.String):System.String">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimCAPSHTTPServer.ParseREST(String, String, String):String</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimCAPSHTTPServer.ParseREST(String, String, String):String</Item>
+               <Item>System.String.Format(System.String,System.Object[])</Item>
+               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ParseXMLRPC(System.String):System.String">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimCAPSHTTPServer.ParseXMLRPC(String):String</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="NonBreaking">
+              <Issue>
+               <Item>SimCAPSHTTPServer.ParseXMLRPC(String):String</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Convert.ToUInt32(System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimCAPSHTTPServer.ParseXMLRPC(String):String</Item>
+               <Item>System.Convert.ToUInt32(System.Object)</Item>
+               <Item>System.Convert.ToUInt32(System.Object,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="StartHTTP():System.Void">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>SimCAPSHTTPServer.StartHTTP():Void</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>SimCAPSHTTPServer.StartHTTP():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.types">
+        <Types>
+         <Type Name="Mesh">
+          <Members>
+           <Member Name="mesh">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>mesh</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>System.Collections.Generic.List`1&lt;OpenSim.types.Triangle&gt;</Item>
+               <Item>Mesh.mesh</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="op_Addition(OpenSim.types.Mesh,OpenSim.types.Mesh):OpenSim.types.Mesh">
+            <Messages>
+             <Message Id="0#a" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>Mesh.op_Addition(Mesh, Mesh):Mesh</Item>
+               <Item>a</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#b" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>Mesh.op_Addition(Mesh, Mesh):Mesh</Item>
+               <Item>b</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="OperatorOverloadsHaveNamedAlternates" Category="Microsoft.Usage" CheckId="CA2225" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Add</Item>
+               <Item>Mesh.op_Addition(Mesh, Mesh):Mesh</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="OverloadOperatorEqualsOnOverloadingAddAndSubtract" Category="Microsoft.Design" CheckId="CA1013" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Mesh</Item>
+               <Item>Mesh.op_Addition(Mesh, Mesh):Mesh</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Triangle">
+          <Members>
+           <Member Name=".ctor(Axiom.MathLib.Vector3,Axiom.MathLib.Vector3,Axiom.MathLib.Vector3)">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>A</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>B</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>C</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#A" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>Triangle.Triangle(Vector3, Vector3, Vector3)</Item>
+               <Item>A</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#B" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>Triangle.Triangle(Vector3, Vector3, Vector3)</Item>
+               <Item>B</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#C" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterOneLetter">
+               <Item>Triangle.Triangle(Vector3, Vector3, Vector3)</Item>
+               <Item>C</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.UserServer">
+        <Types>
+         <Type Name="LocalUserProfileManager">
+          <Members>
+           <Member Name="CustomiseResponse(System.Collections.Hashtable&amp;,OpenSim.Framework.User.UserProfile):System.Void">
+            <Messages>
+             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Int32.ToString</Item>
+               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Int32.ToString</Item>
+               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Single.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+              <Issue>
+               <Item>LocalUserProfileManager.CustomiseResponse(Hashtable&amp;, UserProfile):Void</Item>
+               <Item>System.Single.ToString</Item>
+               <Item>System.Single.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="LoginServer">
+          <Messages>
+           <Message TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>OpenSim.UserServer.LoginServer</Item>
+             <Item> OpenSim.Framework.Grid.LoginService</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+            <Issue>
+             <Item>OpenSim.UserServer.LoginServer</Item>
+             <Item>System.Net.Sockets.Socket</Item>
+            </Issue>
+           </Message>
+           <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Login</Item>
+             <Item>LoginServer</Item>
+             <Item>LogOn</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor(OpenSim.Framework.Interfaces.IGridServer)">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginServer.LoginServer(IGridServer)</Item>
+               <Item>_needPasswd</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+              <Issue>
+               <Item>LoginServer.LoginServer(IGridServer)</Item>
+               <Item>userAccounts</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Authenticate(System.String,System.String,System.String):System.Boolean">
+            <Messages>
+             <Message Id="2#passwd" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>LoginServer.Authenticate(String, String, String):Boolean</Item>
+               <Item>passwd</Item>
+               <Item>passwd</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="clientAddress">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>clientAddress</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CustomiseLoginResponse(System.Collections.Hashtable,System.String,System.String):System.Void">
+            <Messages>
+             <Message Id="Customise" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Customise</Item>
+               <Item>LoginServer.CustomiseLoginResponse(Hashtable, String, String):Void</Item>
+              </Issue>
+             </Message>
+             <Message Id="Login" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Login</Item>
+               <Item>CustomiseLoginResponse</Item>
+               <Item>LogOn</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="EncodePassword(System.String):System.String">
+            <Messages>
+             <Message Id="System.String.ToLower" TypeName="SpecifyCultureInfo" Category="Microsoft.Globalization" CheckId="CA1304" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginServer.EncodePassword(String):String</Item>
+               <Item>System.String.ToLower</Item>
+               <Item>System.String.ToLower(System.Globalization.CultureInfo)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetAgentId(System.String,System.String):libsecondlife.LLUUID">
+            <Messages>
+             <Message Id="System.Int32.ToString(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginServer.GetAgentId(String, String):LLUUID</Item>
+               <Item>System.Int32.ToString(System.String)</Item>
+               <Item>System.Int32.ToString(System.String,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="InitializeLogin():System.Void">
+            <Messages>
+             <Message Id="OpenSim.Framework.User.UserProfileManager.SetKeys(System.String,System.String,System.String,System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginServer.InitializeLogin():Void</Item>
+               <Item>4</Item>
+               <Item>UserProfileManager.SetKeys(String, String, String, String):Void</Item>
+               <Item>Welcome to OpenSim</Item>
+              </Issue>
+             </Message>
+             <Message Id="Sim" TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Sim</Item>
+               <Item>OpenSim</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoginRequest(System.IO.StreamReader,System.IO.StreamWriter):System.Void">
+            <Messages>
+             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2007-03-27 04:29:04Z">
+              <Issue Name="TooGeneric">
+               <Item>LoginServer.LoginRequest(StreamReader, StreamWriter):Void</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Convert.ToInt32(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginServer.LoginRequest(StreamReader, StreamWriter):Void</Item>
+               <Item>System.Convert.ToInt32(System.String)</Item>
+               <Item>System.Convert.ToInt32(System.String,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820" Created="2007-03-27 04:29:04Z">
+              <Issue Name="IsNullOrEmpty">
+               <Item>op_Inequality</Item>
+               <Item>""</Item>
+               <Item>LoginServer.LoginRequest(StreamReader, StreamWriter):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ProcessXmlRequest(Nwc.XmlRpc.XmlRpcRequest,System.IO.StreamWriter):System.Boolean">
+            <Messages>
+             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>writer</Item>
+               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
+               <Item>System.IO.StreamWriter</Item>
+               <Item>System.IO.TextWriter</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
+               <Item>System.Int32.ToString</Item>
+               <Item>System.Int32.ToString(System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Int32.ToString(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
+               <Item>System.Int32.ToString(System.String)</Item>
+               <Item>System.Int32.ToString(System.String,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'request'</Item>
+               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
+              </Issue>
+              <Issue>
+               <Item>'writer'</Item>
+               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
+              </Issue>
+              <Issue>
+               <Item>'writer'</Item>
+               <Item>LoginServer.ProcessXmlRequest(XmlRpcRequest, StreamWriter):Boolean</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="remoteAddress">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>remoteAddress</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="RunLogin():System.Void">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginServer.RunLogin():Void</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+              <Issue>
+               <Item>LoginServer.RunLogin():Void</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+             <Message Id="clientEndPoint" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LoginServer.RunLogin():Void</Item>
+               <Item>clientEndPoint</Item>
+               <Item>System.Net.IPEndPoint</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.world">
+        <Types>
+         <Type Name="Avatar">
+          <Members>
+           <Member Name=".cctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Avatar.Avatar()</Item>
+               <Item>PhysicsEngineFlying</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name=".ctor(OpenSim.SimClient)">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Avatar.Avatar(SimClient)</Item>
+               <Item>_updateCount</Item>
+               <Item>System.Int16</Item>
+               <Item>0</Item>
+              </Issue>
+              <Issue>
+               <Item>Avatar.Avatar(SimClient)</Item>
+               <Item>avatarAppearanceTexture</Item>
+               <Item>libsecondlife.LLObject+TextureEntry</Item>
+               <Item>null</Item>
+              </Issue>
+              <Issue>
+               <Item>Avatar.Avatar(SimClient)</Item>
+               <Item>movementflag</Item>
+               <Item>System.Byte</Item>
+               <Item>0</Item>
+              </Issue>
+              <Issue>
+               <Item>Avatar.Avatar(SimClient)</Item>
+               <Item>updateflag</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>TheClient</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="anim_seq">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>anim_seq</Item>
+              </Issue>
+             </Message>
+             <Message Id="anim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>anim</Item>
+               <Item>Avatar.anim_seq</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>anim_seq</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Animations">
+            <Messages>
+             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Animations</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CompleteMovement(OpenSim.world.World):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>RegionInfo</Item>
+              </Issue>
+             </Message>
+             <Message Id="RegionInfo" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>RegionInfo</Item>
+               <Item>Avatar.CompleteMovement(World):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="ControllingClient">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>ControllingClient</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="current_anim">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>current_anim</Item>
+              </Issue>
+             </Message>
+             <Message Id="anim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>anim</Item>
+               <Item>Avatar.current_anim</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>current_anim</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="firstname">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>firstname</Item>
+              </Issue>
+             </Message>
+             <Message Id="firstname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>firstname</Item>
+               <Item>Avatar.firstname</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="lastname">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>lastname</Item>
+              </Issue>
+             </Message>
+             <Message Id="lastname" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>lastname</Item>
+               <Item>Avatar.lastname</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadAnims():System.Void">
+            <Messages>
+             <Message Id="Anims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Anims</Item>
+               <Item>Avatar.LoadAnims():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PhysActor">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PhysActor</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PhysicsEngineFlying">
+            <Messages>
+             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PhysicsEngineFlying</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SendAnimPack():System.Void">
+            <Messages>
+             <Message Id="Anim" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Anim</Item>
+               <Item>Avatar.SendAnimPack():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SendAppearanceToOtherAgent(OpenSim.SimClient):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'userInfo'</Item>
+               <Item>Avatar.SendAppearanceToOtherAgent(SimClient):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SendRegionHandshake(OpenSim.world.World):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>RegionInfo</Item>
+              </Issue>
+             </Message>
+             <Message Id="RegionInfo" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>RegionInfo</Item>
+               <Item>Avatar.SendRegionHandshake(World):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AvatarAnimations">
+          <Members>
+           <Member Name="AnimsLLUUID">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AnimsLLUUID</Item>
+              </Issue>
+             </Message>
+             <Message Id="Anims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Anims</Item>
+               <Item>AvatarAnimations.AnimsLLUUID</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AnimsNames">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>AnimsNames</Item>
+              </Issue>
+             </Message>
+             <Message Id="Anims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Anims</Item>
+               <Item>AvatarAnimations.AnimsNames</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadAnims():System.Void">
+            <Messages>
+             <Message Id="Anims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Anims</Item>
+               <Item>AvatarAnimations.LoadAnims():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Entity">
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Entity.Entity()</Item>
+               <Item>localid</Item>
+               <Item>System.UInt32</Item>
+               <Item>0</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="addForces():System.Void">
+            <Messages>
+             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>addForces</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="BackUp():System.Void">
+            <Messages>
+             <Message Id="BackUp" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ShouldBeDiscreteTerm">
+               <Item>BackUp</Item>
+               <Item>method</Item>
+               <Item>BackUp</Item>
+               <Item>Backup</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="children">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>children</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>System.Collections.Generic.List`1&lt;OpenSim.world.Entity&gt;</Item>
+               <Item>Entity.children</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="getMesh():OpenSim.types.Mesh">
+            <Messages>
+             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>getMesh</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="getName():System.String">
+            <Messages>
+             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>getName</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="localid">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>localid</Item>
+              </Issue>
+             </Message>
+             <Message Id="localid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>localid</Item>
+               <Item>Entity.localid</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="name">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>name</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="position">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>position</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="rotation">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>rotation</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="update():System.Void">
+            <Messages>
+             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>update</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="uuid">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>uuid</Item>
+              </Issue>
+             </Message>
+             <Message Id="uuid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>uuid</Item>
+               <Item>Entity.uuid</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="velocity">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>velocity</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="NewForce">
+          <Members>
+           <Member Name="X">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>X</Item>
+              </Issue>
+             </Message>
+             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="MemberOneLetter">
+               <Item>X</Item>
+               <Item>NewForce.X</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Y">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Y</Item>
+              </Issue>
+             </Message>
+             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="MemberOneLetter">
+               <Item>Y</Item>
+               <Item>NewForce.Y</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Z">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Z</Item>
+              </Issue>
+             </Message>
+             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="MemberOneLetter">
+               <Item>Z</Item>
+               <Item>NewForce.Z</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Primitive">
+          <Messages>
+           <Message TypeName="IdentifiersShouldDifferByMoreThanCase" Category="Microsoft.Naming" CheckId="CA1708" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Member">
+             <Item>'UpdateFlag'</Item>
+             <Item>updateFlag</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Primitive.Primitive()</Item>
+               <Item>dirtyFlag</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+              <Issue>
+               <Item>Primitive.Primitive()</Item>
+               <Item>mesh_cutbegin</Item>
+               <Item>System.Single</Item>
+               <Item>0.0</Item>
+              </Issue>
+              <Issue>
+               <Item>Primitive.Primitive()</Item>
+               <Item>newPrimFlag</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+              <Issue>
+               <Item>Primitive.Primitive()</Item>
+               <Item>physicsEnabled</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+              <Issue>
+               <Item>Primitive.Primitive()</Item>
+               <Item>physicstest</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+              <Issue>
+               <Item>Primitive.Primitive()</Item>
+               <Item>updateFlag</Item>
+               <Item>System.Boolean</Item>
+               <Item>false</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CreateFromPacket(libsecondlife.Packets.ObjectAddPacket,libsecondlife.LLUUID,System.UInt32):System.Void">
+            <Messages>
+             <Message Id="localID-702000" TypeName="OperationsShouldNotOverflow" Category="Microsoft.Usage" CheckId="CA2233" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>localID-702000</Item>
+               <Item>Primitive.CreateFromPacket(ObjectAddPacket, LLUUID, UInt32):Void</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>agentID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="2#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="ParameterId">
+               <Item>ID</Item>
+               <Item>localID</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.UInt32.ToString(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Primitive.CreateFromPacket(ObjectAddPacket, LLUUID, UInt32):Void</Item>
+               <Item>System.UInt32.ToString(System.String)</Item>
+               <Item>System.UInt32.ToString(System.String,System.IFormatProvider)</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'addPacket'</Item>
+               <Item>Primitive.CreateFromPacket(ObjectAddPacket, LLUUID, UInt32):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="CreateFromStorage(OpenSim.Framework.Assets.PrimData):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'store'</Item>
+               <Item>Primitive.CreateFromStorage(PrimData):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="dirtyFlag">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>dirtyFlag</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="mesh_cutbegin">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>mesh_cutbegin</Item>
+              </Issue>
+             </Message>
+             <Message Id="cutbegin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>cutbegin</Item>
+               <Item>Primitive.mesh_cutbegin</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>mesh_cutbegin</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="mesh_cutend">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>mesh_cutend</Item>
+              </Issue>
+             </Message>
+             <Message Id="cutend" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>cutend</Item>
+               <Item>Primitive.mesh_cutend</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>mesh_cutend</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="newPrimFlag">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>newPrimFlag</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="PhysActor">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PhysActor</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="primData">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>primData</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UpdateClient(OpenSim.SimClient):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>RemoteClient</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'RemoteClient'</Item>
+               <Item>Primitive.UpdateClient(SimClient):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="updateFlag">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>updateFlag</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UpdateObjectFlags(libsecondlife.Packets.ObjectFlagUpdatePacket):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'pack'</Item>
+               <Item>Primitive.UpdateObjectFlags(ObjectFlagUpdatePacket):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="UpdateShape(libsecondlife.Packets.ObjectShapePacket+ObjectDataBlock):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'addPacket'</Item>
+               <Item>Primitive.UpdateShape(ObjectDataBlock):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ScriptEngine">
+          <Members>
+           <Member Name=".ctor(OpenSim.world.World)">
+            <Messages>
+             <Message Id="0#env" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>ScriptEngine.ScriptEngine(World)</Item>
+               <Item>env</Item>
+               <Item>env</Item>
+              </Issue>
+             </Message>
+             <Message Id="env" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>env</Item>
+               <Item>ScriptEngine.ScriptEngine(World)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadScript():System.Void">
+            <Messages>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>ScriptEngine.LoadScript():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SurfacePatch">
+          <Members>
+           <Member Name="HeightMap">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>HeightMap</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="World">
+          <Messages>
+           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>World</Item>
+             <Item>OpenSim.world</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>World.World()</Item>
+               <Item>_localNumber</Item>
+               <Item>System.UInt32</Item>
+               <Item>0</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="_localNumber">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>_localNumber</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>_localNumber</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AddNewPrim(libsecondlife.Packets.ObjectAddPacket,OpenSim.SimClient):System.Void">
+            <Messages>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>AgentClient</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="AddViewerAgent(OpenSim.SimClient):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>AgentClient</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="DeRezObject(libsecondlife.Packets.DeRezObjectPacket,OpenSim.SimClient):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>DeRezPacket</Item>
+              </Issue>
+             </Message>
+             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>AgentClient</Item>
+              </Issue>
+             </Message>
+             <Message Id="0#Rez" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>World.DeRezObject(DeRezObjectPacket, SimClient):Void</Item>
+               <Item>Rez</Item>
+               <Item>DeRezPacket</Item>
+              </Issue>
+             </Message>
+             <Message Id="Rez" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Rez</Item>
+               <Item>World.DeRezObject(DeRezObjectPacket, SimClient):Void</Item>
+              </Issue>
+             </Message>
+             <Message Id="AgentClient" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>AgentClient</Item>
+               <Item>World.DeRezObject(DeRezObjectPacket, SimClient):Void</Item>
+              </Issue>
+             </Message>
+             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>De</Item>
+               <Item>World.DeRezObject(DeRezObjectPacket, SimClient):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Entities">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Entities</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="GetInitialPrims(OpenSim.SimClient):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>RemoteClient</Item>
+              </Issue>
+             </Message>
+             <Message Id="Prims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Prims</Item>
+               <Item>World.GetInitialPrims(SimClient):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LandMap">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>LandMap</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadPrimsFromStorage():System.Void">
+            <Messages>
+             <Message Id="Prims" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>Prims</Item>
+               <Item>World.LoadPrimsFromStorage():Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadStorageDLL(System.String):System.Boolean">
+            <Messages>
+             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Member">
+               <Item>World.LoadStorageDLL(String):Boolean</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="localStorage">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>localStorage</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Rand">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>World.Rand</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Scripts">
+            <Messages>
+             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Scripts</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SendLayerData(OpenSim.SimClient):System.Void">
+            <Messages>
+             <Message Id="0#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>RemoteClient</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'RemoteClient'</Item>
+               <Item>World.SendLayerData(SimClient):Void</Item>
+              </Issue>
+              <Issue>
+               <Item>'RemoteClient'</Item>
+               <Item>World.SendLayerData(SimClient):Void</Item>
+              </Issue>
+              <Issue>
+               <Item>'RemoteClient'</Item>
+               <Item>World.SendLayerData(SimClient):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="OpenSim.world.scripting">
+        <Types>
+         <Type Name="IScriptHost">
+          <Members>
+           <Member Name="Register(OpenSim.world.scripting.IScript):System.Boolean">
+            <Messages>
+             <Message Id="0#iscript" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>IScriptHost.Register(IScript):Boolean</Item>
+               <Item>iscript</Item>
+               <Item>iscript</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/OpenSim.Storage.LocalStorageDb4o.dll">
+    <Modules>
+     <Module Name="opensim.storage.localstoragedb4o.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.Storage.LocalStorageDb4o</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.Storage.LocalStorageDb4o</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.Storage.LocalStorageDb4o</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.Storage.LocalStorageDb4o">
+        <Types>
+         <Type Name="Db4LocalStorage">
+          <Members>
+           <Member Name=".ctor()">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>Db4LocalStorage.Db4LocalStorage()</Item>
+               <Item>System.Exception</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LoadPrimitives(OpenSim.Framework.Interfaces.ILocalStorageReceiver):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'receiver'</Item>
+               <Item>Db4LocalStorage.LoadPrimitives(ILocalStorageReceiver):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="StorePrim(OpenSim.Framework.Assets.PrimData):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'prim'</Item>
+               <Item>Db4LocalStorage.StorePrim(PrimData):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="UUIDQuery">
+          <Messages>
+           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>UUIDQuery</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="Match(OpenSim.Framework.Assets.PrimData):System.Boolean">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'prim'</Item>
+               <Item>UUIDQuery.Match(PrimData):Boolean</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.BasicPhysicsPlugin.dll">
+    <Modules>
+     <Module Name="opensim.physics.basicphysicsplugin.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Status="Excluded" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
+        </Issue>
+        <Notes>
+         <User Name="Stefan">
+          <Note Id="2" />
+         </User>
+        </Notes>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Status="Excluded" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
+        </Issue>
+        <Notes>
+         <User Name="Stefan">
+          <Note Id="0" />
+         </User>
+        </Notes>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Status="Excluded" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
+        </Issue>
+        <Notes>
+         <User Name="Stefan">
+          <Note Id="1" />
+         </User>
+        </Notes>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.Physics.BasicPhysicsPlugin">
+        <Types>
+         <Type Name="BasicActor">
+          <Members>
+           <Member Name="flying">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>BasicActor.flying</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
+            <Messages>
+             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>BasicActor.SetAcceleration(PhysicsVector):Void</Item>
+               <Item>accel</Item>
+               <Item>accel</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="BasicPhysicsPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.Physics.BasicPhysicsPlugin.BasicPhysicsPlugin</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>BasicPhysicsPlugin</Item>
+             <Item>OpenSim.Physics.BasicPhysicsPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.OdePlugin.dll">
+    <Modules>
+     <Module Name="opensim.physics.odeplugin.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.Physics.OdePlugin</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.Physics.OdePlugin</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.Physics.OdePlugin</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.Physics.OdePlugin">
+        <Types>
+         <Type Name="OdeCharacter">
+          <Messages>
+           <Message TypeName="TypesThatOwnNativeResourcesShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1049" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>OdeCharacter</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name=".ctor(OpenSim.Physics.OdePlugin.OdeScene,OpenSim.Physics.Manager.PhysicsVector)">
+            <Messages>
+             <Message Id="parent_scene" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2007-03-27 04:29:04Z" FixCategory="Breaking">
+              <Issue>
+               <Item>parent_scene</Item>
+               <Item>OdeCharacter.OdeCharacter(OdeScene, PhysicsVector)</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'pos'</Item>
+               <Item>OdeCharacter.OdeCharacter(OdeScene, PhysicsVector)</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="capsule_geom">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OdeCharacter.capsule_geom</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="gravityAccel">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OdeCharacter.gravityAccel</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
+            <Messages>
+             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>OdeCharacter.SetAcceleration(PhysicsVector):Void</Item>
+               <Item>accel</Item>
+               <Item>accel</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="OdePlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.Physics.OdePlugin.OdePlugin</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>OdePlugin</Item>
+             <Item>OpenSim.Physics.OdePlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="OdePrim">
+          <Members>
+           <Member Name="_position">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OdePrim._position</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
+            <Messages>
+             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>OdePrim.SetAcceleration(PhysicsVector):Void</Item>
+               <Item>accel</Item>
+               <Item>accel</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="OdeScene">
+          <Members>
+           <Member Name="AddPrim(OpenSim.Physics.Manager.PhysicsVector,OpenSim.Physics.Manager.PhysicsVector):OpenSim.Physics.Manager.PhysicsActor">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'position'</Item>
+               <Item>OdeScene.AddPrim(PhysicsVector, PhysicsVector):PhysicsActor</Item>
+              </Issue>
+              <Issue>
+               <Item>'size'</Item>
+               <Item>OdeScene.AddPrim(PhysicsVector, PhysicsVector):PhysicsActor</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="Land">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OdeScene.Land</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="LandGeom">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>OdeScene.LandGeom</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetTerrain(System.Single[]):System.Void">
+            <Messages>
+             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>'heightMap'</Item>
+               <Item>OdeScene.SetTerrain(Single[]):Void</Item>
+              </Issue>
+              <Issue>
+               <Item>'heightMap'</Item>
+               <Item>OdeScene.SetTerrain(Single[]):Void</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="space">
+            <Messages>
+             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>space</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="PointersShouldNotBeVisible" Category="Microsoft.Security" CheckId="CA2111" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>space</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="world">
+            <Messages>
+             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>world</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="PointersShouldNotBeVisible" Category="Microsoft.Security" CheckId="CA2111" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>world</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+   <Target Name="$(ProjectDir)/bin/Physics/OpenSim.Physics.PhysXPlugin.dll">
+    <Modules>
+     <Module Name="opensim.physics.physxplugin.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-03-27 04:29:04Z">
+        <Issue>
+         <Item>OpenSim.Physics.PhysXPlugin</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoStrongName">
+         <Item>OpenSim.Physics.PhysXPlugin</Item>
+        </Issue>
+       </Message>
+       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-03-27 04:29:04Z">
+        <Issue Name="NoAttr">
+         <Item>OpenSim.Physics.PhysXPlugin</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="OpenSim.Physics.PhysXPlugin">
+        <Types>
+         <Type Name="PhysXCharacter">
+          <Members>
+           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
+            <Messages>
+             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>PhysXCharacter.SetAcceleration(PhysicsVector):Void</Item>
+               <Item>accel</Item>
+               <Item>accel</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PhysXPlugin">
+          <Messages>
+           <Message Id="Plugin" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+            <Issue Name="Type">
+             <Item>Plugin</Item>
+             <Item>OpenSim.Physics.PhysXPlugin.PhysXPlugin</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724" Created="2007-03-27 04:29:04Z">
+            <Issue>
+             <Item>PhysXPlugin</Item>
+             <Item>OpenSim.Physics.PhysXPlugin</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="PhysXPrim">
+          <Members>
+           <Member Name="_position">
+            <Messages>
+             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2007-03-27 04:29:04Z">
+              <Issue>
+               <Item>PhysXPrim._position</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="SetAcceleration(OpenSim.Physics.Manager.PhysicsVector):System.Void">
+            <Messages>
+             <Message Id="0#accel" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2007-03-27 04:29:04Z">
+              <Issue Name="Parameter">
+               <Item>PhysXPrim.SetAcceleration(PhysicsVector):Void</Item>
+               <Item>accel</Item>
+               <Item>accel</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+  </Targets>
+  <Notes>
+   <User Name="Stefan">
+    <Note Id="0" Modified="2007-03-27 04:30:24Z">Save it for a rainy day.</Note>
+    <Note Id="1" Modified="2007-03-27 04:30:31Z">Save it for a rainy day.</Note>
+    <Note Id="2" Modified="2007-03-27 04:30:38Z">Save it for a rainy day.</Note>
+   </User>
+  </Notes>
+  <Rules>
+   <Rule TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209">
+    <Resolution Name="Default">No valid permission requests were found for assembly '{0}'. You should always specify the minimum security permissions using SecurityAction.RequestMinimum.</Resolution>
+   </Rule>
+   <Rule TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210">
+    <Resolution Name="NoStrongName">Sign '{0}' with a strong name key.</Resolution>
+   </Rule>
+   <Rule TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020">
+    <Resolution Name="Default">Consider merging the types defined in '{0}' with another namespace.</Resolution>
+   </Rule>
+   <Rule TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823">
+    <Resolution Name="Default">It appears that field '{0}' is never used or is only ever assigned to. Use this field or remove it.</Resolution>
+   </Rule>
+   <Rule TypeName="CollectionPropertiesShouldBeReadOnly" Category="Microsoft.Usage" CheckId="CA2227">
+    <Resolution Name="Default">Change '{0}' to be read-only by removing the property setter.</Resolution>
+   </Rule>
+   <Rule TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702">
+    <Resolution Name="ShouldBeDiscreteTerm">The compound word '{0}' in {1} '{2}' exists as a discrete term. If your usage is intended to be single word, case it as '{3}'.</Resolution>
+   </Rule>
+   <Rule TypeName="ComVisibleTypeBaseTypesShouldBeComVisible" Category="Microsoft.Interoperability" CheckId="CA1405">
+    <Resolution Name="Default">'{0}' is marked ComVisible(true) but has the following ComVisible(false) types in its object hierarchy: {1}</Resolution>
+   </Rule>
+   <Rule TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011">
+    <Resolution Name="Default">Consider changing the type of parameter '{0}' in {1} from {2} to its base type {3}. This method appears to only require base class members in its implementation. Suppress this violation if there is a compelling reason to require the more derived type in the method signature.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotCallOverridableMethodsInConstructors" Category="Microsoft.Usage" CheckId="CA2214">
+    <Resolution Name="Default">'{0}' contains a call chain that results in a call to a virtual method defined by the class. Review the following call stack for unintended consequences: {1}</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031">
+    <Resolution Name="Default">Modify '{0}' to catch a more specific exception than '{1}' or rethrow the exception.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotDeclareReadOnlyMutableReferenceTypes" Category="Microsoft.Security" CheckId="CA2104">
+    <Resolution Name="Default">Remove the readonly declaration from '{0}' or change the field to one that is an immutable reference type. If the reference type '{1}' is, in fact, immutable, exclude this message.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051">
+    <Resolution Name="Default">Make '{0}' private or internal (Friend in VB, public private in C++) and provide a public or protected property to access it.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002">
+    <Resolution Name="Default">Change '{0}' in {1} to use Collection&lt;T&gt;, ReadOnlyCollection&lt;T&gt; or KeyedCollection&lt;K,V&gt;</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805">
+    <Resolution Name="Default">{0} initializes field {1} of type {2} to {3}. Remove this initialization as it will be done automatically by the runtime.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303">
+    <Resolution Name="Default">{0} passes a literal as parameter {1} of a call to {2}. Retrieve the following string argument from a resource table instead: '{3}'</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotPassTypesByReference" Category="Microsoft.Design" CheckId="CA1045">
+    <Resolution Name="Default">Consider a design that does not require that '{0}' be a reference parameter.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201">
+    <Resolution Name="TooGeneric">{0} creates an exception of type '{1}', an exception type that is not sufficiently specific and should never be raised by user code. If this exception instance might be thrown, use a different exception type.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotUseTimersThatPreventPowerStateChanges" Category="Microsoft.Mobility" CheckId="CA1601">
+    <Resolution Name="Default">Modify the call to {0} in method {1} to set the timer interval to a value that's greater than or equal to one second.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709">
+    <Resolution Name="Member">Correct the casing of member name '{0}'.</Resolution>
+    <Resolution Name="Namespace">Correct the casing of namespace name '{0}'.</Resolution>
+    <Resolution Name="Parameter">Correct the casing of parameter name '{0}'.</Resolution>
+    <Resolution Name="Type">Correct the casing of type name '{0}'.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704">
+    <Resolution Name="Member">Correct the spelling of the unrecognized token '{0}' in member name '{1}'.</Resolution>
+    <Resolution Name="MemberOneLetter">Consider providing a more meaningful name than the one-letter token '{0}' in member name '{1}'.</Resolution>
+    <Resolution Name="Namespace">Correct the spelling of the unrecognized token '{0}' in namespace '{1}'.</Resolution>
+    <Resolution Name="Parameter">In method {0}, correct the spelling of the unrecognized token '{1}' in parameter name '{2}' or strip it entirely if it represents any sort of hungarian notation.</Resolution>
+    <Resolution Name="ParameterOneLetter">In method {0}, consider providing a more meaningful name than the one-letter parameter name '{1}'.</Resolution>
+    <Resolution Name="Type">Correct the spelling of the unrecognized token '{0}' in type name '{1}'.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldDifferByMoreThanCase" Category="Microsoft.Naming" CheckId="CA1708">
+    <Resolution Name="Member">Change member names {0} and '{1}' so that they differ by more than case.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707">
+    <Resolution Name="Member">Remove all underscores from member '{0}'.</Resolution>
+    <Resolution Name="Parameter">Remove all underscores from parameter '{0}'.</Resolution>
+    <Resolution Name="Type">Remove all underscores from type '{0}'.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711">
+    <Resolution Name="Default">Rename '{0}' so that it does not end in '{1}'.</Resolution>
+   </Rule>
+   <Rule TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204">
+    <Resolution Name="Default">Correct the spelling of the unrecognized token '{0}' in the literal '{1}'.</Resolution>
+   </Rule>
+   <Rule TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705">
+    <Resolution Name="Member">Correct the capitalization of member name '{0}'.</Resolution>
+    <Resolution Name="Namespace">Correct the capitalization of namespace name '{0}'.</Resolution>
+    <Resolution Name="Parameter">Correct the capitalization of parameter name '{0}'.</Resolution>
+    <Resolution Name="Type">Correct the capitalization of type name '{0}'.</Resolution>
+   </Rule>
+   <Rule TypeName="MarkAssembliesWithAssemblyVersion" Category="Microsoft.Design" CheckId="CA1016">
+    <Resolution Name="Default">Add an AssemblyVersion attribute to '{0}'.</Resolution>
+   </Rule>
+   <Rule TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014">
+    <Resolution Name="NoAttr">'{0}' should be marked with CLSCompliantAttribute and its value should be true.</Resolution>
+   </Rule>
+   <Rule TypeName="MarkAssembliesWithComVisible" Category="Microsoft.Design" CheckId="CA1017">
+    <Resolution Name="NoAttribute">Mark '{0}' as ComVisible(false) at the assembly level, then mark all types within the assembly that should be exposed to Com clients as ComVisible(true).</Resolution>
+   </Rule>
+   <Rule TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822">
+    <Resolution Name="Default">The 'this' parameter (or 'Me' in VB) of {0} is never used. Mark the member as static (or Shared in VB) or use 'this'/'Me' in the method body or at least one property accessor, if appropriate.</Resolution>
+   </Rule>
+   <Rule TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211">
+    <Resolution Name="Default">Consider making '{0}' non-public or a constant.</Resolution>
+   </Rule>
+   <Rule TypeName="OperationsShouldNotOverflow" Category="Microsoft.Usage" CheckId="CA2233">
+    <Resolution Name="Default">Correct the potential overflow in the operation '{0}' in '{1}'.</Resolution>
+   </Rule>
+   <Rule TypeName="OperatorOverloadsHaveNamedAlternates" Category="Microsoft.Usage" CheckId="CA2225">
+    <Resolution Name="Default">Provide a method named '{0}' as a friendly alternate for operator {1}.</Resolution>
+   </Rule>
+   <Rule TypeName="OverloadOperatorEqualsOnOverloadingAddAndSubtract" Category="Microsoft.Design" CheckId="CA1013">
+    <Resolution Name="Default">Consider adding an overload of the equality operator for '{0}' that takes the same parameters as {1}.</Resolution>
+   </Rule>
+   <Rule TypeName="OverrideEqualsAndOperatorEqualsOnValueTypes" Category="Microsoft.Performance" CheckId="CA1815">
+    <Resolution Name="Equals">'{0}' should override Equals.</Resolution>
+    <Resolution Name="op_Equality">'{0}' should override the equality (==) and inequality (!=) operators.</Resolution>
+   </Rule>
+   <Rule TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725">
+    <Resolution Name="Default">Change parameter name '{0}' of method {1} to '{2}' in order to match the identifier as it has been declared in {3}.</Resolution>
+   </Rule>
+   <Rule TypeName="PassSystemUriObjectsInsteadOfStrings" Category="Microsoft.Usage" CheckId="CA2234">
+    <Resolution Name="Default">Modify {0} to call {1} instead of {2}.</Resolution>
+   </Rule>
+   <Rule TypeName="PointersShouldNotBeVisible" Category="Microsoft.Security" CheckId="CA2111">
+    <Resolution Name="Default">Make '{0}' private.</Resolution>
+   </Rule>
+   <Rule TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044">
+    <Resolution Name="Default">Add a property getter to '{0}'.</Resolution>
+   </Rule>
+   <Rule TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804">
+    <Resolution Name="Default">{0} declares a local, '{1}', of type {2}, which is never used or is only assigned to. Use this local or remove it.</Resolution>
+   </Rule>
+   <Rule TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801">
+    <Resolution Name="Default">Parameter '{0}' of {1} is never used. Remove the parameter or use it in the method body.</Resolution>
+   </Rule>
+   <Rule TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706">
+    <Resolution Name="Member">Correct the capitalization of '{0}' in member name '{1}'.</Resolution>
+    <Resolution Name="MemberId">'Id' is an abbreviation and therefore is not subject to acronym casing guidelines. Correct the capitalization of 'ID' in member name '{0}' by changing it to 'Id'.</Resolution>
+    <Resolution Name="ParameterId">'Id' is an abbreviation and therefore is not subject to acronym casing guidelines. Correct the capitalization of '{0}' in parameter name '{1}' by changing it to '{2}'.</Resolution>
+    <Resolution Name="Type">Correct the capitalization of '{0}' in type name '{1}'.</Resolution>
+   </Rule>
+   <Rule TypeName="SpecifyCultureInfo" Category="Microsoft.Globalization" CheckId="CA1304">
+    <Resolution Name="Default">{0} makes a call to {1} that does not explicitly provide a CultureInfo. This should be replaced with a call to {2}.</Resolution>
+   </Rule>
+   <Rule TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305">
+    <Resolution Name="Default">{0} makes a call to {1} that does not explicitly provide an IFormatProvider. This should be replaced with a call to {2}.</Resolution>
+   </Rule>
+   <Rule TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053">
+    <Resolution Name="Default">Remove the public constructors from '{0}'.</Resolution>
+   </Rule>
+   <Rule TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820">
+    <Resolution Name="IsNullOrEmpty">Replace the call to String.{0}({1}) in '{2}' with a call to String.IsNullOrEmpty.</Resolution>
+   </Rule>
+   <Rule TypeName="TypeNamesShouldNotMatchNamespaces" Category="Microsoft.Naming" CheckId="CA1724">
+    <Resolution Name="Default">The type name '{0}' conflicts in whole or in part with the namespace name '{1}'. Change either name to eliminate the conflict.</Resolution>
+   </Rule>
+   <Rule TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001">
+    <Resolution Name="Default">Implement IDisposable on '{0}' as it instantiates members of the following IDisposable types: {1}</Resolution>
+   </Rule>
+   <Rule TypeName="TypesThatOwnNativeResourcesShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1049">
+    <Resolution Name="Default">Implement IDisposable on '{0}'.</Resolution>
+   </Rule>
+   <Rule TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054">
+    <Resolution Name="Default">Change the type of parameter '{0}' of method {1} from string to System.Uri, or provide an overload of {1}, that allows '{0}' to be passed as a System.Uri object.</Resolution>
+   </Rule>
+   <Rule TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726">
+    <Resolution Name="Member">Replace the term '{0}' in member name '{1}' with the preferred alternate '{2}'.</Resolution>
+    <Resolution Name="Type">Replace the term '{0}' in type name '{1}' with the preferred alternate '{2}'.</Resolution>
+   </Rule>
+   <Rule TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024">
+    <Resolution Name="Default">Change '{0}' to a property if appropriate.</Resolution>
+   </Rule>
+   <Rule TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062">
+    <Resolution Name="Default">Validate parameter {0} passed to externally visible method {1}.</Resolution>
+   </Rule>
+  </Rules>
+ </FxCopReport>
+</FxCopProject>
diff --git a/OpenSim.sln b/OpenSim.sln
new file mode 100644
index 0000000..adbae2b
--- /dev/null
+++ b/OpenSim.sln
@@ -0,0 +1,163 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C# Express 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Communications", "OpenSim\Framework\Communications\OpenSim.Framework.Communications.csproj", "{CB52B7E7-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Communications.OGS1", "OpenSim\Framework\Communications.OGS1\OpenSim.Framework.Communications.OGS1.csproj", "{6109024D-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim\Framework\Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.GenericConfig.Xml", "OpenSim\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj", "{C74E4A30-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Servers", "OpenSim\Framework\Servers\OpenSim.Framework.Servers.csproj", "{2CC71860-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.UserManagement", "OpenSim\Framework\UserManager\OpenSim.Framework.UserManagement.csproj", "{586E2916-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caches", "OpenSim\Region\Caches\OpenSim.Region.Caches.csproj", "{61FCCDB3-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.ClientStack", "OpenSim\Region\ClientStack\OpenSim.Region.ClientStack.csproj", "{DC3698B2-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Remote", "OpenSim\Region\GridInterfaces\Remote\OpenSim.Region.GridInterfaces.Remote.csproj", "{98C7B681-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.LocalCommunications", "OpenSim\Region\LocalCommunications\OpenSim.Region.LocalCommunications.csproj", "{EB3A1BA8-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.BasicPhysicsPlugin", "OpenSim\Region\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj", "{15B4FEF3-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.Manager", "OpenSim\Region\Physics\Manager\OpenSim.Region.Physics.Manager.csproj", "{F4FF31EB-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.OdePlugin", "OpenSim\Region\Physics\OdePlugin\OpenSim.Region.Physics.OdePlugin.csproj", "{90620634-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.PhysXPlugin", "OpenSim\Region\Physics\PhysXPlugin\OpenSim.Region.Physics.PhysXPlugin.csproj", "{A6D191D8-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Simulation", "OpenSim\Region\Simulation\OpenSim.Region.Simulation.csproj", "{C0DAB338-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageBerkeleyDB", "OpenSim\Region\Storage\LocalStorageBerkeleyDB\OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj", "{A4691E59-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageDb4o", "OpenSim\Region\Storage\LocalStorageDb4o\OpenSim.Region.Storage.LocalStorageDb4o.csproj", "{43DB702D-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageSQLite", "OpenSim\Region\Storage\LocalStorageSQLite\OpenSim.Region.Storage.LocalStorageSQLite.csproj", "{477B9270-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Terrain.BasicTerrain", "OpenSim\Region\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj", "{C9E0F891-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-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
+		{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
+		{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
+		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6109024D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6109024D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6109024D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6109024D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{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
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB3A1BA8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB3A1BA8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB3A1BA8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB3A1BA8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0DAB338-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0DAB338-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0DAB338-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0DAB338-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/OpenSim.suo b/OpenSim.suo
new file mode 100644
index 0000000..765dc63
Binary files /dev/null and b/OpenSim.suo differ
diff --git a/OpenSim/Framework/Communications.OGS1/GridCommsManager.cs b/OpenSim/Framework/Communications.OGS1/GridCommsManager.cs
new file mode 100644
index 0000000..6687380
--- /dev/null
+++ b/OpenSim/Framework/Communications.OGS1/GridCommsManager.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Framework.Communications.OGS1
+{
+    public class GridCommsManager : CommunicationsManager
+    {
+        private OGS1GridServices gridInterComms = new OGS1GridServices();
+        public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
+        {
+            GridServer = gridInterComms;
+            InterRegion = gridInterComms;
+            UserServer = new OGSUserServices();
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications.OGS1/OGS1GridServices.cs b/OpenSim/Framework/Communications.OGS1/OGS1GridServices.cs
new file mode 100644
index 0000000..408643f
--- /dev/null
+++ b/OpenSim/Framework/Communications.OGS1/OGS1GridServices.cs
@@ -0,0 +1,248 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Text;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Channels;
+using System.Runtime.Remoting.Channels.Tcp;
+
+using OpenSim.Servers;
+using OpenSim.Framework;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+
+using Nwc.XmlRpc;
+using libsecondlife;
+
+namespace OpenSim.Framework.Communications.OGS1
+{
+    public class OGS1GridServices : IGridServices, IInterRegionCommunications
+    {
+        public Dictionary<ulong, RegionCommsListener> listeners = new Dictionary<ulong, RegionCommsListener>();
+        public GridInfo grid;
+        public BaseHttpServer httpListener;
+        private bool initialised = false;
+
+        public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo)
+        {
+            Hashtable GridParams = new Hashtable();
+
+            grid = gridInfo;
+
+            // Login / Authentication
+            GridParams["authkey"] = gridInfo.GridServerSendKey;
+            GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();
+            GridParams["sim_ip"] = regionInfo.CommsExternalAddress;
+            GridParams["sim_port"] = regionInfo.CommsIPListenPort.ToString();
+
+            // Package into an XMLRPC Request
+            ArrayList SendParams = new ArrayList(); 
+            SendParams.Add(GridParams);
+
+            // Send Request
+            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
+            XmlRpcResponse GridResp = GridReq.Send(gridInfo.GridServerURI, 3000);
+            Hashtable GridRespData = (Hashtable)GridResp.Value;
+            Hashtable griddatahash = GridRespData;
+
+            // Process Response
+            if (GridRespData.ContainsKey("error"))
+            {
+                string errorstring = (string)GridRespData["error"];
+                OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
+                return null;
+            }  
+
+            if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
+            {
+               // initialised = true;
+                httpListener = new BaseHttpServer(regionInfo.CommsIPListenPort);
+                httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);
+                httpListener.Start();
+            }
+
+            // Initialise the background listeners
+            listeners[regionInfo.RegionHandle] = new RegionCommsListener();
+
+            return listeners[regionInfo.RegionHandle];
+        }
+
+        public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
+        {
+            Hashtable respData = MapBlockQuery((int)regionInfo.RegionLocX - 1, (int)regionInfo.RegionLocY - 1, (int)regionInfo.RegionLocX + 1, (int)regionInfo.RegionLocY + 1);
+
+            List<RegionInfo> neighbours = new List<RegionInfo>();
+
+            foreach (Hashtable n in (Hashtable)respData.Values)
+            {
+                RegionInfo neighbour = new RegionInfo();
+
+                //OGS1
+                neighbour.RegionHandle = (ulong)n["regionhandle"];
+                neighbour.RegionLocX = (uint)n["x"];
+                neighbour.RegionLocY = (uint)n["y"];
+                neighbour.RegionName = (string)n["name"];
+
+                //OGS1+
+                neighbour.CommsIPListenAddr = (string)n["sim_ip"];
+                neighbour.CommsIPListenPort = (int)n["sim_port"];
+                neighbour.CommsExternalAddress = (string)n["sim_uri"];
+                neighbour.SimUUID = (string)n["uuid"];
+
+                neighbours.Add(neighbour);
+            }
+
+            return neighbours;
+        }
+
+        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");
+            return null;
+        }
+
+        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
+        {
+            Hashtable respData = MapBlockQuery(minX, minY, maxX, maxY);
+
+            List<MapBlockData> neighbours = new List<MapBlockData>();
+
+            foreach (Hashtable n in (Hashtable)respData.Values)
+            {
+                MapBlockData neighbour = new MapBlockData();
+
+                neighbour.X = (ushort)n["x"];
+                neighbour.Y = (ushort)n["y"];
+
+                neighbour.Name = (string)n["name"];
+                neighbour.Access = (byte)n["access"];
+                neighbour.RegionFlags = (uint)n["region-flags"];
+                neighbour.WaterHeight = (byte)n["water-height"];
+                neighbour.MapImageId = (string)n["map-image-id"];
+
+                neighbours.Add(neighbour);
+            }
+
+            return neighbours;
+        }
+
+        /// <summary>
+        /// Performs a XML-RPC query against the grid server returning mapblock information in the specified coordinates
+        /// </summary>
+        /// <remarks>REDUNDANT - OGS1 is to be phased out in favour of OGS2</remarks>
+        /// <param name="minX">Minimum X value</param>
+        /// <param name="minY">Minimum Y value</param>
+        /// <param name="maxX">Maximum X value</param>
+        /// <param name="maxY">Maximum Y value</param>
+        /// <returns>Hashtable of hashtables containing map data elements</returns>
+        private Hashtable MapBlockQuery(int minX, int minY, int maxX, int maxY)
+        {
+            Hashtable param = new Hashtable();
+            param["xmin"] = minX;
+            param["ymin"] = minY;
+            param["xmax"] = maxX;
+            param["ymax"] = maxY;
+            IList parameters = new ArrayList();
+            parameters.Add(param);
+            XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);
+            XmlRpcResponse resp = req.Send(grid.GridServerURI, 3000);
+            Hashtable respData = (Hashtable)resp.Value;
+            return respData;
+        }
+
+        // Grid Request Processing
+        public XmlRpcResponse ExpectUser(XmlRpcRequest request)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            AgentCircuitData agentData = new AgentCircuitData();
+            agentData.SessionID = new LLUUID((string)requestData["session_id"]);
+            agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
+            agentData.firstname = (string)requestData["firstname"];
+            agentData.lastname = (string)requestData["lastname"];
+            agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
+            agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
+            if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
+            {
+                agentData.child = true;
+            }
+            else
+            {
+                agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
+                agentData.child = false;
+
+            }
+
+            if (listeners.ContainsKey((ulong)requestData["regionhandle"]))
+            {
+                this.listeners[(ulong)requestData["regionhandle"]].TriggerExpectUser((ulong)requestData["regionhandle"], agentData);
+            }
+            else
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
+            }
+
+            return new XmlRpcResponse();
+        }
+
+        #region InterRegion Comms
+        private void StartRemoting()
+        {
+            TcpChannel ch = new TcpChannel(8895);
+            ChannelServices.RegisterChannel(ch);
+
+            WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton);
+            RemotingConfiguration.RegisterWellKnownServiceType(wellType);
+            InterRegionSingleton.Instance.OnArrival += this.IncomingArrival;
+            InterRegionSingleton.Instance.OnChildAgent += this.IncomingChildAgent;
+        }
+
+        #region Methods called by regions in this instance
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            if (this.listeners.ContainsKey(regionHandle))
+            {
+                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
+                return true;
+            }
+            //TODO need to see if we know about where this region is and use .net remoting 
+            // to inform it. 
+            return false;
+        }
+
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (this.listeners.ContainsKey(regionHandle))
+            {
+                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
+                return true;
+            }
+            //TODO need to see if we know about where this region is and use .net remoting 
+            // to inform it. 
+            return false;
+        }
+        #endregion
+
+        #region Methods triggered by calls from external instances
+        public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            if (this.listeners.ContainsKey(regionHandle))
+            {
+                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
+                return true;
+            }
+            return false;
+        }
+
+        public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (this.listeners.ContainsKey(regionHandle))
+            {
+                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
+                return true;
+            }
+            return false;
+        }
+        #endregion
+        #endregion
+    }
+}
diff --git a/OpenSim/Framework/Communications.OGS1/OGSInterSimComms.cs b/OpenSim/Framework/Communications.OGS1/OGSInterSimComms.cs
new file mode 100644
index 0000000..8ba257e
--- /dev/null
+++ b/OpenSim/Framework/Communications.OGS1/OGSInterSimComms.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Framework.Communications.OGS1
+{
+    public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
+    public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
+
+    public sealed class InterRegionSingleton
+    {
+        static readonly InterRegionSingleton instance = new InterRegionSingleton();
+
+        public event InformRegionChild OnChildAgent;
+        public event ExpectArrival OnArrival;
+
+        static InterRegionSingleton()
+        {
+        }
+
+        InterRegionSingleton()
+        {
+        }
+
+        public static InterRegionSingleton Instance
+        {
+            get
+            {
+                return instance;
+            }
+        }
+
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            if (OnChildAgent != null)
+            {
+                return OnChildAgent(regionHandle, agentData);
+            }
+            return false;
+        }
+
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (OnArrival != null)
+            {
+                return OnArrival(regionHandle, agentID, position);
+            }
+            return false;
+        }
+    }
+
+    public class OGS1InterRegionRemoting : MarshalByRefObject
+    {
+
+        public OGS1InterRegionRemoting()
+        {
+        }
+
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
+        }
+
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications.OGS1/OGSUserServices.cs b/OpenSim/Framework/Communications.OGS1/OGSUserServices.cs
new file mode 100644
index 0000000..ff5fbbb
--- /dev/null
+++ b/OpenSim/Framework/Communications.OGS1/OGSUserServices.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Data;
+using libsecondlife;
+
+namespace OpenSim.Framework.Communications.OGS1
+{
+    public class OGSUserServices :IUserServices
+    {
+        public UserProfileData GetUserProfile(string firstName, string lastName)
+        {
+            return null;
+        }
+        public UserProfileData GetUserProfile(string name)
+        {
+            return null;
+        }
+        public UserProfileData GetUserProfile(LLUUID avatarID)
+        {
+            return null;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj b/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj
new file mode 100644
index 0000000..3985ee5
--- /dev/null
+++ b/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj
@@ -0,0 +1,142 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6109024D-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Communications.OGS1</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Communications.OGS1</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting" >
+      <HintPath>System.Runtime.Remoting.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Communications\OpenSim.Framework.Communications.csproj">
+      <Name>OpenSim.Framework.Communications</Name>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GridCommsManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OGS1GridServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OGSInterSimComms.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OGSUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj.user b/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/Communications.OGS1/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications.OGS1/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0c6f965
--- /dev/null
+++ b/OpenSim/Framework/Communications.OGS1/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenGrid.Framework.Communications.OGS1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a8b2b39b-c83b-41e2-b0b5-7ccfc1fddae7")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
new file mode 100644
index 0000000..74d12d2
--- /dev/null
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -0,0 +1,51 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using libsecondlife;
+
+namespace OpenSim.Framework.Communications
+{
+ 
+    public class CommunicationsManager
+    {
+        public IUserServices UserServer;
+        public IGridServices GridServer;
+        public IInterRegionCommunications InterRegion;
+
+        public CommunicationsManager(NetworkServersInfo serversInfo)
+        {
+            
+        }
+    }
+}
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
new file mode 100644
index 0000000..a4812fb
--- /dev/null
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -0,0 +1,51 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework;
+
+namespace OpenSim.Framework.Communications
+{
+    public class GridInfo
+    {
+        public string GridServerURI = "http://grid.deepgrid.com:8001/"; // Temporarily hardcoded.
+        public string GridServerSendKey = "badger";
+        public string GridServerRecvKey = "badger";
+    }
+
+    public interface IGridServices
+    {
+        RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo);
+        List<RegionInfo> RequestNeighbours(RegionInfo regionInfo);
+        RegionInfo RequestNeighbourInfo(ulong regionHandle);
+        List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
+    }
+}
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
new file mode 100644
index 0000000..7b0d340
--- /dev/null
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -0,0 +1,41 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework;
+
+namespace OpenSim.Framework.Communications
+{
+    public  interface IInterRegionCommunications
+    {
+         bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
+         bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 
+    }
+}
diff --git a/OpenSim/Framework/Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
new file mode 100644
index 0000000..6790651
--- /dev/null
+++ b/OpenSim/Framework/Communications/IUserServices.cs
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+using OpenSim.Framework.Data;
+
+namespace OpenSim.Framework.Communications
+{
+    public interface IUserServices
+    {
+        UserProfileData GetUserProfile(string firstName, string lastName);
+        UserProfileData GetUserProfile(string name);
+        UserProfileData GetUserProfile(LLUUID avatarID);
+        
+    }
+}
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
new file mode 100644
index 0000000..31ab172
--- /dev/null
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -0,0 +1,112 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CB52B7E7-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Communications</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Communications</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CommunicationsManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IGridServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IInterRegionCommunications.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj.user b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..83e7dd4
--- /dev/null
+++ b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
@@ -0,0 +1,62 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenGrid.Framework.Communications")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenGrid.Framework.Communications")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("13e7c396-78a9-4a5c-baf2-6f980ea75d95")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
new file mode 100644
index 0000000..8f715d2
--- /dev/null
+++ b/OpenSim/Framework/Console/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("ServerConsole")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ServerConsole")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
new file mode 100644
index 0000000..e3847be
--- /dev/null
+++ b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
@@ -0,0 +1,39 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Console
+{    
+    public interface conscmd_callback
+    {
+        void RunCmd(string cmd, string[] cmdparams);
+        void Show(string ShowWhat);
+    }
+}
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
new file mode 100644
index 0000000..1a92d8e
--- /dev/null
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -0,0 +1,238 @@
+/*
+* 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.IO;
+
+namespace OpenSim.Framework.Console
+{
+    public enum LogPriority : int
+    {
+        CRITICAL,
+        HIGH,
+        MEDIUM,
+        NORMAL,
+        LOW,
+        VERBOSE,
+        EXTRAVERBOSE
+    }
+
+    public class LogBase
+    {
+        StreamWriter Log;
+        public conscmd_callback cmdparser;
+        public string componentname;
+        private bool m_silent;
+
+        public LogBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )
+        {
+            this.componentname = componentname;
+            this.cmdparser = cmdparser;
+            this.m_silent = silent;
+            System.Console.WriteLine("ServerConsole.cs - creating new local console");
+            
+            if( String.IsNullOrEmpty( LogFile ) )
+            {
+                LogFile = componentname + ".log";
+            }
+            
+            System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
+            Log = File.AppendText(LogFile);
+            Log.WriteLine("========================================================================");
+            Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());
+        }
+
+        public void Close()
+        {
+            Log.WriteLine("Shutdown at " + DateTime.Now.ToString());
+            Log.Close();
+        }
+
+        public void Write(string format, params object[] args)
+        {
+            Notice(format,args);
+            return;
+        }
+         
+        public void WriteLine(LogPriority importance, string format, params object[] args)
+        {
+            Log.WriteLine(format, args);
+            Log.Flush();
+            if (!m_silent)
+            {
+                System.Console.WriteLine(format, args);
+            }
+            return;
+        }
+
+        public void Warn(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.Yellow, format, args);
+            return;
+        }
+
+        public void Notice(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.White, format, args);
+            return;
+        }
+
+        public void Error(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.Red, format, args);
+            return;
+        }
+
+        public void Verbose(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.Gray, format, args);
+            return;
+        }
+
+        public void Status(string format, params object[] args)
+        {
+            WriteNewLine(ConsoleColor.Blue, format, args);
+            return;
+        }
+
+        private void WriteNewLine(System.ConsoleColor color, string format, params object[] args)
+        {
+            Log.WriteLine(format, args);
+            Log.Flush();
+            if (!m_silent)
+            {
+                try
+                {
+                    System.Console.ForegroundColor = color;
+                    System.Console.WriteLine(format, args);
+                    System.Console.ResetColor();
+                }
+                catch (System.ArgumentNullException)
+                {
+                    // Some older systems dont support coloured text.
+                    System.Console.WriteLine(format, args);
+                }
+            }
+            return;
+        }
+
+        public string ReadLine()
+        {
+            string TempStr = System.Console.ReadLine();
+            Log.WriteLine(TempStr);
+            return TempStr;
+        }
+
+        public int Read()
+        {
+            int TempInt = System.Console.Read();
+            Log.Write((char)TempInt);
+            return TempInt;
+        }
+
+        // Displays a prompt and waits for the user to enter a string, then returns that string
+        // Done with no echo and suitable for passwords
+        public string PasswdPrompt(string prompt)
+        {
+            // FIXME: Needs to be better abstracted
+            Log.WriteLine(prompt);
+            this.Write(prompt);
+            ConsoleColor oldfg = System.Console.ForegroundColor;
+            System.Console.ForegroundColor = System.Console.BackgroundColor;
+            string temp = System.Console.ReadLine();
+            System.Console.ForegroundColor = oldfg;
+            return temp;
+        }
+
+        // Displays a command prompt and waits for the user to enter a string, then returns that string
+        public string CmdPrompt(string prompt)
+        {
+            this.Write(String.Format("{0}: ", prompt));
+            return this.ReadLine();
+        }
+
+        // Displays a command prompt and returns a default value if the user simply presses enter
+        public string CmdPrompt(string prompt, string defaultresponse)
+        {
+            string temp = CmdPrompt(String.Format( "{0} [{1}]", prompt, defaultresponse ));
+            if (temp == "")
+            {
+                return defaultresponse;
+            }
+            else
+            {
+                return temp;
+            }
+        }
+
+        // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
+        public string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB)
+        {
+            bool itisdone = false;
+            string temp = CmdPrompt(prompt, defaultresponse);
+            while (itisdone == false)
+            {
+                if ((temp == OptionA) || (temp == OptionB))
+                {
+                    itisdone = true;
+                }
+                else
+                {
+                    Notice("Valid options are " + OptionA + " or " + OptionB);
+                    temp = CmdPrompt(prompt, defaultresponse);
+                }
+            }
+            return temp;
+        }
+
+        // Runs a command with a number of parameters
+        public Object RunCmd(string Cmd, string[] cmdparams)
+        {
+            cmdparser.RunCmd(Cmd, cmdparams);
+            return null;
+        }
+
+        // Shows data about something
+        public void ShowCommands(string ShowWhat)
+        {
+            cmdparser.Show(ShowWhat);
+        }
+
+        public void MainLogPrompt()
+        {
+            string[] tempstrarray;
+            string tempstr = this.CmdPrompt(this.componentname + "# ");
+            tempstrarray = tempstr.Split(' ');
+            string cmd = tempstrarray[0];
+            Array.Reverse(tempstrarray);
+            Array.Resize<string>(ref tempstrarray, tempstrarray.Length - 1);
+            Array.Reverse(tempstrarray);
+            string[] cmdparams = (string[])tempstrarray;
+            RunCmd(cmd, cmdparams);
+        }
+    }
+}
diff --git a/OpenSim/Framework/Console/MainLog.cs b/OpenSim/Framework/Console/MainLog.cs
new file mode 100644
index 0000000..d7f945e
--- /dev/null
+++ b/OpenSim/Framework/Console/MainLog.cs
@@ -0,0 +1,49 @@
+/*
+* 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;
+
+namespace OpenSim.Framework.Console
+{
+	public class MainLog {
+		
+		private static LogBase instance;
+		
+		public static LogBase Instance 
+		{
+			get 
+			{
+				return instance;
+			}
+			set
+			{
+				instance = value;
+			}
+		}
+    }
+
+}
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
new file mode 100644
index 0000000..f3dcec5
--- /dev/null
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -0,0 +1,89 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Console</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Console</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ConsoleCallbacksBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LogBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainLog.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj.user b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
new file mode 100644
index 0000000..dc8488e
--- /dev/null
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -0,0 +1,166 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Data;
+using libsecondlife;
+
+
+namespace OpenSim.Framework.Data.DB4o
+{
+    /// <summary>
+    /// A grid server storage mechanism employing the DB4o database system
+    /// </summary>
+    class DB4oGridData : IGridData
+    {
+        /// <summary>
+        /// The database manager object
+        /// </summary>
+        DB4oGridManager manager;
+
+        /// <summary>
+        /// Called when the plugin is first loaded (as constructors are not called)
+        /// </summary>
+        public void Initialise() {
+             manager = new DB4oGridManager("gridserver.yap");
+        }
+
+        /// <summary>
+        /// Returns a list of regions within the specified ranges
+        /// </summary>
+        /// <param name="a">minimum X coordinate</param>
+        /// <param name="b">minimum Y coordinate</param>
+        /// <param name="c">maximum X coordinate</param>
+        /// <param name="d">maximum Y coordinate</param>
+        /// <returns>An array of region profiles</returns>
+        public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a region located at the specified regionHandle (warning multiple regions may occupy the one spot, first found is returned)
+        /// </summary>
+        /// <param name="handle">The handle to search for</param>
+        /// <returns>A region profile</returns>
+        public SimProfileData GetProfileByHandle(ulong handle) {
+            lock (manager.simProfiles)
+            {
+                foreach (LLUUID UUID in manager.simProfiles.Keys)
+                {
+                    if (manager.simProfiles[UUID].regionHandle == handle)
+                    {
+                        return manager.simProfiles[UUID];
+                    }
+                }
+            }
+            throw new Exception("Unable to find profile with handle (" + handle.ToString() + ")");
+        }
+
+        /// <summary>
+        /// Returns a specific region
+        /// </summary>
+        /// <param name="uuid">The region ID code</param>
+        /// <returns>A region profile</returns>
+        public SimProfileData GetProfileByLLUUID(LLUUID uuid)
+        {
+            lock (manager.simProfiles)
+            {
+                if (manager.simProfiles.ContainsKey(uuid))
+                    return manager.simProfiles[uuid];
+            }
+            throw new Exception("Unable to find profile with UUID (" + uuid.ToStringHyphenated() + ")");
+        }
+
+        /// <summary>
+        /// Adds a new specified region to the database
+        /// </summary>
+        /// <param name="profile">The profile to add</param>
+        /// <returns>A dataresponse enum indicating success</returns>
+        public DataResponse AddProfile(SimProfileData profile)
+        {
+            lock (manager.simProfiles)
+            {
+                if (manager.AddRow(profile))
+                {
+                    return DataResponse.RESPONSE_OK;
+                }
+                else
+                {
+                    return DataResponse.RESPONSE_ERROR;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Authenticates a new region using the shared secrets. NOT SECURE.
+        /// </summary>
+        /// <param name="uuid">The UUID the region is authenticating with</param>
+        /// <param name="handle">The location the region is logging into (unused in Db4o)</param>
+        /// <param name="key">The shared secret</param>
+        /// <returns>Authenticated?</returns>
+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string key) {
+            if (manager.simProfiles[uuid].regionRecvKey == key)
+                return true;
+            return false;
+        }
+
+        /// <summary>
+        /// Shuts down the database
+        /// </summary>
+        public void Close()
+        {
+            manager = null;
+        }
+
+        /// <summary>
+        /// Returns the providers name
+        /// </summary>
+        /// <returns>The name of the storage system</returns>
+        public string getName()
+        {
+            return "DB4o Grid Provider";
+        }
+
+        /// <summary>
+        /// Returns the providers version
+        /// </summary>
+        /// <returns>The version of the storage system</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+
+        public ReservationData GetReservationAtPoint(uint x, uint y)
+        {
+            return null;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
new file mode 100644
index 0000000..3870a8c
--- /dev/null
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -0,0 +1,165 @@
+/*
+* 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 Db4objects.Db4o;
+using OpenSim.Framework.Data;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data.DB4o
+{
+    /// <summary>
+    /// A Database manager for Db4o
+    /// </summary>
+    class DB4oGridManager
+    {
+        /// <summary>
+        /// A list of the current regions connected (in-memory cache)
+        /// </summary>
+        public Dictionary<LLUUID, SimProfileData> simProfiles = new Dictionary<LLUUID, SimProfileData>();
+        /// <summary>
+        /// Database File Name
+        /// </summary>
+        string dbfl;
+
+        /// <summary>
+        /// Creates a new grid storage manager
+        /// </summary>
+        /// <param name="db4odb">Filename to the database file</param>
+        public DB4oGridManager(string db4odb)
+        {
+            dbfl = db4odb;
+            IObjectContainer database;
+            database = Db4oFactory.OpenFile(dbfl);
+            IObjectSet result = database.Get(typeof(SimProfileData));
+            // Loads the file into the in-memory cache
+            foreach(SimProfileData row in result) {
+                simProfiles.Add(row.UUID, row);
+            }
+            database.Close();
+        }
+
+        /// <summary>
+        /// Adds a new profile to the database (Warning: Probably slow.)
+        /// </summary>
+        /// <param name="row">The profile to add</param>
+        /// <returns>Successful?</returns>
+        public bool AddRow(SimProfileData row)
+        {
+            if (simProfiles.ContainsKey(row.UUID))
+            {
+                simProfiles[row.UUID] = row;
+            }
+            else
+            {
+                simProfiles.Add(row.UUID, row);
+            }
+
+            try
+            {
+                IObjectContainer database;
+                database = Db4oFactory.OpenFile(dbfl);
+                database.Set(row);
+                database.Close();
+                return true;
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+        }
+
+
+    }
+
+    /// <summary>
+    /// A manager for the DB4o database (user profiles)
+    /// </summary>
+    class DB4oUserManager
+    {
+        /// <summary>
+        /// A list of the user profiles (in memory cache)
+        /// </summary>
+        public Dictionary<LLUUID, UserProfileData> userProfiles = new Dictionary<LLUUID, UserProfileData>();
+        /// <summary>
+        /// Database filename
+        /// </summary>
+        string dbfl;
+
+        /// <summary>
+        /// Initialises a new DB manager
+        /// </summary>
+        /// <param name="db4odb">The filename to the database</param>
+        public DB4oUserManager(string db4odb)
+        {
+            dbfl = db4odb;
+            IObjectContainer database;
+            database = Db4oFactory.OpenFile(dbfl);
+            // Load to cache
+            IObjectSet result = database.Get(typeof(UserProfileData));
+            foreach (UserProfileData row in result)
+            {
+                userProfiles.Add(row.UUID, row);
+            }
+            database.Close();
+        }
+
+        /// <summary>
+        /// Adds a new profile to the database (Warning: Probably slow.)
+        /// </summary>
+        /// <param name="row">The profile to add</param>
+        /// <returns>Successful?</returns>
+        public bool AddRow(UserProfileData row)
+        { 
+            if (userProfiles.ContainsKey(row.UUID))
+            {
+                userProfiles[row.UUID] = row;
+            }
+            else
+            {
+                userProfiles.Add(row.UUID, row);
+            }
+
+            try
+            {
+                IObjectContainer database;
+                database = Db4oFactory.OpenFile(dbfl);
+                database.Set(row);
+                database.Close();
+                return true;
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+        }
+
+
+    }
+}
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
new file mode 100644
index 0000000..8caa75d
--- /dev/null
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -0,0 +1,205 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Data;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data.DB4o
+{
+    /// <summary>
+    /// A User storage interface for the DB4o database system
+    /// </summary>
+    public class DB4oUserData : IUserData
+    {
+        /// <summary>
+        /// The database manager
+        /// </summary>
+        DB4oUserManager manager;
+
+        /// <summary>
+        /// Artificial constructor called upon plugin load
+        /// </summary>
+        public void Initialise()
+        {
+            manager = new DB4oUserManager("userprofiles.yap");
+        }
+
+        /// <summary>
+        /// Loads a specified user profile from a UUID
+        /// </summary>
+        /// <param name="uuid">The users UUID</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData getUserByUUID(LLUUID uuid)
+        {
+            if(manager.userProfiles.ContainsKey(uuid))
+                return manager.userProfiles[uuid];
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a user by searching for its name
+        /// </summary>
+        /// <param name="name">The users account name</param>
+        /// <returns>A matching users profile</returns>
+        public UserProfileData getUserByName(string name)
+        {
+            return getUserByName(name.Split(' ')[0], name.Split(' ')[1]);
+        }
+
+        /// <summary>
+        /// Returns a user by searching for its name
+        /// </summary>
+        /// <param name="fname">The first part of the users account name</param>
+        /// <param name="lname">The second part of the users account name</param>
+        /// <returns>A matching users profile</returns>
+        public UserProfileData getUserByName(string fname, string lname)
+        {
+            foreach (UserProfileData profile in manager.userProfiles.Values)
+            {
+                if (profile.username == fname && profile.surname == lname)
+                    return profile;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a user by UUID direct
+        /// </summary>
+        /// <param name="uuid">The users account ID</param>
+        /// <returns>A matching users profile</returns>
+        public UserAgentData getAgentByUUID(LLUUID uuid)
+        {   
+            try
+            {
+                return getUserByUUID(uuid).currentAgent;
+            }
+            catch (Exception e)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a session by account name
+        /// </summary>
+        /// <param name="name">The account name</param>
+        /// <returns>The users session agent</returns>
+        public UserAgentData getAgentByName(string name)
+        {
+            return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
+        }
+
+        /// <summary>
+        /// Returns a session by account name
+        /// </summary>
+        /// <param name="fname">The first part of the users account name</param>
+        /// <param name="lname">The second part of the users account name</param>
+        /// <returns>A user agent</returns>
+        public UserAgentData getAgentByName(string fname, string lname)
+        {
+            try
+            {
+                return getUserByName(fname,lname).currentAgent;
+            }
+            catch (Exception e)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new user profile
+        /// </summary>
+        /// <param name="user">The profile to add to the database</param>
+        public void addNewUserProfile(UserProfileData user)
+        {
+            try
+            {
+                manager.AddRow(user);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Creates a new user agent
+        /// </summary>
+        /// <param name="agent">The agent to add to the database</param>
+        public void addNewUserAgent(UserAgentData agent)
+        {
+            // Do nothing. yet.
+        }
+
+        /// <summary>
+        /// Transfers money between two user accounts
+        /// </summary>
+        /// <param name="from">Starting account</param>
+        /// <param name="to">End account</param>
+        /// <param name="amount">The amount to move</param>
+        /// <returns>Success?</returns>
+        public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Transfers inventory between two accounts
+        /// </summary>
+        /// <remarks>Move to inventory server</remarks>
+        /// <param name="from">Senders account</param>
+        /// <param name="to">Recievers account</param>
+        /// <param name="item">Inventory item</param>
+        /// <returns>Success?</returns>
+        public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Returns the name of the storage provider
+        /// </summary>
+        /// <returns>Storage provider name</returns>
+        public string getName()
+        {
+            return "DB4o Userdata";
+        }
+
+        /// <summary>
+        /// Returns the version of the storage provider
+        /// </summary>
+        /// <returns>Storage provider version</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
new file mode 100644
index 0000000..b09cecf
--- /dev/null
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -0,0 +1,111 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FD2D303D-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Data.DB4o</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Data.DB4o</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="DB4oGridData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DB4oManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DB4oUserData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj.user b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..dc4a9a1
--- /dev/null
+++ b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenGrid.Framework.Data.DB4o")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenGrid.Framework.Data.DB4o")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("57991e15-79da-41b7-aa06-2e6b49165a63")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
new file mode 100644
index 0000000..1dac4bd
--- /dev/null
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
@@ -0,0 +1,192 @@
+/*
+* 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 OpenGrid.Framework.Data;
+
+namespace OpenGrid.Framework.Data.MSSQL
+{
+    /// <summary>
+    /// A grid data interface for Microsoft SQL Server
+    /// </summary>
+    public class SqlGridData : IGridData
+    {
+        /// <summary>
+        /// Database manager
+        /// </summary>
+        private MSSqlManager database;
+
+        /// <summary>
+        /// Initialises the Grid Interface
+        /// </summary>
+        public void Initialise()
+        {
+            database = new MSSqlManager("localhost", "db", "user", "password", "false");
+        }
+
+        /// <summary>
+        /// Shuts down the grid interface
+        /// </summary>
+        public void Close()
+        {
+            database.Close();
+        }
+
+        /// <summary>
+        /// Returns the storage system name
+        /// </summary>
+        /// <returns>A string containing the storage system name</returns>
+        public string getName()
+        {
+            return "Sql OpenGridData";
+        }
+
+        /// <summary>
+        /// Returns the storage system version
+        /// </summary>
+        /// <returns>A string containing the storage system version</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+
+        /// <summary>
+        /// Returns a list of regions within the specified ranges
+        /// </summary>
+        /// <param name="a">minimum X coordinate</param>
+        /// <param name="b">minimum Y coordinate</param>
+        /// <param name="c">maximum X coordinate</param>
+        /// <param name="d">maximum Y coordinate</param>
+        /// <returns>An array of region profiles</returns>
+        public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a sim profile from it's location
+        /// </summary>
+        /// <param name="handle">Region location handle</param>
+        /// <returns>Sim profile</returns>
+        public SimProfileData GetProfileByHandle(ulong handle)
+        {
+            Dictionary<string, string> param = new Dictionary<string, string>();
+            param["handle"] = handle.ToString();
+
+            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
+            System.Data.IDataReader reader = result.ExecuteReader();
+
+            SimProfileData row = database.getRow(reader);
+            reader.Close();
+            result.Dispose();
+
+            return row;
+        }
+
+        /// <summary>
+        /// Returns a sim profile from it's UUID
+        /// </summary>
+        /// <param name="uuid">The region UUID</param>
+        /// <returns>The sim profile</returns>
+        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)
+        {
+            Dictionary<string, string> param = new Dictionary<string, string>();
+            param["uuid"] = uuid.ToStringHyphenated();
+
+            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
+            System.Data.IDataReader reader = result.ExecuteReader();
+
+            SimProfileData row = database.getRow(reader);
+            reader.Close();
+            result.Dispose();
+
+            return row;
+        }
+
+        /// <summary>
+        /// Adds a new specified region to the database
+        /// </summary>
+        /// <param name="profile">The profile to add</param>
+        /// <returns>A dataresponse enum indicating success</returns>
+        public DataResponse AddProfile(SimProfileData profile)
+        {
+            if (database.insertRow(profile))
+            {
+                return DataResponse.RESPONSE_OK;
+            }
+            else
+            {
+                return DataResponse.RESPONSE_ERROR;
+            }
+        }
+
+        /// <summary>
+        /// DEPRECIATED. Attempts to authenticate a region by comparing a shared secret.
+        /// </summary>
+        /// <param name="uuid">The UUID of the challenger</param>
+        /// <param name="handle">The attempted regionHandle of the challenger</param>
+        /// <param name="authkey">The secret</param>
+        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
+        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)
+        {
+            bool throwHissyFit = false; // Should be true by 1.0
+
+            if (throwHissyFit)
+                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
+
+            SimProfileData data = GetProfileByLLUUID(uuid);
+
+            return (handle == data.regionHandle && authkey == data.regionSecret);
+        }
+
+        /// <summary>
+        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
+        /// </summary>
+        /// <remarks>This requires a security audit.</remarks>
+        /// <param name="uuid"></param>
+        /// <param name="handle"></param>
+        /// <param name="authhash"></param>
+        /// <param name="challenge"></param>
+        /// <returns></returns>
+        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)
+        {
+            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();
+            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
+
+            byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
+            byte[] hash = HashProvider.ComputeHash(stream);
+            return false;
+        }
+        public ReservationData GetReservationAtPoint(uint x, uint y)
+        {
+            return null;
+        }
+    }
+    
+}
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
new file mode 100644
index 0000000..475a3e7
--- /dev/null
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -0,0 +1,214 @@
+/*
+* 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.Data;
+
+using System.Data.SqlClient;
+
+using OpenGrid.Framework.Data;
+
+namespace OpenGrid.Framework.Data.MSSQL
+{
+    /// <summary>
+    /// A management class for the MS SQL Storage Engine
+    /// </summary>
+    class MSSqlManager
+    {
+        /// <summary>
+        /// The database connection object
+        /// </summary>
+        IDbConnection dbcon;
+
+        /// <summary>
+        /// Initialises and creates a new Sql connection and maintains it.
+        /// </summary>
+        /// <param name="hostname">The Sql server being connected to</param>
+        /// <param name="database">The name of the Sql database being used</param>
+        /// <param name="username">The username logging into the database</param>
+        /// <param name="password">The password for the user logging in</param>
+        /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>
+        public MSSqlManager(string hostname, string database, string username, string password, string cpooling)
+        {
+            try
+            {
+                string connectionString = "Server=" + hostname + ";Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";
+                dbcon = new SqlConnection(connectionString);
+
+                dbcon.Open();
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Error initialising Sql Database: " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Shuts down the database connection
+        /// </summary>
+        public void Close()
+        {
+            dbcon.Close();
+            dbcon = null;
+        }
+
+        /// <summary>
+        /// Runs a query with protection against SQL Injection by using parameterised input.
+        /// </summary>
+        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
+        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
+        /// <returns>A Sql DB Command</returns>
+        public IDbCommand Query(string sql, Dictionary<string, string> parameters)
+        {
+            SqlCommand dbcommand = (SqlCommand)dbcon.CreateCommand();
+            dbcommand.CommandText = sql;
+            foreach (KeyValuePair<string, string> param in parameters)
+            {
+                dbcommand.Parameters.AddWithValue(param.Key, param.Value);
+            }
+
+            return (IDbCommand)dbcommand;
+        }
+
+        /// <summary>
+        /// Runs a database reader object and returns a region row
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A region row</returns>
+        public SimProfileData getRow(IDataReader reader)
+        {
+            SimProfileData regionprofile = new SimProfileData();
+
+            if (reader.Read())
+            {
+                // Region Main
+                regionprofile.regionHandle = (ulong)reader["regionHandle"];
+                regionprofile.regionName = (string)reader["regionName"];
+                regionprofile.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);
+
+                // Secrets
+                regionprofile.regionRecvKey = (string)reader["regionRecvKey"];
+                regionprofile.regionSecret = (string)reader["regionSecret"];
+                regionprofile.regionSendKey = (string)reader["regionSendKey"];
+
+                // Region Server
+                regionprofile.regionDataURI = (string)reader["regionDataURI"];
+                regionprofile.regionOnline = false; // Needs to be pinged before this can be set.
+                regionprofile.serverIP = (string)reader["serverIP"];
+                regionprofile.serverPort = (uint)reader["serverPort"];
+                regionprofile.serverURI = (string)reader["serverURI"];
+
+                // Location
+                regionprofile.regionLocX = (uint)((int)reader["locX"]);
+                regionprofile.regionLocY = (uint)((int)reader["locY"]);
+                regionprofile.regionLocZ = (uint)((int)reader["locZ"]);
+
+                // Neighbours - 0 = No Override
+                regionprofile.regionEastOverrideHandle = (ulong)reader["eastOverrideHandle"];
+                regionprofile.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"];
+                regionprofile.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"];
+                regionprofile.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"];
+
+                // Assets
+                regionprofile.regionAssetURI = (string)reader["regionAssetURI"];
+                regionprofile.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];
+                regionprofile.regionAssetSendKey = (string)reader["regionAssetSendKey"];
+
+                // Userserver
+                regionprofile.regionUserURI = (string)reader["regionUserURI"];
+                regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
+                regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
+            }
+            else
+            {
+                throw new Exception("No rows to return");
+            }
+            return regionprofile;
+        }
+
+        /// <summary>
+        /// Creates a new region in the database
+        /// </summary>
+        /// <param name="profile">The region profile to insert</param>
+        /// <returns>Successful?</returns>
+        public bool insertRow(SimProfileData profile)
+        {
+            string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
+            sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
+            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey) VALUES ";
+
+            sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, ";
+            sql += "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";
+            sql += "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey);";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+
+            parameters["regionHandle"] = profile.regionHandle.ToString();
+            parameters["regionName"] = profile.regionName;
+            parameters["uuid"] = profile.UUID.ToString();
+            parameters["regionRecvKey"] = profile.regionRecvKey;
+            parameters["regionSendKey"] = profile.regionSendKey;
+            parameters["regionDataURI"] = profile.regionDataURI;
+            parameters["serverIP"] = profile.serverIP;
+            parameters["serverPort"] = profile.serverPort.ToString();
+            parameters["serverURI"] = profile.serverURI;
+            parameters["locX"] = profile.regionLocX.ToString();
+            parameters["locY"] = profile.regionLocY.ToString();
+            parameters["locZ"] = profile.regionLocZ.ToString();
+            parameters["eastOverrideHandle"] = profile.regionEastOverrideHandle.ToString();
+            parameters["westOverrideHandle"] = profile.regionWestOverrideHandle.ToString();
+            parameters["northOverrideHandle"] = profile.regionNorthOverrideHandle.ToString();
+            parameters["southOverrideHandle"] = profile.regionSouthOverrideHandle.ToString();
+            parameters["regionAssetURI"] = profile.regionAssetURI;
+            parameters["regionAssetRecvKey"] = profile.regionAssetRecvKey;
+            parameters["regionAssetSendKey"] = profile.regionAssetSendKey;
+            parameters["regionUserURI"] = profile.regionUserURI;
+            parameters["regionUserRecvKey"] = profile.regionUserRecvKey;
+            parameters["regionUserSendKey"] = profile.regionUserSendKey;
+
+            bool returnval = false;
+
+            try
+            {
+                IDbCommand result = Query(sql, parameters);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+
+            return returnval;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
new file mode 100644
index 0000000..4c41a4f
--- /dev/null
+++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj
@@ -0,0 +1,104 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{17F7F694-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Data.MSSQL</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Data.MSSQL</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MSSQLGridData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MSSQLManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj.user b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..bbe3cdf
--- /dev/null
+++ b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenGrid.Framework.Data.MSSQL")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenGrid.Framework.Data.MSSQL")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0e1c1ca4-2cf2-4315-b0e7-432c02feea8a")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
new file mode 100644
index 0000000..4d6cf63
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -0,0 +1,285 @@
+/*
+* 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 OpenGrid.Framework.Data;
+
+namespace OpenGrid.Framework.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL Interface for the Grid Server
+    /// </summary>
+    public class MySQLGridData : IGridData
+    {
+        /// <summary>
+        /// MySQL Database Manager
+        /// </summary>
+        private MySQLManager database;
+
+        /// <summary>
+        /// Initialises the Grid Interface
+        /// </summary>
+        public void Initialise()
+        {
+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
+
+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
+        }
+
+        /// <summary>
+        /// Shuts down the grid interface
+        /// </summary>
+        public void Close()
+        {
+            database.Close();
+        }
+
+        /// <summary>
+        /// Returns the plugin name
+        /// </summary>
+        /// <returns>Plugin name</returns>
+        public string getName()
+        {
+            return "MySql OpenGridData";
+        }
+
+        /// <summary>
+        /// Returns the plugin version
+        /// </summary>
+        /// <returns>Plugin version</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+
+        /// <summary>
+        /// Returns all the specified region profiles within coordates -- coordinates are inclusive
+        /// </summary>
+        /// <param name="xmin">Minimum X coordinate</param>
+        /// <param name="ymin">Minimum Y coordinate</param>
+        /// <param name="xmax">Maximum X coordinate</param>
+        /// <param name="ymax">Maximum Y coordinate</param>
+        /// <returns></returns>
+        public SimProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?xmin"] = xmin.ToString();
+                    param["?ymin"] = ymin.ToString();
+                    param["?xmax"] = xmax.ToString();
+                    param["?ymax"] = ymax.ToString();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    SimProfileData row;
+
+                    List<SimProfileData> rows = new List<SimProfileData>();
+
+                    while ((row = database.readSimRow(reader)) != null)
+                    {
+                        rows.Add(row);
+                    }
+                    reader.Close();
+                    result.Dispose();
+
+                    return rows.ToArray();
+
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a sim profile from it's location
+        /// </summary>
+        /// <param name="handle">Region location handle</param>
+        /// <returns>Sim profile</returns>
+        public SimProfileData GetProfileByHandle(ulong handle)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?handle"] = handle.ToString();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    SimProfileData row = database.readSimRow(reader);
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a sim profile from it's UUID
+        /// </summary>
+        /// <param name="uuid">The region UUID</param>
+        /// <returns>The sim profile</returns>
+        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = uuid.ToStringHyphenated();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    SimProfileData row = database.readSimRow(reader);
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Adds a new profile to the database
+        /// </summary>
+        /// <param name="profile">The profile to add</param>
+        /// <returns>Successful?</returns>
+        public DataResponse AddProfile(SimProfileData profile)
+        {
+            lock (database)
+            {
+                if (database.insertRegion(profile))
+                {
+                    return DataResponse.RESPONSE_OK;
+                }
+                else
+                {
+                    return DataResponse.RESPONSE_ERROR;
+                }
+            }
+        }
+
+        /// <summary>
+        /// DEPRECIATED. Attempts to authenticate a region by comparing a shared secret.
+        /// </summary>
+        /// <param name="uuid">The UUID of the challenger</param>
+        /// <param name="handle">The attempted regionHandle of the challenger</param>
+        /// <param name="authkey">The secret</param>
+        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
+        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)
+        {
+            bool throwHissyFit = false; // Should be true by 1.0
+
+            if (throwHissyFit)
+                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
+
+            SimProfileData data = GetProfileByLLUUID(uuid);
+
+            return (handle == data.regionHandle && authkey == data.regionSecret);
+        }
+
+        /// <summary>
+        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
+        /// </summary>
+        /// <remarks>This requires a security audit.</remarks>
+        /// <param name="uuid"></param>
+        /// <param name="handle"></param>
+        /// <param name="authhash"></param>
+        /// <param name="challenge"></param>
+        /// <returns></returns>
+        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)
+        {
+            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();
+            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
+
+            byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
+            byte[] hash = HashProvider.ComputeHash(stream);
+
+            return false;
+        }
+
+        public ReservationData GetReservationAtPoint(uint x, uint y)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?x"] = x.ToString();
+                    param["?y"] = y.ToString();
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    ReservationData row = database.readReservationRow(reader);
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+    }
+
+
+}
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
new file mode 100644
index 0000000..fb429e4
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -0,0 +1,309 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenGrid.Framework.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL interface for the inventory server
+    /// </summary>
+    class MySQLInventoryData : IInventoryData
+    {
+        /// <summary>
+        /// The database manager
+        /// </summary>
+        public MySQLManager database;
+
+        /// <summary>
+        /// Loads and initialises this database plugin
+        /// </summary>
+        public void Initialise()
+        {
+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
+
+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
+        }
+        
+        /// <summary>
+        /// The name of this DB provider
+        /// </summary>
+        /// <returns>Name of DB provider</returns>
+        public string getName()
+        {
+            return "MySQL Inventory Data Interface";
+        }
+
+        /// <summary>
+        /// Closes this DB provider
+        /// </summary>
+        public void Close()
+        {
+            // Do nothing.
+        }
+
+        /// <summary>
+        /// Returns the version of this DB provider
+        /// </summary>
+        /// <returns>A string containing the DB provider</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+
+        /// <summary>
+        /// Returns a list of items in a specified folder
+        /// </summary>
+        /// <param name="folderID">The folder to search</param>
+        /// <returns>A list containing inventory items</returns>
+        public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = folderID.ToStringHyphenated();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryItemBase> items = database.readInventoryItems(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return items;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a list of the root folders within a users inventory
+        /// </summary>
+        /// <param name="user">The user whos inventory is to be searched</param>
+        /// <returns>A list of folder objects</returns>
+        public List<InventoryFolderBase> getUserRootFolders(LLUUID user)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = user.ToStringHyphenated();
+                    param["?zero"] = LLUUID.Zero.ToStringHyphenated();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return items;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a list of folders in a users inventory contained within the specified folder
+        /// </summary>
+        /// <param name="parentID">The folder to search</param>
+        /// <returns>A list of inventory folders</returns>
+        public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = parentID.ToStringHyphenated();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return items;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a specified inventory item
+        /// </summary>
+        /// <param name="item">The item to return</param>
+        /// <returns>An inventory item</returns>
+        public InventoryItemBase getInventoryItem(LLUUID item)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = item.ToStringHyphenated();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryItemBase> items = database.readInventoryItems(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    if (items.Count > 0)
+                    {
+                        return items[0];
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a specified inventory folder
+        /// </summary>
+        /// <param name="folder">The folder to return</param>
+        /// <returns>A folder class</returns>
+        public InventoryFolderBase getInventoryFolder(LLUUID folder)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = folder.ToStringHyphenated();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    List<InventoryFolderBase> items = database.readInventoryFolders(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    if (items.Count > 0)
+                    {
+                        return items[0];
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Adds a specified item to the database
+        /// </summary>
+        /// <param name="item">The inventory item</param>
+        public void addInventoryItem(InventoryItemBase item)
+        {
+            lock (database)
+            {
+                database.insertItem(item);
+            }
+        }
+
+        /// <summary>
+        /// Updates the specified inventory item
+        /// </summary>
+        /// <param name="item">Inventory item to update</param>
+        public void updateInventoryItem(InventoryItemBase item)
+        {
+            addInventoryItem(item);
+        }
+
+        /// <summary>
+        /// Creates a new inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to create</param>
+        public void addInventoryFolder(InventoryFolderBase folder)
+        {
+            lock (database)
+            {
+                database.insertFolder(folder);
+            }
+        }
+
+        /// <summary>
+        /// Updates an inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to update</param>
+        public void updateInventoryFolder(InventoryFolderBase folder)
+        {
+            addInventoryFolder(folder);
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
new file mode 100644
index 0000000..c88b39f
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -0,0 +1,107 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenGrid.Framework.Data.MySQL
+{
+    /// <summary>
+    /// An interface to the log database for MySQL
+    /// </summary>
+    class MySQLLogData : ILogData
+    {
+        /// <summary>
+        /// The database manager
+        /// </summary>
+        public MySQLManager database;
+
+        /// <summary>
+        /// Artificial constructor called when the plugin is loaded
+        /// </summary>
+        public void Initialise()
+        {
+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
+
+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
+        }
+
+        /// <summary>
+        /// Saves a log item to the database
+        /// </summary>
+        /// <param name="serverDaemon">The daemon triggering the event</param>
+        /// <param name="target">The target of the action (region / agent UUID, etc)</param>
+        /// <param name="methodCall">The method call where the problem occured</param>
+        /// <param name="arguments">The arguments passed to the method</param>
+        /// <param name="priority">How critical is this?</param>
+        /// <param name="logMessage">The message to log</param>
+        public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)
+        {
+            try
+            {
+                database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+            }
+        }
+
+        /// <summary>
+        /// Returns the name of this DB provider
+        /// </summary>
+        /// <returns>A string containing the DB provider name</returns>
+        public string getName()
+        {
+            return "MySQL Logdata Interface";
+        }
+
+        /// <summary>
+        /// Closes the database provider
+        /// </summary>
+        public void Close()
+        {
+            // Do nothing.
+        }
+
+        /// <summary>
+        /// Returns the version of this DB provider
+        /// </summary>
+        /// <returns>A string containing the provider version</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
new file mode 100644
index 0000000..53b3bdd
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -0,0 +1,609 @@
+/*
+* 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.Data;
+
+// MySQL Native
+using MySql;
+using MySql.Data;
+using MySql.Data.Types;
+using MySql.Data.MySqlClient;
+
+using OpenGrid.Framework.Data;
+
+namespace OpenGrid.Framework.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL Database manager
+    /// </summary>
+    class MySQLManager
+    {
+        /// <summary>
+        /// The database connection object
+        /// </summary>
+        IDbConnection dbcon;
+        /// <summary>
+        /// Connection string for ADO.net
+        /// </summary>
+        string connectionString;
+
+        /// <summary>
+        /// Initialises and creates a new MySQL connection and maintains it.
+        /// </summary>
+        /// <param name="hostname">The MySQL server being connected to</param>
+        /// <param name="database">The name of the MySQL database being used</param>
+        /// <param name="username">The username logging into the database</param>
+        /// <param name="password">The password for the user logging in</param>
+        /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>
+        public MySQLManager(string hostname, string database, string username, string password, string cpooling, string port)
+        {
+            try
+            {
+                connectionString = "Server=" + hostname + ";Port=" + port + ";Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";
+                dbcon = new MySqlConnection(connectionString);
+
+                dbcon.Open();
+
+                System.Console.WriteLine("MySQL connection established");
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Error initialising MySql Database: " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Shuts down the database connection
+        /// </summary>
+        public void Close()
+        {
+            dbcon.Close();
+            dbcon = null;
+        }
+
+        /// <summary>
+        /// Reconnects to the database
+        /// </summary>
+        public void Reconnect()
+        {
+            lock (dbcon)
+            {
+                try
+                {
+                    // Close the DB connection
+                    dbcon.Close();
+                    // Try reopen it
+                    dbcon = new MySqlConnection(connectionString);
+                    dbcon.Open();
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine("Unable to reconnect to database " + e.ToString());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Runs a query with protection against SQL Injection by using parameterised input.
+        /// </summary>
+        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
+        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
+        /// <returns>A MySQL DB Command</returns>
+        public IDbCommand Query(string sql, Dictionary<string, string> parameters)
+        {
+            try
+            {
+                MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
+                dbcommand.CommandText = sql;
+                foreach (KeyValuePair<string, string> param in parameters)
+                {
+                    dbcommand.Parameters.Add(param.Key, param.Value);
+                }
+
+                return (IDbCommand)dbcommand;
+            }
+            catch
+            {
+                lock (dbcon)
+                {
+                    // Close the DB connection
+                    try
+                    {
+                        dbcon.Close();
+                    }
+                    catch { }
+
+                    // Try reopen it
+                    try
+                    {
+                        dbcon = new MySqlConnection(connectionString);
+                        dbcon.Open();
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine("Unable to reconnect to database " + e.ToString());
+                    }
+
+                    // Run the query again
+                    try
+                    {
+                        MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
+                        dbcommand.CommandText = sql;
+                        foreach (KeyValuePair<string, string> param in parameters)
+                        {
+                            dbcommand.Parameters.Add(param.Key, param.Value);
+                        }
+
+                        return (IDbCommand)dbcommand;
+                    }
+                    catch (Exception e)
+                    {
+                        // Return null if it fails.
+                        Console.WriteLine("Failed during Query generation: " + e.ToString());
+                        return null;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Reads a region row from a database reader
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A region profile</returns>
+        public SimProfileData readSimRow(IDataReader reader)
+        {
+            SimProfileData retval = new SimProfileData();
+
+            if (reader.Read())
+            {
+                // Region Main
+                retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString());
+                retval.regionName = (string)reader["regionName"];
+                retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);
+
+                // Secrets
+                retval.regionRecvKey = (string)reader["regionRecvKey"];
+                retval.regionSecret = (string)reader["regionSecret"];
+                retval.regionSendKey = (string)reader["regionSendKey"];
+
+                // Region Server
+                retval.regionDataURI = (string)reader["regionDataURI"];
+                retval.regionOnline = false; // Needs to be pinged before this can be set.
+                retval.serverIP = (string)reader["serverIP"];
+                retval.serverPort = (uint)reader["serverPort"];
+                retval.serverURI = (string)reader["serverURI"];
+
+                // Location
+                retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString());
+                retval.regionLocY = Convert.ToUInt32(reader["locY"].ToString());
+                retval.regionLocZ = Convert.ToUInt32(reader["locZ"].ToString());
+
+                // Neighbours - 0 = No Override
+                retval.regionEastOverrideHandle = Convert.ToUInt64(reader["eastOverrideHandle"].ToString());
+                retval.regionWestOverrideHandle = Convert.ToUInt64(reader["westOverrideHandle"].ToString());
+                retval.regionSouthOverrideHandle = Convert.ToUInt64(reader["southOverrideHandle"].ToString());
+                retval.regionNorthOverrideHandle = Convert.ToUInt64(reader["northOverrideHandle"].ToString());
+
+                // Assets
+                retval.regionAssetURI = (string)reader["regionAssetURI"];
+                retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];
+                retval.regionAssetSendKey = (string)reader["regionAssetSendKey"];
+
+                // Userserver
+                retval.regionUserURI = (string)reader["regionUserURI"];
+                retval.regionUserRecvKey = (string)reader["regionUserRecvKey"];
+                retval.regionUserSendKey = (string)reader["regionUserSendKey"];
+
+                // World Map Addition
+                string tempRegionMap = reader["regionMapTexture"].ToString();
+                if (tempRegionMap != "")
+                {
+                    retval.regionMapTextureID = new libsecondlife.LLUUID(tempRegionMap);
+                }
+                else
+                {
+                    retval.regionMapTextureID = new libsecondlife.LLUUID();
+                }
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
+        }
+
+        /// <summary>
+        /// Reads a reservation row from a database reader
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A reservation data object</returns>
+        public ReservationData readReservationRow(IDataReader reader)
+        {
+            ReservationData retval = new ReservationData();
+            if (reader.Read())
+            {
+                retval.gridRecvKey = (string)reader["gridRecvKey"];
+                retval.gridSendKey = (string)reader["gridSendKey"];
+                retval.reservationCompany = (string)reader["resCompany"];
+                retval.reservationMaxX = (int)reader["resXMax"];
+                retval.reservationMaxY = (int)reader["resYMax"];
+                retval.reservationMinX = (int)reader["resXMin"];
+                retval.reservationMinY = (int)reader["resYMin"];
+                retval.reservationName = (string)reader["resName"];
+                retval.status = (bool)reader["status"];
+                retval.userUUID = new libsecondlife.LLUUID((string)reader["userUUID"]);
+
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
+        }
+        /// <summary>
+        /// Reads an agent row from a database reader
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A user session agent</returns>
+        public UserAgentData readAgentRow(IDataReader reader)
+        {
+            UserAgentData retval = new UserAgentData();
+
+            if (reader.Read())
+            {
+                // Agent IDs
+                retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]);
+                retval.sessionID = new libsecondlife.LLUUID((string)reader["sessionID"]);
+                retval.secureSessionID = new libsecondlife.LLUUID((string)reader["secureSessionID"]);
+
+                // Agent Who?
+                retval.agentIP = (string)reader["agentIP"];
+                retval.agentPort = Convert.ToUInt32(reader["agentPort"].ToString());
+                retval.agentOnline = Convert.ToBoolean(reader["agentOnline"].ToString());
+
+                // Login/Logout times (UNIX Epoch)
+                retval.loginTime = Convert.ToInt32(reader["loginTime"].ToString());
+                retval.logoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
+
+                // Current position
+                retval.currentRegion = (string)reader["currentRegion"];
+                retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
+                libsecondlife.LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
+        }
+
+        /// <summary>
+        /// Reads a user profile from an active data reader
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData readUserRow(IDataReader reader)
+        {
+            UserProfileData retval = new UserProfileData();
+
+            if (reader.Read())
+            {
+                retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]);
+                retval.username = (string)reader["username"];
+                retval.surname = (string)reader["lastname"];
+
+                retval.passwordHash = (string)reader["passwordHash"];
+                retval.passwordSalt = (string)reader["passwordSalt"];
+
+                retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
+                retval.homeLocation = new libsecondlife.LLVector3(
+                    Convert.ToSingle(reader["homeLocationX"].ToString()),
+                    Convert.ToSingle(reader["homeLocationY"].ToString()),
+                    Convert.ToSingle(reader["homeLocationZ"].ToString()));
+                retval.homeLookAt = new libsecondlife.LLVector3(
+                    Convert.ToSingle(reader["homeLookAtX"].ToString()),
+                    Convert.ToSingle(reader["homeLookAtY"].ToString()),
+                    Convert.ToSingle(reader["homeLookAtZ"].ToString()));
+
+                retval.created = Convert.ToInt32(reader["created"].ToString());
+                retval.lastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
+
+                retval.userInventoryURI = (string)reader["userInventoryURI"];
+                retval.userAssetURI = (string)reader["userAssetURI"];
+
+                retval.profileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
+                retval.profileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
+
+                retval.profileAboutText = (string)reader["profileAboutText"];
+                retval.profileFirstText = (string)reader["profileFirstText"];
+
+                retval.profileImage = new libsecondlife.LLUUID((string)reader["profileImage"]);
+                retval.profileFirstImage = new libsecondlife.LLUUID((string)reader["profileFirstImage"]);
+
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
+        }
+
+        /// <summary>
+        /// Reads a list of inventory folders returned by a query.
+        /// </summary>
+        /// <param name="reader">A MySQL Data Reader</param>
+        /// <returns>A List containing inventory folders</returns>
+        public List<InventoryFolderBase> readInventoryFolders(IDataReader reader)
+        {
+            List<InventoryFolderBase> rows = new List<InventoryFolderBase>();
+
+            while(reader.Read())
+            {
+                try
+                {
+                    InventoryFolderBase folder = new InventoryFolderBase();
+
+                    folder.agentID = new libsecondlife.LLUUID((string)reader["agentID"]);
+                    folder.parentID = new libsecondlife.LLUUID((string)reader["parentFolderID"]);
+                    folder.folderID = new libsecondlife.LLUUID((string)reader["folderID"]);
+                    folder.name = (string)reader["folderName"];
+
+                    rows.Add(folder);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
+            }
+
+            return rows;
+        }
+
+        /// <summary>
+        /// Reads a collection of items from an SQL result
+        /// </summary>
+        /// <param name="reader">The SQL Result</param>
+        /// <returns>A List containing Inventory Items</returns>
+        public List<InventoryItemBase> readInventoryItems(IDataReader reader)
+        {
+            List<InventoryItemBase> rows = new List<InventoryItemBase>();
+
+            while (reader.Read())
+            {
+                try
+                {
+                    InventoryItemBase item = new InventoryItemBase();
+
+                    item.assetID = new libsecondlife.LLUUID((string)reader["assetID"]);
+                    item.avatarID = new libsecondlife.LLUUID((string)reader["avatarID"]);
+                    item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString());
+                    item.inventoryDescription = (string)reader["inventoryDescription"];
+                    item.inventoryID = new libsecondlife.LLUUID((string)reader["inventoryID"]);
+                    item.inventoryName = (string)reader["inventoryName"];
+                    item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
+                    item.parentFolderID = new libsecondlife.LLUUID((string)reader["parentFolderID"]);
+                    item.type = Convert.ToInt32(reader["type"].ToString());
+
+                    rows.Add(item);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
+            }
+
+            return rows;
+        }
+
+        /// <summary>
+        /// Inserts a new row into the log database
+        /// </summary>
+        /// <param name="serverDaemon">The daemon which triggered this event</param>
+        /// <param name="target">Who were we operating on when this occured (region UUID, user UUID, etc)</param>
+        /// <param name="methodCall">The method call where the problem occured</param>
+        /// <param name="arguments">The arguments passed to the method</param>
+        /// <param name="priority">How critical is this?</param>
+        /// <param name="logMessage">Extra message info</param>
+        /// <returns>Saved successfully?</returns>
+        public bool insertLogRow(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)
+        {
+            string sql = "INSERT INTO logs (`target`, `server`, `method`, `arguments`, `priority`, `message`) VALUES ";
+            sql += "(?target, ?server, ?method, ?arguments, ?priority, ?message)";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+            parameters["?server"] = serverDaemon;
+            parameters["?target"] = target;
+            parameters["?method"] = methodCall;
+            parameters["?arguments"] = arguments;
+            parameters["?priority"] = priority.ToString();
+            parameters["?message"] = logMessage;
+
+            bool returnval = false;
+
+            try
+            {
+                IDbCommand result = Query(sql, parameters);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return false;
+            }
+
+            return returnval;
+        }
+
+        /// <summary>
+        /// Inserts a new item into the database
+        /// </summary>
+        /// <param name="item">The item</param>
+        /// <returns>Success?</returns>
+        public bool insertItem(InventoryItemBase item)
+        {
+            string sql = "REPLACE INTO inventoryitems (inventoryID, assetID, type, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions) VALUES ";
+            sql += "(?inventoryID, ?assetID, ?type, ?parentFolderID, ?avatarID, ?inventoryName, ?inventoryDescription, ?inventoryNextPermissions, ?inventoryCurrentPermissions)";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+            parameters["?inventoryID"] = item.inventoryID.ToStringHyphenated();
+            parameters["?assetID"] = item.assetID.ToStringHyphenated();
+            parameters["?type"] = item.type.ToString();
+            parameters["?parentFolderID"] = item.parentFolderID.ToStringHyphenated();
+            parameters["?avatarID"] = item.avatarID.ToStringHyphenated();
+            parameters["?inventoryName"] = item.inventoryName;
+            parameters["?inventoryDescription"] = item.inventoryDescription;
+            parameters["?inventoryNextPermissions"] = item.inventoryNextPermissions.ToString();
+            parameters["?inventoryCurrentPermissions"] = item.inventoryCurrentPermissions.ToString();
+
+            bool returnval = false;
+
+            try
+            {
+                IDbCommand result = Query(sql, parameters);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return false;
+            }
+
+            return returnval;
+        }
+
+        /// <summary>
+        /// Inserts a new folder into the database
+        /// </summary>
+        /// <param name="folder">The folder</param>
+        /// <returns>Success?</returns>
+        public bool insertFolder(InventoryFolderBase folder)
+        {
+            string sql = "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName) VALUES ";
+            sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName)";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+            parameters["?folderID"] = folder.folderID.ToStringHyphenated();
+            parameters["?agentID"] = folder.agentID.ToStringHyphenated();
+            parameters["?parentFolderID"] = folder.parentID.ToStringHyphenated();
+            parameters["?folderName"] = folder.name;
+
+            bool returnval = false;
+            try
+            {
+                IDbCommand result = Query(sql, parameters);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return false;
+            }
+            return returnval;
+        }
+
+        /// <summary>
+        /// Inserts a new region into the database
+        /// </summary>
+        /// <param name="profile">The region to insert</param>
+        /// <returns>Success?</returns>
+        public bool insertRegion(SimProfileData regiondata)
+        {
+            string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
+            sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
+            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture) VALUES ";
+
+            sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
+            sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
+            sql += "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture);";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+
+            parameters["?regionHandle"] = regiondata.regionHandle.ToString();
+            parameters["?regionName"] = regiondata.regionName.ToString();
+            parameters["?uuid"] = regiondata.UUID.ToStringHyphenated();
+            parameters["?regionRecvKey"] = regiondata.regionRecvKey.ToString();
+            parameters["?regionSecret"] = regiondata.regionSecret.ToString();
+            parameters["?regionSendKey"] = regiondata.regionSendKey.ToString();
+            parameters["?regionDataURI"] = regiondata.regionDataURI.ToString();
+            parameters["?serverIP"] = regiondata.serverIP.ToString();
+            parameters["?serverPort"] = regiondata.serverPort.ToString();
+            parameters["?serverURI"] = regiondata.serverURI.ToString();
+            parameters["?locX"] = regiondata.regionLocX.ToString();
+            parameters["?locY"] = regiondata.regionLocY.ToString();
+            parameters["?locZ"] = regiondata.regionLocZ.ToString();
+            parameters["?eastOverrideHandle"] = regiondata.regionEastOverrideHandle.ToString();
+            parameters["?westOverrideHandle"] = regiondata.regionWestOverrideHandle.ToString();
+            parameters["?northOverrideHandle"] = regiondata.regionNorthOverrideHandle.ToString();
+            parameters["?southOverrideHandle"] = regiondata.regionSouthOverrideHandle.ToString();
+            parameters["?regionAssetURI"] = regiondata.regionAssetURI.ToString();
+            parameters["?regionAssetRecvKey"] = regiondata.regionAssetRecvKey.ToString();
+            parameters["?regionAssetSendKey"] = regiondata.regionAssetSendKey.ToString();
+            parameters["?regionUserURI"] = regiondata.regionUserURI.ToString();
+            parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString();
+            parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString();
+            parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToStringHyphenated();
+
+            bool returnval = false;
+
+            try
+            {
+                
+                IDbCommand result = Query(sql, parameters);
+
+                //Console.WriteLine(result.CommandText);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return false;
+            }
+
+            return returnval;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
new file mode 100644
index 0000000..032a0e6
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -0,0 +1,257 @@
+/*
+* 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 OpenGrid.Framework.Data;
+using libsecondlife;
+
+namespace OpenGrid.Framework.Data.MySQL
+{
+    /// <summary>
+    /// A database interface class to a user profile storage system
+    /// </summary>
+    class MySQLUserData : IUserData
+    {
+        /// <summary>
+        /// Database manager for MySQL
+        /// </summary>
+        public MySQLManager database;
+
+        /// <summary>
+        /// Loads and initialises the MySQL storage plugin
+        /// </summary>
+        public void Initialise()
+        {
+            // Load from an INI file connection details
+            // TODO: move this to XML?
+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
+
+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
+        }
+
+        /// <summary>
+        /// Searches the database for a specified user profile
+        /// </summary>
+        /// <param name="name">The account name of the user</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData getUserByName(string name)
+        {
+            return getUserByName(name.Split(' ')[0], name.Split(' ')[1]);
+        }
+
+        /// <summary>
+        /// Searches the database for a specified user profile by name components
+        /// </summary>
+        /// <param name="user">The first part of the account name</param>
+        /// <param name="last">The second part of the account name</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData getUserByName(string user, string last)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?first"] = user;
+                    param["?second"] = last;
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    UserProfileData row = database.readUserRow(reader);
+                    
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Searches the database for a specified user profile by UUID
+        /// </summary>
+        /// <param name="uuid">The account ID</param>
+        /// <returns>The users profile</returns>
+        public UserProfileData getUserByUUID(LLUUID uuid)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = uuid.ToStringHyphenated();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    UserProfileData row = database.readUserRow(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns a user session searching by name
+        /// </summary>
+        /// <param name="name">The account name</param>
+        /// <returns>The users session</returns>
+        public UserAgentData getAgentByName(string name)
+        {
+            return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
+        }
+
+        /// <summary>
+        /// Returns a user session by account name
+        /// </summary>
+        /// <param name="user">First part of the users account name</param>
+        /// <param name="last">Second part of the users account name</param>
+        /// <returns>The users session</returns>
+        public UserAgentData getAgentByName(string user, string last)
+        {
+            UserProfileData profile = getUserByName(user, last);
+            return getAgentByUUID(profile.UUID);
+        }
+
+        /// <summary>
+        /// Returns an agent session by account UUID
+        /// </summary>
+        /// <param name="uuid">The accounts UUID</param>
+        /// <returns>The users session</returns>
+        public UserAgentData getAgentByUUID(LLUUID uuid)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?uuid"] = uuid.ToStringHyphenated();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    UserAgentData row = database.readAgentRow(reader);
+
+                    reader.Close();
+                    result.Dispose();
+
+                    return row;
+                }
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new users profile
+        /// </summary>
+        /// <param name="user">The user profile to create</param>
+        public void addNewUserProfile(UserProfileData user)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new agent
+        /// </summary>
+        /// <param name="agent">The agent to create</param>
+        public void addNewUserAgent(UserAgentData agent)
+        {
+            // Do nothing.
+        }
+
+        /// <summary>
+        /// Performs a money transfer request between two accounts
+        /// </summary>
+        /// <param name="from">The senders account ID</param>
+        /// <param name="to">The recievers account ID</param>
+        /// <param name="amount">The amount to transfer</param>
+        /// <returns>Success?</returns>
+        public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Performs an inventory transfer request between two accounts
+        /// </summary>
+        /// <remarks>TODO: Move to inventory server</remarks>
+        /// <param name="from">The senders account ID</param>
+        /// <param name="to">The recievers account ID</param>
+        /// <param name="item">The item to transfer</param>
+        /// <returns>Success?</returns>
+        public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Database provider name
+        /// </summary>
+        /// <returns>Provider name</returns>
+        public string getName()
+        {
+            return "MySQL Userdata Interface";
+        }
+
+        /// <summary>
+        /// Database provider version
+        /// </summary>
+        /// <returns>provider version</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
new file mode 100644
index 0000000..62e3887
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -0,0 +1,117 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{17F7F6BE-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Data.MySQL</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Data.MySQL</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="MySql.Data.dll" >
+      <HintPath>..\..\..\bin\MySql.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MySQLGridData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLInventoryData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLLogData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLUserData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj.user b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0bfd1d6
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenGrid.Framework.Data.MySQL")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenGrid.Framework.Data.MySQL")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("e49826b2-dcef-41be-a5bd-596733fa3304")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
new file mode 100644
index 0000000..4ba24f1
--- /dev/null
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -0,0 +1,108 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6ECC56A9-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Data.SQLite</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Data.SQLite</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data.SQLite.dll" >
+      <HintPath>..\..\..\bin\System.Data.SQLite.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="SQLiteGridData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SQLiteManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj.user b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..57c4bae
--- /dev/null
+++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenGrid.Framework.Data.SQLite")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenGrid.Framework.Data.SQLite")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("6113d5ce-4547-49f4-9236-0dcc503457b1")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
new file mode 100644
index 0000000..d7a5a69
--- /dev/null
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -0,0 +1,195 @@
+/*
+* 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 OpenGrid.Framework.Data;
+
+namespace OpenGrid.Framework.Data.SQLite
+{
+    /// <summary>
+    /// A Grid Interface to the SQLite database
+    /// </summary>
+    public class SQLiteGridData : IGridData
+    {
+        /// <summary>
+        /// A database manager
+        /// </summary>
+        private SQLiteManager database;
+
+        /// <summary>
+        /// Initialises the Grid Interface
+        /// </summary>
+        public void Initialise()
+        {
+            database = new SQLiteManager("localhost", "db", "user", "password", "false");
+        }
+
+        /// <summary>
+        /// Shuts down the grid interface
+        /// </summary>
+        public void Close()
+        {
+            database.Close();
+        }
+
+        /// <summary>
+        /// Returns the name of this grid interface
+        /// </summary>
+        /// <returns>A string containing the grid interface</returns>
+        public string getName()
+        {
+            return "SQLite OpenGridData";
+        }
+
+        /// <summary>
+        /// Returns the version of this grid interface
+        /// </summary>
+        /// <returns>A string containing the version</returns>
+        public string getVersion()
+        {
+            return "0.1";
+        }
+
+        /// <summary>
+        /// Returns a list of regions within the specified ranges
+        /// </summary>
+        /// <param name="a">minimum X coordinate</param>
+        /// <param name="b">minimum Y coordinate</param>
+        /// <param name="c">maximum X coordinate</param>
+        /// <param name="d">maximum Y coordinate</param>
+        /// <returns>An array of region profiles</returns>
+        public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a sim profile from it's location
+        /// </summary>
+        /// <param name="handle">Region location handle</param>
+        /// <returns>Sim profile</returns>
+        public SimProfileData GetProfileByHandle(ulong handle)
+        {
+            Dictionary<string, string> param = new Dictionary<string, string>();
+            param["handle"] = handle.ToString();
+
+            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
+            System.Data.IDataReader reader = result.ExecuteReader();
+
+            SimProfileData row = database.getRow(reader);
+            reader.Close();
+            result.Dispose();
+
+            return row;
+        }
+
+        /// <summary>
+        /// Returns a sim profile from it's UUID
+        /// </summary>
+        /// <param name="uuid">The region UUID</param>
+        /// <returns>The sim profile</returns>
+        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)
+        {
+            Dictionary<string, string> param = new Dictionary<string, string>();
+            param["uuid"] = uuid.ToStringHyphenated();
+
+            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
+            System.Data.IDataReader reader = result.ExecuteReader();
+
+            SimProfileData row = database.getRow(reader);
+            reader.Close();
+            result.Dispose();
+
+            return row;
+        }
+
+        /// <summary>
+        /// Adds a new specified region to the database
+        /// </summary>
+        /// <param name="profile">The profile to add</param>
+        /// <returns>A dataresponse enum indicating success</returns>
+        public DataResponse AddProfile(SimProfileData profile)
+        {
+            if (database.insertRow(profile))
+            {
+                return DataResponse.RESPONSE_OK;
+            }
+            else
+            {
+                return DataResponse.RESPONSE_ERROR;
+            }
+        }
+
+        /// <summary>
+        /// DEPRECIATED. Attempts to authenticate a region by comparing a shared secret.
+        /// </summary>
+        /// <param name="uuid">The UUID of the challenger</param>
+        /// <param name="handle">The attempted regionHandle of the challenger</param>
+        /// <param name="authkey">The secret</param>
+        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
+        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)
+        {
+            bool throwHissyFit = false; // Should be true by 1.0
+
+            if (throwHissyFit)
+                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
+
+            SimProfileData data = GetProfileByLLUUID(uuid);
+
+            return (handle == data.regionHandle && authkey == data.regionSecret);
+        }
+
+        /// <summary>
+        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
+        /// </summary>
+        /// <remarks>This requires a security audit.</remarks>
+        /// <param name="uuid"></param>
+        /// <param name="handle"></param>
+        /// <param name="authhash"></param>
+        /// <param name="challenge"></param>
+        /// <returns></returns>
+        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)
+        {
+            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();
+            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();
+
+            byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
+            byte[] hash = HashProvider.ComputeHash(stream);
+
+            return false;
+        }
+
+        public ReservationData GetReservationAtPoint(uint x, uint y)
+        {
+            return null;
+        }
+    }
+
+
+}
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
new file mode 100644
index 0000000..9689356
--- /dev/null
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -0,0 +1,209 @@
+/*
+* 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.Data;
+
+using System.Data.SQLite;
+
+using OpenGrid.Framework.Data;
+
+namespace OpenGrid.Framework.Data.SQLite
+{
+    class SQLiteManager
+    {
+        IDbConnection dbcon;
+
+        /// <summary>
+        /// Initialises and creates a new SQLite connection and maintains it.
+        /// </summary>
+        /// <param name="hostname">The SQLite server being connected to</param>
+        /// <param name="database">The name of the SQLite database being used</param>
+        /// <param name="username">The username logging into the database</param>
+        /// <param name="password">The password for the user logging in</param>
+        /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>
+        public SQLiteManager(string hostname, string database, string username, string password, string cpooling)
+        {
+            try
+            {
+                string connectionString = "URI=file:GridServerSqlite.db;";
+                dbcon = new SQLiteConnection(connectionString);
+
+                dbcon.Open();
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Error initialising SQLite Database: " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Shuts down the database connection
+        /// </summary>
+        public void Close()
+        {
+            dbcon.Close();
+            dbcon = null;
+        }
+
+        /// <summary>
+        /// Runs a query with protection against SQL Injection by using parameterised input.
+        /// </summary>
+        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
+        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
+        /// <returns>A SQLite DB Command</returns>
+        public IDbCommand Query(string sql, Dictionary<string, string> parameters)
+        {
+            SQLiteCommand dbcommand = (SQLiteCommand)dbcon.CreateCommand();
+            dbcommand.CommandText = sql;
+            foreach (KeyValuePair<string, string> param in parameters)
+            {
+                SQLiteParameter paramx = new SQLiteParameter(param.Key,param.Value);
+                dbcommand.Parameters.Add(paramx);
+            }
+
+            return (IDbCommand)dbcommand;
+        }
+
+        /// <summary>
+        /// Reads a region row from a database reader
+        /// </summary>
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A region profile</returns>
+        public SimProfileData getRow(IDataReader reader)
+        {
+            SimProfileData retval = new SimProfileData();
+
+            if (reader.Read())
+            {
+                // Region Main
+                retval.regionHandle = (ulong)reader["regionHandle"];
+                retval.regionName = (string)reader["regionName"];
+                retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);
+
+                // Secrets
+                retval.regionRecvKey = (string)reader["regionRecvKey"];
+                retval.regionSecret = (string)reader["regionSecret"];
+                retval.regionSendKey = (string)reader["regionSendKey"];
+
+                // Region Server
+                retval.regionDataURI = (string)reader["regionDataURI"];
+                retval.regionOnline = false; // Needs to be pinged before this can be set.
+                retval.serverIP = (string)reader["serverIP"];
+                retval.serverPort = (uint)reader["serverPort"];
+                retval.serverURI = (string)reader["serverURI"];
+
+                // Location
+                retval.regionLocX = (uint)((int)reader["locX"]);
+                retval.regionLocY = (uint)((int)reader["locY"]);
+                retval.regionLocZ = (uint)((int)reader["locZ"]);
+
+                // Neighbours - 0 = No Override
+                retval.regionEastOverrideHandle = (ulong)reader["eastOverrideHandle"];
+                retval.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"];
+                retval.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"];
+                retval.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"];
+
+                // Assets
+                retval.regionAssetURI = (string)reader["regionAssetURI"];
+                retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];
+                retval.regionAssetSendKey = (string)reader["regionAssetSendKey"];
+
+                // Userserver
+                retval.regionUserURI = (string)reader["regionUserURI"];
+                retval.regionUserRecvKey = (string)reader["regionUserRecvKey"];
+                retval.regionUserSendKey = (string)reader["regionUserSendKey"];
+            }
+            else
+            {
+                throw new Exception("No rows to return");
+            }
+            return retval;
+        }
+
+        /// <summary>
+        /// Inserts a new region into the database
+        /// </summary>
+        /// <param name="profile">The region to insert</param>
+        /// <returns>Success?</returns>
+        public bool insertRow(SimProfileData profile)
+        {
+            string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
+            sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
+            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey) VALUES ";
+
+            sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, ";
+            sql += "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";
+            sql += "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey);";
+
+            Dictionary<string, string> parameters = new Dictionary<string, string>();
+
+            parameters["regionHandle"] = profile.regionHandle.ToString();
+            parameters["regionName"] = profile.regionName;
+            parameters["uuid"] = profile.UUID.ToString();
+            parameters["regionRecvKey"] = profile.regionRecvKey;
+            parameters["regionSendKey"] = profile.regionSendKey;
+            parameters["regionDataURI"] = profile.regionDataURI;
+            parameters["serverIP"] = profile.serverIP;
+            parameters["serverPort"] = profile.serverPort.ToString();
+            parameters["serverURI"] = profile.serverURI;
+            parameters["locX"] = profile.regionLocX.ToString();
+            parameters["locY"] = profile.regionLocY.ToString();
+            parameters["locZ"] = profile.regionLocZ.ToString();
+            parameters["eastOverrideHandle"] = profile.regionEastOverrideHandle.ToString();
+            parameters["westOverrideHandle"] = profile.regionWestOverrideHandle.ToString();
+            parameters["northOverrideHandle"] = profile.regionNorthOverrideHandle.ToString();
+            parameters["southOverrideHandle"] = profile.regionSouthOverrideHandle.ToString();
+            parameters["regionAssetURI"] = profile.regionAssetURI;
+            parameters["regionAssetRecvKey"] = profile.regionAssetRecvKey;
+            parameters["regionAssetSendKey"] = profile.regionAssetSendKey;
+            parameters["regionUserURI"] = profile.regionUserURI;
+            parameters["regionUserRecvKey"] = profile.regionUserRecvKey;
+            parameters["regionUserSendKey"] = profile.regionUserSendKey;
+
+            bool returnval = false;
+
+            try
+            {
+                IDbCommand result = Query(sql, parameters);
+
+                if (result.ExecuteNonQuery() == 1)
+                    returnval = true;
+
+                result.Dispose();
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+
+            return returnval;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Data/GridData.cs b/OpenSim/Framework/Data/GridData.cs
new file mode 100644
index 0000000..7f8fdaf
--- /dev/null
+++ b/OpenSim/Framework/Data/GridData.cs
@@ -0,0 +1,113 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Data
+{
+    public enum DataResponse
+    {
+        RESPONSE_OK,
+        RESPONSE_AUTHREQUIRED,
+        RESPONSE_INVALIDCREDENTIALS,
+        RESPONSE_ERROR
+    }
+
+    /// <summary>
+    /// A standard grid interface
+    /// </summary>
+    public interface IGridData
+    {
+        /// <summary>
+        /// Returns a sim profile from a regionHandle
+        /// </summary>
+        /// <param name="regionHandle">A 64bit Region Handle</param>
+        /// <returns>A simprofile</returns>
+        SimProfileData GetProfileByHandle(ulong regionHandle);
+
+        /// <summary>
+        /// Returns a sim profile from a UUID
+        /// </summary>
+        /// <param name="UUID">A 128bit UUID</param>
+        /// <returns>A sim profile</returns>
+        SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID);
+
+        /// <summary>
+        /// Returns all profiles within the specified range
+        /// </summary>
+        /// <param name="Xmin">Minimum sim coordinate (X)</param>
+        /// <param name="Ymin">Minimum sim coordinate (Y)</param>
+        /// <param name="Xmax">Maximum sim coordinate (X)</param>
+        /// <param name="Ymin">Maximum sim coordinate (Y)</param>
+        /// <returns>An array containing all the sim profiles in the specified range</returns>
+        SimProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
+
+        /// <summary>
+        /// Authenticates a sim by use of it's recv key. 
+        /// WARNING: Insecure
+        /// </summary>
+        /// <param name="UUID">The UUID sent by the sim</param>
+        /// <param name="regionHandle">The regionhandle sent by the sim</param>
+        /// <param name="simrecvkey">The recieving key sent by the sim</param>
+        /// <returns>Whether the sim has been authenticated</returns>
+        bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey);
+
+        /// <summary>
+        /// Initialises the interface
+        /// </summary>
+        void Initialise();
+
+        /// <summary>
+        /// Closes the interface
+        /// </summary>
+        void Close();
+
+        /// <summary>
+        /// The plugin being loaded
+        /// </summary>
+        /// <returns>A string containing the plugin name</returns>
+        string getName();
+
+        /// <summary>
+        /// The plugins version
+        /// </summary>
+        /// <returns>A string containing the plugin version</returns>
+        string getVersion();
+
+        /// <summary>
+        /// Adds a new profile to the database
+        /// </summary>
+        /// <param name="profile">The profile to add</param>
+        /// <returns>RESPONSE_OK if successful, error if not.</returns>
+        DataResponse AddProfile(SimProfileData profile);
+
+        ReservationData GetReservationAtPoint(uint x, uint y);
+
+    }
+}
diff --git a/OpenSim/Framework/Data/ILogData.cs b/OpenSim/Framework/Data/ILogData.cs
new file mode 100644
index 0000000..ccb3b84
--- /dev/null
+++ b/OpenSim/Framework/Data/ILogData.cs
@@ -0,0 +1,94 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Data
+{
+    /// <summary>
+    /// The severity of an individual log message
+    /// </summary>
+    public enum LogSeverity : int
+    {
+        /// <summary>
+        /// Critical: systems failure
+        /// </summary>
+        CRITICAL = 1,
+        /// <summary>
+        /// Major: warning prior to systems failure
+        /// </summary>
+        MAJOR = 2,
+        /// <summary>
+        /// Medium: an individual non-critical task failed
+        /// </summary>
+        MEDIUM = 3,
+        /// <summary>
+        /// Low: Informational warning
+        /// </summary>
+        LOW = 4,
+        /// <summary>
+        /// Info: Information
+        /// </summary>
+        INFO = 5,
+        /// <summary>
+        /// Verbose: Debug Information
+        /// </summary>
+        VERBOSE = 6
+    }
+
+    /// <summary>
+    /// An interface to a LogData storage system
+    /// </summary>
+    public interface ILogData
+    {
+        void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority,string logMessage);
+        /// <summary>
+        /// Initialises the interface
+        /// </summary>
+        void Initialise();
+
+        /// <summary>
+        /// Closes the interface
+        /// </summary>
+        void Close();
+
+        /// <summary>
+        /// The plugin being loaded
+        /// </summary>
+        /// <returns>A string containing the plugin name</returns>
+        string getName();
+
+        /// <summary>
+        /// The plugins version
+        /// </summary>
+        /// <returns>A string containing the plugin version</returns>
+        string getVersion();
+    }
+
+}
diff --git a/OpenSim/Framework/Data/IniConfig.cs b/OpenSim/Framework/Data/IniConfig.cs
new file mode 100644
index 0000000..2f002c1
--- /dev/null
+++ b/OpenSim/Framework/Data/IniConfig.cs
@@ -0,0 +1,100 @@
+/*
+* 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.Text.RegularExpressions;
+
+/* 
+ Taken from public code listing at by Alex Pinsker
+ http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
+ */
+
+namespace OpenSim.Framework.Data
+{
+    /// <summary>
+    /// Parse settings from ini-like files
+    /// </summary>
+    public class IniFile
+    {
+        static IniFile()
+        {
+            _iniKeyValuePatternRegex = new Regex(
+                @"((\s)*(?<Key>([^\=^\s^\n]+))[\s^\n]*
+                # key part (surrounding whitespace stripped)
+                \=
+                (\s)*(?<Value>([^\n^\s]+(\n){0,1})))
+                # value part (surrounding whitespace stripped)
+                ",
+                RegexOptions.IgnorePatternWhitespace |
+                RegexOptions.Compiled |
+                RegexOptions.CultureInvariant);
+        }
+        static private Regex _iniKeyValuePatternRegex;
+
+        public IniFile(string iniFileName)
+        {
+            _iniFileName = iniFileName;
+        }
+
+        public string ParseFileReadValue(string key)
+        {
+            using (StreamReader reader =
+                  new StreamReader(_iniFileName))
+            {
+                do
+                {
+                    string line = reader.ReadLine();
+                    Match match =
+                        _iniKeyValuePatternRegex.Match(line);
+                    if (match.Success)
+                    {
+                        string currentKey =
+                                match.Groups["Key"].Value as string;
+                        if (currentKey != null &&
+                       currentKey.Trim().CompareTo(key) == 0)
+                        {
+                            string value =
+                              match.Groups["Value"].Value as string;
+                            return value;
+                        }
+                    }
+
+                }
+                while (reader.Peek() != -1);
+            }
+            return null;
+        }
+
+        public string IniFileName
+        {
+            get { return _iniFileName; }
+        }    private string _iniFileName;
+    }
+}
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
new file mode 100644
index 0000000..8a3a664
--- /dev/null
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -0,0 +1,187 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data
+{
+    /// <summary>
+    /// Inventory Item - contains all the properties associated with an individual inventory piece.
+    /// </summary>
+    public class InventoryItemBase
+    {
+        /// <summary>
+        /// A UUID containing the ID for the inventory item itself
+        /// </summary>
+        public LLUUID inventoryID;
+        /// <summary>
+        /// The UUID of the associated asset on the asset server
+        /// </summary>
+        public LLUUID assetID;
+        /// <summary>
+        /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
+        /// </summary>
+        public int type;
+        /// <summary>
+        /// The folder this item is contained in (NULL_KEY = Inventory Root)
+        /// </summary>
+        public LLUUID parentFolderID;
+        /// <summary>
+        /// The owner of this inventory item
+        /// </summary>
+        public LLUUID avatarID;
+        /// <summary>
+        /// The name of the inventory item (must be less than 64 characters)
+        /// </summary>
+        public string inventoryName;
+        /// <summary>
+        /// The description of the inventory item (must be less than 64 characters)
+        /// </summary>
+        public string inventoryDescription;
+        /// <summary>
+        /// A mask containing the permissions for the next owner (cannot be enforced)
+        /// </summary>
+        public uint inventoryNextPermissions;
+        /// <summary>
+        /// A mask containing permissions for the current owner (cannot be enforced)
+        /// </summary>
+        public uint inventoryCurrentPermissions;
+    }
+
+    /// <summary>
+    /// A Class for folders which contain users inventory
+    /// </summary>
+    public class InventoryFolderBase
+    {
+        /// <summary>
+        /// The name of the folder (64 characters or less)
+        /// </summary>
+        public string name;
+        /// <summary>
+        /// The agent who's inventory this is contained by
+        /// </summary>
+        public LLUUID agentID;
+        /// <summary>
+        /// The folder this folder is contained in (NULL_KEY for root)
+        /// </summary>
+        public LLUUID parentID;
+        /// <summary>
+        /// The UUID for this folder
+        /// </summary>
+        public LLUUID folderID;
+    }
+
+    /// <summary>
+    /// An interface for accessing inventory data from a storage server
+    /// </summary>
+    public interface IInventoryData
+    {
+        /// <summary>
+        /// Initialises the interface
+        /// </summary>
+        void Initialise();
+
+        /// <summary>
+        /// Closes the interface
+        /// </summary>
+        void Close();
+
+        /// <summary>
+        /// The plugin being loaded
+        /// </summary>
+        /// <returns>A string containing the plugin name</returns>
+        string getName();
+
+        /// <summary>
+        /// The plugins version
+        /// </summary>
+        /// <returns>A string containing the plugin version</returns>
+        string getVersion();
+
+        /// <summary>
+        /// Returns a list of inventory items contained within the specified folder
+        /// </summary>
+        /// <param name="folderID">The UUID of the target folder</param>
+        /// <returns>A List of InventoryItemBase items</returns>
+        List<InventoryItemBase> getInventoryInFolder(LLUUID folderID);
+
+        /// <summary>
+        /// Returns a list of folders in the users inventory root.
+        /// </summary>
+        /// <param name="user">The UUID of the user who is having inventory being returned</param>
+        /// <returns>A list of folders</returns>
+        List<InventoryFolderBase> getUserRootFolders(LLUUID user);
+
+        /// <summary>
+        /// Returns a list of inventory folders contained in the folder 'parentID'
+        /// </summary>
+        /// <param name="parentID">The folder to get subfolders for</param>
+        /// <returns>A list of inventory folders</returns>
+        List<InventoryFolderBase> getInventoryFolders(LLUUID parentID);
+
+        /// <summary>
+        /// Returns an inventory item by its UUID
+        /// </summary>
+        /// <param name="item">The UUID of the item to be returned</param>
+        /// <returns>A class containing item information</returns>
+        InventoryItemBase getInventoryItem(LLUUID item);
+
+        /// <summary>
+        /// Returns a specified inventory folder by its UUID
+        /// </summary>
+        /// <param name="folder">The UUID of the folder to be returned</param>
+        /// <returns>A class containing folder information</returns>
+        InventoryFolderBase getInventoryFolder(LLUUID folder);
+
+        /// <summary>
+        /// Creates a new inventory item based on item
+        /// </summary>
+        /// <param name="item">The item to be created</param>
+        void addInventoryItem(InventoryItemBase item);
+
+        /// <summary>
+        /// Updates an inventory item with item (updates based on ID)
+        /// </summary>
+        /// <param name="item">The updated item</param>
+        void updateInventoryItem(InventoryItemBase item);
+
+        /// <summary>
+        /// Adds a new folder specified by folder
+        /// </summary>
+        /// <param name="folder">The inventory folder</param>
+        void addInventoryFolder(InventoryFolderBase folder);
+
+        /// <summary>
+        /// Updates a folder based on its ID with folder
+        /// </summary>
+        /// <param name="folder">The inventory folder</param>
+        void updateInventoryFolder(InventoryFolderBase folder);
+    }
+}
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
new file mode 100644
index 0000000..dcafbcd
--- /dev/null
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -0,0 +1,116 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Data</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Data</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GridData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ILogData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IniConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="InventoryData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ReservationData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimProfileData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserProfileData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj.user b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..1446673
--- /dev/null
+++ b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenGrid.Framework.Data")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenGrid.Framework.Data")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3a711c34-b0c0-4264-b0fe-f366eabf9d7b")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs
new file mode 100644
index 0000000..f404ebd
--- /dev/null
+++ b/OpenSim/Framework/Data/ReservationData.cs
@@ -0,0 +1,51 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using libsecondlife;
+
+namespace OpenSim.Framework.Data
+{
+    public class ReservationData
+    {
+        public LLUUID userUUID = new LLUUID();
+        public int reservationMinX = 0;
+        public int reservationMinY = 0;
+        public int reservationMaxX = 65536;
+        public int reservationMaxY = 65536;
+        
+        public string reservationName = "";
+        public string reservationCompany = "";
+        public bool status = true;
+
+        public string gridSendKey = "";
+        public string gridRecvKey = "";
+    }
+}
diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
new file mode 100644
index 0000000..201aa01
--- /dev/null
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -0,0 +1,114 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Data
+{
+    /// <summary>
+    /// A class which contains information known to the grid server about a region
+    /// </summary>
+    public class SimProfileData
+    {
+        /// <summary>
+        /// The name of the region
+        /// </summary>
+        public string regionName = "";
+
+        /// <summary>
+        /// A 64-bit number combining map position into a (mostly) unique ID
+        /// </summary>
+        public ulong regionHandle;
+
+        /// <summary>
+        /// OGS/OpenSim Specific ID for a region
+        /// </summary>
+        public libsecondlife.LLUUID UUID;
+
+        /// <summary>
+        /// Coordinates of the region
+        /// </summary>
+        public uint regionLocX;
+        public uint regionLocY;
+        public uint regionLocZ; // Reserved (round-robin, layers, etc)
+
+        /// <summary>
+        /// Authentication secrets
+        /// </summary>
+        /// <remarks>Not very secure, needs improvement.</remarks>
+        public string regionSendKey = "";
+        public string regionRecvKey = "";
+        public string regionSecret = "";
+
+        /// <summary>
+        /// Whether the region is online
+        /// </summary>
+        public bool regionOnline;
+
+        /// <summary>
+        /// Information about the server that the region is currently hosted on
+        /// </summary>
+        public string serverIP = "";
+        public uint serverPort;
+        public string serverURI = "";
+
+        /// <summary>
+        /// Set of optional overrides. Can be used to create non-eulicidean spaces.
+        /// </summary>
+        public ulong regionNorthOverrideHandle;
+        public ulong regionSouthOverrideHandle;
+        public ulong regionEastOverrideHandle;
+        public ulong regionWestOverrideHandle;
+
+        /// <summary>
+        /// Optional: URI Location of the region database
+        /// </summary>
+        /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
+        public string regionDataURI = "";
+
+        /// <summary>
+        /// Region Asset Details
+        /// </summary>
+        public string regionAssetURI = "";
+        public string regionAssetSendKey = "";
+        public string regionAssetRecvKey = "";
+
+        /// <summary>
+        /// Region Userserver Details
+        /// </summary>
+        public string regionUserURI = "";
+        public string regionUserSendKey = "";
+        public string regionUserRecvKey = "";
+
+        /// <summary>
+        /// Region Map Texture Asset
+        /// </summary>
+        public libsecondlife.LLUUID regionMapTextureID = new libsecondlife.LLUUID("00000000-0000-0000-9999-000000000006");
+    }
+}
diff --git a/OpenSim/Framework/Data/UserData.cs b/OpenSim/Framework/Data/UserData.cs
new file mode 100644
index 0000000..2e15b47
--- /dev/null
+++ b/OpenSim/Framework/Data/UserData.cs
@@ -0,0 +1,131 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data
+{
+    /// <summary>
+    /// An interface for connecting to user storage servers.
+    /// </summary>
+    public interface IUserData
+    {
+        /// <summary>
+        /// Returns a user profile from a database via their UUID
+        /// </summary>
+        /// <param name="user">The accounts UUID</param>
+        /// <returns>The user data profile</returns>
+        UserProfileData getUserByUUID(LLUUID user);
+
+        /// <summary>
+        /// Returns a users profile by searching their username
+        /// </summary>
+        /// <param name="name">The users username</param>
+        /// <returns>The user data profile</returns>
+        UserProfileData getUserByName(string name);
+
+        /// <summary>
+        /// Returns a users profile by searching their username parts
+        /// </summary>
+        /// <param name="fname">Account firstname</param>
+        /// <param name="lname">Account lastname</param>
+        /// <returns>The user data profile</returns>
+        UserProfileData getUserByName(string fname, string lname);
+
+        /// <summary>
+        /// Returns the current agent for a user searching by it's UUID
+        /// </summary>
+        /// <param name="user">The users UUID</param>
+        /// <returns>The current agent session</returns>
+        UserAgentData getAgentByUUID(LLUUID user);
+
+        /// <summary>
+        /// Returns the current session agent for a user searching by username
+        /// </summary>
+        /// <param name="name">The users account name</param>
+        /// <returns>The current agent session</returns>
+        UserAgentData getAgentByName(string name);
+
+        /// <summary>
+        /// Returns the current session agent for a user searching by username parts
+        /// </summary>
+        /// <param name="fname">The users first account name</param>
+        /// <param name="lname">The users account surname</param>
+        /// <returns>The current agent session</returns>
+        UserAgentData getAgentByName(string fname, string lname);
+
+        /// <summary>
+        /// Adds a new User profile to the database 
+        /// </summary>
+        /// <param name="user">UserProfile to add</param>
+        void addNewUserProfile(UserProfileData user);
+
+        /// <summary>
+        /// Adds a new agent to the database
+        /// </summary>
+        /// <param name="agent">The agent to add</param>
+        void addNewUserAgent(UserAgentData agent);
+
+        /// <summary>
+        /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES)
+        /// </summary>
+        /// <param name="from">The account to transfer from</param>
+        /// <param name="to">The account to transfer to</param>
+        /// <param name="amount">The amount to transfer</param>
+        /// <returns>Successful?</returns>
+        bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount);
+
+        /// <summary>
+        /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account.
+        /// </summary>
+        /// <param name="from">User to transfer from</param>
+        /// <param name="to">User to transfer to</param>
+        /// <param name="inventory">Specified inventory item</param>
+        /// <returns>Successful?</returns>
+        bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
+
+        /// <summary>
+        /// Returns the plugin version
+        /// </summary>
+        /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns>
+        string getVersion();
+
+        /// <summary>
+        /// Returns the plugin name
+        /// </summary>
+        /// <returns>Plugin name, eg MySQL User Provider</returns>
+        string getName();
+
+        /// <summary>
+        /// Initialises the plugin (artificial constructor)
+        /// </summary>
+        void Initialise();
+    }
+}
diff --git a/OpenSim/Framework/Data/UserProfileData.cs b/OpenSim/Framework/Data/UserProfileData.cs
new file mode 100644
index 0000000..00d422d
--- /dev/null
+++ b/OpenSim/Framework/Data/UserProfileData.cs
@@ -0,0 +1,182 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Data
+{
+    /// <summary>
+    /// Information about a particular user known to the userserver
+    /// </summary>
+    public class UserProfileData
+    {
+        /// <summary>
+        /// The ID value for this user
+        /// </summary>
+        public LLUUID UUID;
+
+        /// <summary>
+        /// The first component of a users account name
+        /// </summary>
+        public string username;
+        /// <summary>
+        /// The second component of a users account name
+        /// </summary>
+        public string surname;
+
+        /// <summary>
+        /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
+        /// </summary>
+        /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
+        public string passwordHash;
+        /// <summary>
+        /// The salt used for the users hash, should be 32 bytes or longer
+        /// </summary>
+        public string passwordSalt;
+
+        /// <summary>
+        /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into
+        /// </summary>
+        public ulong homeRegion;
+        /// <summary>
+        /// The coordinates inside the region of the home location
+        /// </summary>
+        public LLVector3 homeLocation;
+        /// <summary>
+        /// Where the user will be looking when they rez.
+        /// </summary>
+        public LLVector3 homeLookAt;
+
+        /// <summary>
+        /// A UNIX Timestamp (seconds since epoch) for the users creation
+        /// </summary>
+        public int created;
+        /// <summary>
+        /// A UNIX Timestamp for the users last login date / time
+        /// </summary>
+        public int lastLogin;
+
+        /// <summary>
+        /// A URI to the users inventory server, used for foreigners and large grids
+        /// </summary>
+        public string userInventoryURI;
+        /// <summary>
+        /// A URI to the users asset server, used for foreigners and large grids.
+        /// </summary>
+        public string userAssetURI;
+
+        /// <summary>
+        /// A uint mask containing the "I can do" fields of the users profile
+        /// </summary>
+        public uint profileCanDoMask;
+        /// <summary>
+        /// A uint mask containing the "I want to do" part of the users profile
+        /// </summary>
+        public uint profileWantDoMask; // Profile window "I want to" mask
+
+        /// <summary>
+        /// The about text listed in a users profile.
+        /// </summary>
+        public string profileAboutText;
+        /// <summary>
+        /// The first life about text listed in a users profile
+        /// </summary>
+        public string profileFirstText;
+
+        /// <summary>
+        /// The profile image for an avatar stored on the asset server
+        /// </summary>
+        public LLUUID profileImage;
+        /// <summary>
+        /// The profile image for the users first life tab
+        /// </summary>
+        public LLUUID profileFirstImage;
+        /// <summary>
+        /// The users last registered agent (filled in on the user server)
+        /// </summary>
+        public UserAgentData currentAgent;
+    }
+
+    /// <summary>
+    /// Information about a users session
+    /// </summary>
+    public class UserAgentData
+    {
+        /// <summary>
+        /// The UUID of the users avatar (not the agent!)
+        /// </summary>
+        public LLUUID UUID;
+        /// <summary>
+        /// The IP address of the user
+        /// </summary>
+        public string agentIP;
+        /// <summary>
+        /// The port of the user
+        /// </summary>
+        public uint agentPort;
+        /// <summary>
+        /// Is the user online?
+        /// </summary>
+        public bool agentOnline;
+        /// <summary>
+        /// The session ID for the user (also the agent ID)
+        /// </summary>
+        public LLUUID sessionID;
+        /// <summary>
+        /// The "secure" session ID for the user
+        /// </summary>
+        /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks>
+        public LLUUID secureSessionID;
+        /// <summary>
+        /// The region the user logged into initially
+        /// </summary>
+        public LLUUID regionID;
+        /// <summary>
+        /// A unix timestamp from when the user logged in
+        /// </summary>
+        public int loginTime;
+        /// <summary>
+        /// When this agent expired and logged out, 0 if still online
+        /// </summary>
+        public int logoutTime;
+        /// <summary>
+        /// Current region the user is logged into
+        /// </summary>
+        public LLUUID currentRegion;
+        /// <summary>
+        /// Region handle of the current region the user is in
+        /// </summary>
+        public ulong currentHandle;
+        /// <summary>
+        /// The position of the user within the region
+        /// </summary>
+        public LLVector3 currentPos;
+    }
+}
diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
new file mode 100644
index 0000000..fbf4d23
--- /dev/null
+++ b/OpenSim/Framework/General/AgentInventory.cs
@@ -0,0 +1,267 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Framework.Inventory
+{
+    public class AgentInventory
+    {
+        //Holds the local copy of Inventory info for a agent
+        public Dictionary<LLUUID, InventoryFolder> InventoryFolders;
+        public Dictionary<LLUUID, InventoryItem> InventoryItems;
+        public InventoryFolder InventoryRoot;
+        public int LastCached;  //maybe used by opensim app, time this was last stored/compared to user server
+        public LLUUID AgentID;
+        public AvatarWearable[] Wearables;
+
+        public AgentInventory()
+        {
+            InventoryFolders = new Dictionary<LLUUID, InventoryFolder>();
+            InventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.Initialise();
+        }
+
+        public virtual void Initialise()
+        {
+            Wearables = new AvatarWearable[13]; //should be 12 of these
+            for (int i = 0; i < 13; i++)
+            {
+                Wearables[i] = new AvatarWearable();
+            }
+      
+        }
+
+        public bool CreateNewFolder(LLUUID folderID, ushort type)
+        {
+            InventoryFolder Folder = new InventoryFolder();
+            Folder.FolderID = folderID;
+            Folder.OwnerID = this.AgentID;
+            Folder.DefaultType = type;
+            this.InventoryFolders.Add(Folder.FolderID, Folder);
+            return (true);
+        }
+
+        public void CreateRootFolder(LLUUID newAgentID, bool createTextures)
+        {
+            this.AgentID = newAgentID;
+            InventoryRoot = new InventoryFolder();
+            InventoryRoot.FolderID = LLUUID.Random();
+            InventoryRoot.ParentID = new LLUUID();
+            InventoryRoot.Version = 1;
+            InventoryRoot.DefaultType = 8;
+            InventoryRoot.OwnerID = this.AgentID;
+            InventoryRoot.FolderName = "My Inventory";
+            InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
+            InventoryRoot.OwnerID = this.AgentID;
+            if (createTextures)
+            {
+                this.CreateNewFolder(LLUUID.Random(), 0, "Textures", InventoryRoot.FolderID);
+            }
+        }
+
+        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName)
+        {
+            InventoryFolder Folder = new InventoryFolder();
+            Folder.FolderID = folderID;
+            Folder.OwnerID = this.AgentID;
+            Folder.DefaultType = type;
+            Folder.FolderName = folderName;
+            this.InventoryFolders.Add(Folder.FolderID, Folder);
+
+            return (true);
+        }
+
+        public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parent)
+        {
+            if (!this.InventoryFolders.ContainsKey(folderID))
+            {
+                System.Console.WriteLine("creating new folder called " + folderName + " in agents inventory");
+                InventoryFolder Folder = new InventoryFolder();
+                Folder.FolderID = folderID;
+                Folder.OwnerID = this.AgentID;
+                Folder.DefaultType = type;
+                Folder.FolderName = folderName;
+                Folder.ParentID = parent;
+                this.InventoryFolders.Add(Folder.FolderID, Folder);
+            }
+
+            return (true);
+        }
+
+        public bool HasFolder(LLUUID folderID)
+        {
+            if (this.InventoryFolders.ContainsKey(folderID))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public LLUUID GetFolderID(string folderName)
+        {
+            foreach (InventoryFolder inv in this.InventoryFolders.Values)
+            {
+                if (inv.FolderName == folderName)
+                {
+                    return inv.FolderID;
+                }
+            }
+
+            return LLUUID.Zero;
+        }
+
+        public bool UpdateItemAsset(LLUUID itemID, AssetBase asset)
+        {
+            if(this.InventoryItems.ContainsKey(itemID))
+            {
+                InventoryItem Item = this.InventoryItems[itemID];
+                Item.AssetID = asset.FullID;
+                System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() + " so it now is set to asset " + asset.FullID.ToStringHyphenated());
+                //TODO need to update the rest of the info
+            }
+            return true;
+        }
+
+        public bool UpdateItemDetails(LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
+        {
+            System.Console.WriteLine("updating inventory item details");
+            if (this.InventoryItems.ContainsKey(itemID))
+            {
+                System.Console.WriteLine("changing name to "+ Util.FieldToString(packet.Name));
+                InventoryItem Item = this.InventoryItems[itemID];
+                Item.Name = Util.FieldToString(packet.Name);
+                System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated());
+                //TODO need to update the rest of the info
+            }
+            return true;
+        }
+
+        public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)
+        {
+            if (this.InventoryFolders.ContainsKey(folderID))
+            {
+                LLUUID NewItemID = LLUUID.Random();
+
+                InventoryItem Item = new InventoryItem();
+                Item.FolderID = folderID;
+                Item.OwnerID = AgentID;
+                Item.AssetID = asset.FullID;
+                Item.ItemID = NewItemID;
+                Item.Type = asset.Type;
+                Item.Name = asset.Name;
+                Item.Description = asset.Description;
+                Item.InvType = asset.InvType;
+                this.InventoryItems.Add(Item.ItemID, Item);
+                InventoryFolder Folder = InventoryFolders[Item.FolderID];
+                Folder.Items.Add(Item);
+                return (Item.ItemID);
+            }
+            else
+            {
+                return (null);
+            }
+        }
+
+        public bool DeleteFromInventory(LLUUID itemID)
+        {
+            bool res = false;
+            if (this.InventoryItems.ContainsKey(itemID))
+            {
+                InventoryItem item = this.InventoryItems[itemID];
+                this.InventoryItems.Remove(itemID);
+                foreach (InventoryFolder fold in InventoryFolders.Values)
+                {
+                    if (fold.Items.Contains(item))
+                    {
+                        fold.Items.Remove(item);
+                        break;
+                    }
+                }
+                res = true;
+                
+            }
+            return res;
+        }
+    }
+
+    public class InventoryFolder
+    {
+        public List<InventoryItem> Items;
+        //public List<InventoryFolder> Subfolders;
+        public LLUUID FolderID;
+        public LLUUID OwnerID;
+        public LLUUID ParentID = LLUUID.Zero;
+        public string FolderName;
+        public ushort DefaultType;
+        public ushort Version;
+
+        public InventoryFolder()
+        {
+            Items = new List<InventoryItem>();
+            //Subfolders = new List<InventoryFolder>();
+        }
+
+    }
+
+    public class InventoryItem
+    {
+        public LLUUID FolderID;
+        public LLUUID OwnerID;
+        public LLUUID ItemID;
+        public LLUUID AssetID;
+        public LLUUID CreatorID;
+        public sbyte InvType;
+        public sbyte Type;
+        public string Name ="";
+        public string Description;
+
+        public InventoryItem()
+        {
+            this.CreatorID = LLUUID.Zero;
+        }
+
+        public string ExportString()
+        {
+            string typ = "notecard";
+            string result = "";
+            result += "\tinv_object\t0\n\t{\n";
+            result += "\t\tobj_id\t%s\n";
+            result +=  "\t\tparent_id\t"+ ItemID.ToString() +"\n";
+            result += "\t\ttype\t"+ typ +"\n";
+            result += "\t\tname\t" + Name+"|\n";
+            result += "\t}\n";
+            return result;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/AuthenticateSessionBase.cs b/OpenSim/Framework/General/AuthenticateSessionBase.cs
new file mode 100644
index 0000000..73dd3e2
--- /dev/null
+++ b/OpenSim/Framework/General/AuthenticateSessionBase.cs
@@ -0,0 +1,132 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework
+{
+    public class AuthenticateSessionsBase
+    {
+        public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
+
+        public AuthenticateSessionsBase()
+        {
+
+        }
+
+        public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)
+        {
+            AgentCircuitData validcircuit = null;
+            if (this.AgentCircuits.ContainsKey(circuitcode))
+            {
+                validcircuit = this.AgentCircuits[circuitcode];
+            }
+            AuthenticateResponse user = new AuthenticateResponse();
+            if (validcircuit == null)
+            {
+                //don't have this circuit code in our list
+                user.Authorised = false;
+                return (user);
+            }
+
+            if ((sessionID == validcircuit.SessionID) && (agentID == validcircuit.AgentID))
+            {
+                user.Authorised = true;
+                user.LoginInfo = new Login();
+                user.LoginInfo.Agent = agentID;
+                user.LoginInfo.Session = sessionID;
+                user.LoginInfo.SecureSession = validcircuit.SecureSessionID;
+                user.LoginInfo.First = validcircuit.firstname;
+                user.LoginInfo.Last = validcircuit.lastname;
+                user.LoginInfo.InventoryFolder = validcircuit.InventoryFolder;
+                user.LoginInfo.BaseFolder = validcircuit.BaseFolder;
+            }
+            else
+            {
+                // Invalid
+                user.Authorised = false;
+            }
+
+            return (user);
+        }
+
+        public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
+        {
+            if (this.AgentCircuits.ContainsKey(circuitCode))
+            {
+                this.AgentCircuits[circuitCode] = agentData;
+            }
+            else
+            {
+                this.AgentCircuits.Add(circuitCode, agentData);
+            }
+        }
+
+        public LLVector3 GetPosition(uint circuitCode)
+        {
+            LLVector3 vec = new LLVector3();
+            if (this.AgentCircuits.ContainsKey(circuitCode))
+            {
+                vec = this.AgentCircuits[circuitCode].startpos;
+            }
+            return vec;
+        }
+
+        public void UpdateAgentData(AgentCircuitData agentData)
+        {
+            if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode))
+            {
+                this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
+                this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
+                this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
+               // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
+            }
+        }
+
+        public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)
+        {
+            if (this.AgentCircuits.ContainsKey(circuitcode))
+            {
+                this.AgentCircuits[circuitcode].child = childstatus;
+            }
+        }
+
+        public bool GetAgentChildStatus(uint circuitcode)
+        {
+            if (this.AgentCircuits.ContainsKey(circuitcode))
+            {
+                return this.AgentCircuits[circuitcode].child;
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/General/BlockingQueue.cs b/OpenSim/Framework/General/BlockingQueue.cs
new file mode 100644
index 0000000..667b8d8
--- /dev/null
+++ b/OpenSim/Framework/General/BlockingQueue.cs
@@ -0,0 +1,60 @@
+/*
+* 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.Threading;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Utilities
+{
+    public class BlockingQueue<T>
+    {
+        private Queue<T> _queue = new Queue<T>();
+        private object _queueSync = new object();
+
+        public void Enqueue(T value)
+        {
+            lock (_queueSync)
+            {
+                _queue.Enqueue(value);
+                Monitor.Pulse(_queueSync);
+            }
+        }
+
+        public T Dequeue()
+        {
+            lock (_queueSync)
+            {
+                if (_queue.Count < 1)
+                    Monitor.Wait(_queueSync);
+
+                return _queue.Dequeue();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
new file mode 100644
index 0000000..0e80941
--- /dev/null
+++ b/OpenSim/Framework/General/IRegionCommsListener.cs
@@ -0,0 +1,47 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework
+{
+    public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
+    public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
+    public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
+
+    public interface IRegionCommsListener
+    {
+        event ExpectUserDelegate OnExpectUser;
+        event GenericCall2 OnExpectChildAgent;
+        event AgentCrossing OnAvatarCrossingIntoRegion;
+        event UpdateNeighbours OnNeighboursUpdate;
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
new file mode 100644
index 0000000..462e2c5
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
@@ -0,0 +1,51 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
+using libsecondlife;
+using OpenSim;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public class AuthenticateResponse
+    {
+        public bool Authorised;
+        public Login LoginInfo;
+
+        public AuthenticateResponse()
+        {
+
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
new file mode 100644
index 0000000..13980fe
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public interface IGenericConfig
+    {
+        void LoadData();
+        string GetAttribute(string attributeName);
+        bool SetAttribute(string attributeName, string attributeValue);
+        void Commit();
+        void Close();
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
new file mode 100644
index 0000000..0fafe1a
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
@@ -0,0 +1,63 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using libsecondlife;
+//using OpenSim.world;
+
+namespace OpenSim.Framework.Interfaces
+{
+    /// <summary>
+    /// </summary>
+
+
+    public abstract class GridConfig
+    {
+	public string GridOwner;
+        public string DefaultStartupMsg;
+        public string DefaultAssetServer;
+        public string AssetSendKey;
+        public string AssetRecvKey;
+        public string DefaultUserServer;
+        public string UserSendKey;
+        public string UserRecvKey;
+        public string SimSendKey;
+        public string SimRecvKey;
+
+
+        public abstract void InitConfig();
+
+    }
+
+    public interface IGridConfig
+    {
+        GridConfig GetConfigObject();
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
new file mode 100644
index 0000000..2f4b340
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
@@ -0,0 +1,57 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using libsecondlife;
+//using OpenSim.world;
+
+namespace OpenSim.Framework.Interfaces
+{
+    /// <summary>
+    /// </summary>
+
+
+    public abstract class UserConfig
+    {
+        public string DefaultStartupMsg;
+        public string GridServerURL;
+        public string GridSendKey;
+        public string GridRecvKey;
+
+
+        public abstract void InitConfig();
+
+    }
+
+    public interface IUserConfig
+    {
+        UserConfig GetConfigObject();
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
new file mode 100644
index 0000000..826392d
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
@@ -0,0 +1,69 @@
+/*
+* 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.Net;
+using System.Net.Sockets;
+using System.IO;
+using System.Threading;
+using libsecondlife;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework.Interfaces
+{
+    /// <summary>
+    /// Description of IAssetServer.
+    /// </summary>
+
+    public interface IAssetServer
+    {
+        void SetReceiver(IAssetReceiver receiver);
+        void RequestAsset(LLUUID assetID, bool isTexture);
+        void UpdateAsset(AssetBase asset);
+        void UploadNewAsset(AssetBase asset);
+        void SetServerInfo(string ServerUrl, string ServerKey);
+        void Close();
+    }
+
+    // could change to delegate?
+    public interface IAssetReceiver
+    {
+        void AssetReceived(AssetBase asset, bool IsTexture);
+        void AssetNotFound(AssetBase asset);
+    }
+
+    public interface IAssetPlugin
+    {
+        IAssetServer GetAssetServer();
+    }
+
+    public struct ARequest
+    {
+        public LLUUID AssetID;
+        public bool IsTexture;
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
new file mode 100644
index 0000000..009648c
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -0,0 +1,160 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Inventory;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
+    public delegate void RezObject(AssetBase primAsset, LLVector3 pos);
+    public delegate void ModifyTerrain(float height, float seconds, byte size, byte action, float north, float west);
+    public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
+    public delegate void StartAnim(LLUUID animID, int seq);
+    public delegate void LinkObjects(uint parent, List<uint> children);
+    public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);
+    public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
+
+    public delegate void GenericCall(IClientAPI remoteClient);
+    public delegate void GenericCall2();
+    public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.
+    public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
+    public delegate void GenericCall5(IClientAPI remoteClient, bool status);
+    public delegate void GenericCall6(LLUUID uid);
+
+    public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
+    public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
+    public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);
+    public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);
+    public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient);
+    public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);
+    public delegate void StatusChange(bool status);
+    public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
+    public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
+    public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient);
+
+    public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);
+    public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);
+    public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);
+    public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); // NOTETOSELFremove the packet part
+
+    public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
+
+    public interface IClientAPI
+    {
+        event ChatFromViewer OnChatFromViewer;
+        event RezObject OnRezObject;
+        event ModifyTerrain OnModifyTerrain;
+        event SetAppearance OnSetAppearance;
+        event StartAnim OnStartAnim;
+        event LinkObjects OnLinkObjects;
+        event RequestMapBlocks OnRequestMapBlocks;
+        event TeleportLocationRequest OnTeleportLocationRequest;
+
+        event GenericCall4 OnDeRezObject;
+        event GenericCall OnRegionHandShakeReply;
+        event GenericCall OnRequestWearables;
+        event GenericCall2 OnCompleteMovementToRegion;
+        event UpdateAgent OnAgentUpdate;
+        event GenericCall OnRequestAvatarsData;
+        event GenericCall4 OnAddPrim;
+        event UpdateVector OnGrapObject;
+        event ObjectSelect OnDeGrapObject;
+        event MoveObject OnGrapUpdate;
+
+        event UpdateShape OnUpdatePrimShape;
+        event ObjectSelect OnObjectSelect;
+        event UpdatePrimFlags OnUpdatePrimFlags;
+        event UpdatePrimTexture OnUpdatePrimTexture;
+        event UpdateVector OnUpdatePrimPosition;
+        event UpdatePrimRotation OnUpdatePrimRotation;
+        event UpdateVector OnUpdatePrimScale;
+        event StatusChange OnChildAgentStatus;
+        event GenericCall2 OnStopMovement;
+        event NewAvatar OnNewAvatar;
+        event GenericCall6 OnRemoveAvatar;
+
+        event ParcelPropertiesRequest OnParcelPropertiesRequest;
+        event ParcelDivideRequest OnParcelDivideRequest;
+        event ParcelJoinRequest OnParcelJoinRequest;
+        event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
+
+        event EstateOwnerMessageRequest OnEstateOwnerMessage;
+
+        LLVector3 StartPos
+        {
+            get;
+            set;
+        }
+
+        LLUUID AgentId
+        {
+            get;
+        }
+
+        string FirstName
+        {
+            get;
+        }
+
+        string LastName
+        {
+            get;
+        }
+
+        void OutPacket(Packet newPack);
+        void SendWearables(AvatarWearable[] wearables);
+        void SendRegionHandshake(RegionInfo regionInfo);
+        void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
+        void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
+        void SendLayerData(float[] map);
+        void SendLayerData(int px, int py, float[] map);
+        void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
+        void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);
+        AgentCircuitData RequestClientInfo();
+        void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort);
+        void SendMapBlock(List<MapBlockData> mapBlocks);
+        void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
+        void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags);
+        void SendTeleportCancel();
+        void SendTeleportLocationStart();
+        void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance);
+
+        void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry);
+        void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);
+
+        void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
+        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID , uint flags);
+        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags);
+        void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
new file mode 100644
index 0000000..4987d10
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
@@ -0,0 +1,69 @@
+/*
+* 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 OpenSim.Framework.Types;
+
+namespace OpenSim.Framework.Interfaces
+{
+    /// <summary>
+    /// ILocalStorage. Really hacked together right now needs cleaning up
+    /// </summary>
+    public interface ILocalStorage
+    {
+        void Initialise(string datastore);
+
+        void StorePrim(PrimData prim);
+        void RemovePrim(LLUUID primID);
+        void LoadPrimitives(ILocalStorageReceiver receiver);
+
+        float[] LoadWorld();
+        void SaveMap(float[] heightmap);
+
+        void SaveParcels(ParcelData[] parcels);
+        void SaveParcel(ParcelData parcel);
+        void RemoveParcel(ParcelData parcel);
+        void RemoveAllParcels();
+        void LoadParcels(ILocalStorageParcelReceiver recv);
+
+        void ShutDown();
+    }
+
+    public interface ILocalStorageReceiver
+    {
+        void PrimFromStorage(PrimData prim);
+    }
+
+    public interface ILocalStorageParcelReceiver
+    {
+        void ParcelFromStorage(ParcelData data);
+        void NoParcelDataFromStorage();
+    }
+}
+
diff --git a/OpenSim/Framework/General/Interfaces/IUserServer.cs b/OpenSim/Framework/General/Interfaces/IUserServer.cs
new file mode 100644
index 0000000..c6e2223
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/IUserServer.cs
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Inventory;
+using libsecondlife;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public interface IUserServer
+    {
+        AgentInventory RequestAgentsInventory(LLUUID agentID);
+        void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
+        bool UpdateAgentsInventory(LLUUID agentID, AgentInventory inventory);
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IWorld.cs
new file mode 100644
index 0000000..4857417
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/IWorld.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public interface IWorld
+    {
+        void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
+        void RemoveClient(LLUUID agentID);
+        
+        RegionInfo RegionInfo { get; }
+        object SyncRoot { get; }
+        uint NextLocalId { get; }
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs b/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs
new file mode 100644
index 0000000..0c1627b
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+
+using libsecondlife;
+namespace OpenSim.Framework.Interfaces
+{
+    public interface IScriptAPI
+    {
+        LLVector3 GetEntityPosition(uint localID);
+        void SetEntityPosition(uint localID, float x, float y, float z);
+        uint GetRandomAvatarID();
+    }
+}
diff --git a/OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs b/OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs
new file mode 100644
index 0000000..ca50be0
--- /dev/null
+++ b/OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs
@@ -0,0 +1,41 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.Interfaces
+{
+    public interface IScriptEngine
+    {
+        bool Init(IScriptAPI api);
+        string GetName();
+        void LoadScript(string script, string scriptName, uint entityID);
+        void OnFrame();
+    }
+}
diff --git a/OpenSim/Framework/General/LLSDHelpers.cs b/OpenSim/Framework/General/LLSDHelpers.cs
new file mode 100644
index 0000000..051520c
--- /dev/null
+++ b/OpenSim/Framework/General/LLSDHelpers.cs
@@ -0,0 +1,246 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Xml;
+using libsecondlife;
+
+namespace OpenSim.Framework
+{
+    public class LLSDHelpers
+    {
+        public static string SerialiseLLSDReply(object obj)
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter writer = new XmlTextWriter(sw);
+            writer.Formatting = Formatting.None;
+            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+            LLSDHelpers.SerializeLLSDType(writer, obj);
+            writer.WriteEndElement();
+            writer.Close();
+            return sw.ToString();
+        }
+
+        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
+        {
+            Type myType = obj.GetType();
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            if (llsdattributes.Length > 0)
+            {
+                switch (llsdattributes[0].ObjectType)
+                {
+                    case "MAP":
+                        writer.WriteStartElement(String.Empty, "map", String.Empty);
+                        System.Reflection.FieldInfo[] fields = myType.GetFields();
+                        for (int i = 0; i < fields.Length; i++)
+                        {
+                            object fieldValue = fields[i].GetValue(obj);
+                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
+                            if (fieldAttributes.Length > 0)
+                            {
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteString(fields[i].Name);
+                                writer.WriteEndElement();
+                                SerializeLLSDType(writer, fieldValue);
+                            }
+                            else
+                            {
+                                //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteString(fields[i].Name);
+                                writer.WriteEndElement();
+                                LLSD.LLSDWriteOne(writer, fieldValue);
+                            }
+                        }
+                        writer.WriteEndElement();
+                        break;
+                    case "ARRAY":
+                        // LLSDArray arrayObject = obj as LLSDArray;
+                        // ArrayList a = arrayObject.Array;
+                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
+                        writer.WriteStartElement(String.Empty, "array", String.Empty);
+                        foreach (object item in a)
+                        {
+                            SerializeLLSDType(writer, item);
+                        }
+                        writer.WriteEndElement();
+                        break;
+                }
+            }
+            else
+            {
+                LLSD.LLSDWriteOne(writer, obj);
+            }
+        }
+
+        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
+        {
+            Type myType = obj.GetType();
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            if (llsdattributes.Length > 0)
+            {
+                switch (llsdattributes[0].ObjectType)
+                {
+                    case "MAP":
+                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
+                        while (enumerator.MoveNext())
+                        {
+                            System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
+                            if (field != null)
+                            {
+                                if (enumerator.Value is Hashtable)
+                                {
+                                    object fieldValue = field.GetValue(obj);
+                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
+                                }
+                                else if (enumerator.Value is ArrayList)
+                                {
+                                    object fieldValue = field.GetValue(obj);
+                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
+                                    //TODO
+                                    // the LLSD map/array types in the array need to be deserialised
+                                    // but first we need to know the right class to deserialise them into. 
+                                }
+                                else
+                                {
+                                    field.SetValue(obj, enumerator.Value);
+                                }
+                            }
+                        }
+                        break;
+                }
+            }
+            return obj;
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDMapLayerResponse
+    {
+        public LLSDMapRequest AgentData = new LLSDMapRequest();
+        public LLSDArray LayerData = new LLSDArray();
+
+        public LLSDMapLayerResponse()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDCapsDetails
+    {
+        public string MapLayer = "";
+        public string NewFileAgentInventory = "";
+        //public string EventQueueGet = "";
+
+        public LLSDCapsDetails()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDMapLayer
+    {
+        public int Left = 0;
+        public int Right = 0;
+        public int Top = 0;
+        public int Bottom = 0;
+        public LLUUID ImageID = LLUUID.Zero;
+
+        public LLSDMapLayer()
+        {
+           
+        }
+    }
+
+    [LLSDType("ARRAY")]
+    public class LLSDArray
+    {
+        public ArrayList Array = new ArrayList();
+
+        public LLSDArray()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDMapRequest
+    {
+        public int Flags = 0;
+
+        public LLSDMapRequest()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDUploadReply
+    {
+        public string new_asset = "";
+        public LLUUID new_inventory_item = LLUUID.Zero;
+        public string state = "";
+
+        public LLSDUploadReply()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDCapEvent
+    {
+        public int id = 0;
+        public LLSDArray events = new LLSDArray();
+
+        public LLSDCapEvent()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDEmpty
+    {
+        public LLSDEmpty()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDTest
+    {
+        public int Test1 = 20;
+        public int Test2 = 10;
+
+        public LLSDTest()
+        {
+
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Class)]
+    public class LLSDType : Attribute
+    {
+        private string myType;
+
+        public LLSDType(string type)
+        {
+            myType = type;
+
+        }
+
+        public string ObjectType
+        {
+            get
+            {
+                return myType;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Logger.cs b/OpenSim/Framework/General/Logger.cs
new file mode 100644
index 0000000..e7eaa03
--- /dev/null
+++ b/OpenSim/Framework/General/Logger.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework
+{
+    public class Logger
+    {
+        public static Logger Instance = new Logger( false );
+     
+        public delegate void LoggerMethodDelegate();
+        private delegate bool LoggerDelegate( LoggerMethodDelegate whatToDo );
+
+        
+        private LoggerDelegate m_delegate;
+        
+        public Logger( bool log )
+        {
+            if( log )
+            {
+                m_delegate = CatchAndLog;
+            }
+            else
+            {
+                m_delegate = DontCatch;
+            }
+        }
+        
+        public bool Wrap( LoggerMethodDelegate whatToDo )
+        {
+            return m_delegate( whatToDo );
+        }
+
+
+        private bool CatchAndLog(LoggerMethodDelegate whatToDo)
+        {
+            try
+            {
+                whatToDo();
+                return true;
+            }
+            catch(Exception e)
+            {
+                System.Console.WriteLine( "Exception logged!!! Woah!!!!" );
+                return false;
+            }
+        }
+
+        private bool DontCatch(LoggerMethodDelegate whatToDo)
+        {
+            whatToDo();
+            return true;
+        }
+
+        public class LoggerExample
+        {
+            public void TryWrap()
+            {
+                // This will log and ignore
+                Logger log = new Logger(true);
+
+                log.Wrap(delegate()
+                             {
+                                 Int16.Parse("waa!");
+                             });
+
+                // This will throw;            
+                try
+                {
+
+                    log = new Logger(false);
+
+                    log.Wrap(delegate()
+                                 {
+                                     Int16.Parse("waa!");
+                                 });
+                }
+                catch
+                {
+                    System.Console.WriteLine("Example barfed!");
+                }
+            }
+        }
+    }              
+}
diff --git a/OpenSim/Framework/General/LoginService.cs b/OpenSim/Framework/General/LoginService.cs
new file mode 100644
index 0000000..f14754f
--- /dev/null
+++ b/OpenSim/Framework/General/LoginService.cs
@@ -0,0 +1,41 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using Nwc.XmlRpc;
+using libsecondlife;
+
+namespace OpenSim.Framework.Grid
+{
+    public abstract class LoginService
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
new file mode 100644
index 0000000..e164d5a
--- /dev/null
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -0,0 +1,213 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AgentInventory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AuthenticateSessionBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BlockingQueue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IRegionCommsListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDHelpers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Logger.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LoginService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RegionCommsListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimProfile.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserProfile.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\AuthenticateResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\IAssetServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\IClientAPI.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\ILocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\IUserServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\IWorld.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\Config\IGenericConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\Config\IGridConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\Config\IUserConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\AgentCiruitData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\AgentWearable.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\AssetBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\AssetLandmark.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\AssetStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\EstateSettings.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\Login.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\MapBlockData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\NeighbourInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\NetworkServersInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\ParcelData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\PrimData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\RegionHandle.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\RegionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj.user b/OpenSim/Framework/General/OpenSim.Framework.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/General/Properties/AssemblyInfo.cs b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..86f5cdb
--- /dev/null
+++ b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.FrameWork")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.FrameWork")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a08e20c7-f191-4137-b1f0-9291408fa521")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
new file mode 100644
index 0000000..bba928f
--- /dev/null
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -0,0 +1,69 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Framework
+{
+    public class RegionCommsListener :IRegionCommsListener
+    {
+        public event ExpectUserDelegate OnExpectUser;
+        public event GenericCall2 OnExpectChildAgent;
+        public event AgentCrossing OnAvatarCrossingIntoRegion;
+        public event UpdateNeighbours OnNeighboursUpdate;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agent"></param>
+        /// <returns></returns>
+        public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData  agent)
+        {
+            if(OnExpectUser != null)
+            {
+                OnExpectUser(regionHandle, agent);
+                return true;
+            }
+
+            return false;
+        }
+
+        public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (OnAvatarCrossingIntoRegion != null)
+            {
+                OnAvatarCrossingIntoRegion(regionHandle, agentID, position);
+                return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Remoting.cs b/OpenSim/Framework/General/Remoting.cs
new file mode 100644
index 0000000..e6fdf70
--- /dev/null
+++ b/OpenSim/Framework/General/Remoting.cs
@@ -0,0 +1,136 @@
+/*
+* 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.Security.Cryptography;
+
+namespace OpenSim.Framework
+{
+    /// <summary>
+    /// NEEDS AUDIT.
+    /// </summary>
+    /// <remarks>
+    /// Suggested implementation
+    /// <para>Store two digests for each foreign host. A local copy of the local hash using the local challenge (when issued), and a local copy of the remote hash using the remote challenge.</para>
+    /// <para>When sending data to the foreign host - run 'Sign' on the data and affix the returned byte[] to the message.</para>
+    /// <para>When recieving data from the foreign host - run 'Authenticate' against the data and the attached byte[].</para>
+    /// <para>Both hosts should be performing these operations for this to be effective.</para>
+    /// </remarks>
+    class RemoteDigest
+    {
+        private byte[] currentHash;
+        private byte[] secret;
+
+        private SHA512Managed SHA512;
+
+        /// <summary>
+        /// Initialises a new RemoteDigest authentication mechanism
+        /// </summary>
+        /// <remarks>Needs an audit by a cryptographic professional - was not "roll your own"'d by choice but rather a serious lack of decent authentication mechanisms in .NET remoting</remarks>
+        /// <param name="sharedSecret">The shared secret between systems (for inter-sim, this is provided in encrypted form during connection, for grid this is input manually in setup)</param>
+        /// <param name="salt">Binary salt - some common value - to be decided what</param>
+        /// <param name="challenge">The challenge key provided by the third party</param>
+        public RemoteDigest(string sharedSecret, byte[] salt, string challenge)
+        {
+            SHA512 = new SHA512Managed();
+            Rfc2898DeriveBytes RFC2898 = new Rfc2898DeriveBytes(sharedSecret,salt);
+            secret = RFC2898.GetBytes(512);
+            ASCIIEncoding ASCII = new ASCIIEncoding();
+
+            currentHash = SHA512.ComputeHash(AppendArrays(secret, ASCII.GetBytes(challenge)));
+        }
+
+        /// <summary>
+        /// Authenticates a piece of incoming data against the local digest. Upon successful authentication, digest string is incremented.
+        /// </summary>
+        /// <param name="data">The incoming data</param>
+        /// <param name="digest">The remote digest</param>
+        /// <returns></returns>
+        public bool Authenticate(byte[] data, byte[] digest)
+        {
+            byte[] newHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
+            if (digest == newHash)
+            {
+                currentHash = newHash;
+                return true;
+            }
+            else
+            {
+                throw new Exception("Hash comparison failed. Key resync required.");
+            }
+        }
+
+        /// <summary>
+        /// Signs a new bit of data with the current hash. Returns a byte array which should be affixed to the message.
+        /// Signing a piece of data will automatically increment the hash - if you sign data and do not send it, the 
+        /// hashes will get out of sync and throw an exception when validation is attempted.
+        /// </summary>
+        /// <param name="data">The outgoing data</param>
+        /// <returns>The local digest</returns>
+        public byte[] Sign(byte[] data)
+        {
+            currentHash = SHA512.ComputeHash(AppendArrays(AppendArrays(currentHash, secret), data));
+            return currentHash;
+        }
+
+        /// <summary>
+        /// Generates a new challenge string to be issued to a foreign host. Challenges are 1024-bit (effective strength of less than 512-bits) messages generated using the Crytographic Random Number Generator.
+        /// </summary>
+        /// <returns>A 128-character hexadecimal string containing the challenge.</returns>
+        public static string GenerateChallenge()
+        {
+            RNGCryptoServiceProvider RNG = new RNGCryptoServiceProvider();
+            byte[] bytes = new byte[64];
+            RNG.GetBytes(bytes);
+
+            StringBuilder sb = new StringBuilder(bytes.Length * 2);
+            foreach (byte b in bytes)
+            {
+                sb.AppendFormat("{0:x2}", b);
+            }
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Helper function, merges two byte arrays
+        /// </summary>
+        /// <remarks>Sourced from MSDN Forum</remarks>
+        /// <param name="a">A</param>
+        /// <param name="b">B</param>
+        /// <returns>C</returns>
+        private byte[] AppendArrays(byte[] a, byte[] b)
+        {
+            byte[] c = new byte[a.Length + b.Length];
+            Buffer.BlockCopy(a, 0, c, 0, a.Length);
+            Buffer.BlockCopy(b, 0, c, a.Length, b.Length);
+            return c;
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/General/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
new file mode 100644
index 0000000..cfa5e50
--- /dev/null
+++ b/OpenSim/Framework/General/SimProfile.cs
@@ -0,0 +1,122 @@
+/*
+* 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.Collections;
+using System.Xml;
+using System.Text;
+using libsecondlife;
+using Nwc.XmlRpc;
+
+namespace OpenSim.Framework.Sims
+{
+    public class SimProfile
+    {
+        public LLUUID UUID;
+        public ulong regionhandle;
+        public string regionname;
+        public string sim_ip;
+        public uint sim_port;
+        public string caps_url;
+        public uint RegionLocX;
+        public uint RegionLocY;
+        public string sendkey;
+        public string recvkey;
+        public bool online;
+
+        public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey)
+        {
+            try
+            {
+                Hashtable GridReqParams = new Hashtable();
+                GridReqParams["region_handle"] = region_handle.ToString();
+                GridReqParams["authkey"] = SendKey;
+                ArrayList SendParams = new ArrayList();
+                SendParams.Add(GridReqParams);
+                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
+
+                XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
+
+                Hashtable RespData = (Hashtable)GridResp.Value;
+                this.UUID = new LLUUID((string)RespData["UUID"]);
+                this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
+                this.regionname = (string)RespData["regionname"];
+                this.sim_ip = (string)RespData["sim_ip"];
+                this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
+                this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
+                this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
+                this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
+                this.sendkey = SendKey;
+                this.recvkey = RecvKey;
+            }
+            catch (Exception e)
+            {
+                System.Console.WriteLine(e.ToString());
+            }
+            return this;
+        }
+
+        public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
+        {
+            try
+            {
+                Hashtable GridReqParams = new Hashtable();
+                GridReqParams["UUID"] = UUID.ToString();
+                GridReqParams["authkey"] = SendKey;
+                ArrayList SendParams = new ArrayList();
+                SendParams.Add(GridReqParams);
+                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
+
+                XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
+
+                Hashtable RespData = (Hashtable)GridResp.Value;
+                this.UUID = new LLUUID((string)RespData["UUID"]);
+                this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
+                this.regionname = (string)RespData["regionname"];
+                this.sim_ip = (string)RespData["sim_ip"];
+                this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
+                this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
+                this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
+                this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
+                this.sendkey = SendKey;
+                this.recvkey = RecvKey;
+            }
+            catch (Exception e)
+            {
+                System.Console.WriteLine(e.ToString());
+            }
+            return this;
+        }
+
+
+        public SimProfile()
+        {
+        }
+    }
+
+}
diff --git a/OpenSim/Framework/General/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs
new file mode 100644
index 0000000..a650343
--- /dev/null
+++ b/OpenSim/Framework/General/Types/AgentCiruitData.cs
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class AgentCircuitData
+    {
+        public AgentCircuitData() { }
+        public LLUUID AgentID;
+        public LLUUID SessionID;
+        public LLUUID SecureSessionID;
+        public LLVector3 startpos;
+        public string firstname;
+        public string lastname;
+        public uint circuitcode;
+        public bool child;
+        public LLUUID InventoryFolder;
+        public LLUUID BaseFolder;
+        public string CapsPath = ""; 
+    }
+}
diff --git a/OpenSim/Framework/General/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
new file mode 100644
index 0000000..4c93da7
--- /dev/null
+++ b/OpenSim/Framework/General/Types/AgentWearable.cs
@@ -0,0 +1,60 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class AvatarWearable
+    {
+        public LLUUID AssetID = new LLUUID("00000000-0000-0000-0000-000000000000");
+        public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");
+
+        public AvatarWearable()
+        {
+
+        }
+
+        public static AvatarWearable[] DefaultWearables
+        {
+            get
+            {
+                AvatarWearable[] defaultWearables =  new AvatarWearable[13]; //should be 13 of these
+                for (int i = 0; i < 13; i++)
+                {
+                    defaultWearables[i] = new AvatarWearable();
+                }
+                defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
+                defaultWearables[0].ItemID = LLUUID.Random();
+                return defaultWearables;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs
new file mode 100644
index 0000000..86586a6
--- /dev/null
+++ b/OpenSim/Framework/General/Types/AssetBase.cs
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class AssetBase
+    {
+        public byte[] Data;
+        public LLUUID FullID;
+        public sbyte Type;
+        public sbyte InvType;
+        public string Name;
+        public string Description;
+
+        public AssetBase()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs
new file mode 100644
index 0000000..8a10b70
--- /dev/null
+++ b/OpenSim/Framework/General/Types/AssetLandmark.cs
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class AssetLandmark : AssetBase
+    {
+        public int Version;
+        public LLVector3 Position;
+        public LLUUID RegionID;
+
+        public AssetLandmark(AssetBase a)
+        {
+            this.Data = a.Data;
+            this.FullID = a.FullID;
+            this.Type = a.Type;
+            this.InvType = a.InvType;
+            this.Name = a.Name;
+            this.Description = a.Description;
+            InternData();
+        }
+
+        private void InternData()
+        {
+            string temp = System.Text.Encoding.UTF8.GetString(Data).Trim(); 
+            string[] parts = temp.Split('\n');
+            int.TryParse(parts[0].Substring(17, 1), out Version);
+            LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);
+            LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position);
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs
new file mode 100644
index 0000000..8cac23a
--- /dev/null
+++ b/OpenSim/Framework/General/Types/AssetStorage.cs
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+	public class AssetStorage
+	{
+
+		public AssetStorage() {
+		}
+
+		public AssetStorage(LLUUID assetUUID) {
+			UUID=assetUUID;
+		}
+
+		public byte[] Data;
+		public sbyte Type;
+		public string Name;
+		public LLUUID UUID;
+	}
+}
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
new file mode 100644
index 0000000..778c893
--- /dev/null
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
@@ -0,0 +1,97 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class EstateSettings
+    {
+        //Settings to this island
+        public float billableFactor = (float)0.0;
+        public uint estateID = 0;
+        public uint parentEstateID = 0;
+
+        public byte maxAgents = 40;
+        public float objectBonusFactor = (float)1.0;
+
+        public int redirectGridX = 0; //??
+        public int redirectGridY = 0; //??
+        public libsecondlife.Simulator.RegionFlags regionFlags = libsecondlife.Simulator.RegionFlags.None; //Booleam values of various region settings
+        public libsecondlife.Simulator.SimAccess simAccess = libsecondlife.Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
+        public float sunHour = 0;
+
+        public float terrainRaiseLimit = 0;
+        public float terrainLowerLimit = 0;
+
+        public bool useFixedSun = false;
+        public int pricePerMeter = 1;
+
+        public ushort regionWaterHeight = 20;
+        public bool regionAllowTerraform = true;
+
+        // Region Information
+        // Low resolution 'base' textures. No longer used.
+        public LLUUID terrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default
+        public LLUUID terrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default
+        public LLUUID terrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default
+        public LLUUID terrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default
+
+        // Higher resolution terrain textures
+        public LLUUID terrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");
+        public LLUUID terrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");
+        public LLUUID terrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");
+        public LLUUID terrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");
+
+        // First quad - each point is bilinearly interpolated at each meter of terrain
+        public float terrainStartHeight0 = 10.0f;      
+        public float terrainStartHeight1 = 10.0f;      
+        public float terrainStartHeight2 = 10.0f;       
+        public float terrainStartHeight3 = 10.0f;       
+
+        // Second quad - also bilinearly interpolated.
+        // Terrain texturing is done that:
+        // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
+        public float terrainHeightRange0 = 60.0f; //00
+        public float terrainHeightRange1 = 60.0f; //01
+        public float terrainHeightRange2 = 60.0f; //10
+        public float terrainHeightRange3 = 60.0f; //11
+
+        // Terrain Default (Must be in F32 Format!)
+        public string terrainFile = "default.r32";
+        public double terrainMultiplier = 60.0;
+        public float waterHeight = (float)20.0;
+
+        public LLUUID terrainImageID = LLUUID.Zero; // the assetID that is the current Map image for this region
+
+    }
+}
diff --git a/OpenSim/Framework/General/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs
new file mode 100644
index 0000000..3180a16
--- /dev/null
+++ b/OpenSim/Framework/General/Types/Login.cs
@@ -0,0 +1,52 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class Login
+    {
+        public string First = "Test";
+        public string Last = "User";
+        public LLUUID Agent;
+        public LLUUID Session;
+        public LLUUID SecureSession = LLUUID.Zero;
+        public LLUUID InventoryFolder;
+        public LLUUID BaseFolder;
+        public uint CircuitCode;
+        public string CapsPath ="";
+
+        public Login()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs
new file mode 100644
index 0000000..2e6f56e
--- /dev/null
+++ b/OpenSim/Framework/General/Types/MapBlockData.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class MapBlockData
+    {
+        public uint Flags;
+        public ushort X;
+        public ushort Y;
+        public byte Agents;
+        public byte Access;
+        public byte WaterHeight;
+        public LLUUID MapImageId;
+        public String Name;
+        public uint RegionFlags;
+
+        public MapBlockData()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs
new file mode 100644
index 0000000..310fd1c
--- /dev/null
+++ b/OpenSim/Framework/General/Types/NeighbourInfo.cs
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Console;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class NeighbourInfo
+    {
+        public NeighbourInfo()
+        {
+        }
+
+        public ulong regionhandle;
+        public uint RegionLocX;
+        public uint RegionLocY;
+        public string sim_ip;
+        public uint sim_port;
+    }
+}
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
new file mode 100644
index 0000000..73d7811
--- /dev/null
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -0,0 +1,181 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Interfaces;
+
+namespace OpenSim.Framework.Types
+{
+    public class NetworkServersInfo
+    {
+        public string AssetURL = "http://127.0.0.1:8003/";
+        public string AssetSendKey = "";
+
+        public string GridURL = "";
+        public string GridSendKey = "";
+        public string GridRecvKey = "";
+        public string UserURL = "";
+        public string UserSendKey = "";
+        public string UserRecvKey = "";
+        public bool isSandbox;
+
+        public uint DefaultHomeLocX = 0;
+        public uint DefaultHomeLocY = 0;
+
+        public int HttpListenerPort = 9000;
+        public int RemotingListenerPort = 8895;
+
+        public void InitConfig(bool sandboxMode, IGenericConfig configData)
+        {
+            this.isSandbox = sandboxMode;
+
+            try
+            {
+                string attri = "";
+
+                attri = "";
+                attri = configData.GetAttribute("HttpListenerPort");
+                if (attri == "")
+                {
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Http Listener Port", "9000");
+                    configData.SetAttribute("HttpListenerPort", location);
+                    this.HttpListenerPort = Convert.ToInt32(location);
+                }
+                else
+                {
+                    this.HttpListenerPort = Convert.ToInt32(attri);
+                }
+
+                attri = "";
+                attri = configData.GetAttribute("RemotingListenerPort");
+                if (attri == "")
+                {
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");
+                    configData.SetAttribute("RemotingListenerPort", location);
+                    this.RemotingListenerPort = Convert.ToInt32(location);
+                }
+                else
+                {
+                    this.RemotingListenerPort = Convert.ToInt32(attri);
+                }
+
+                if (sandboxMode)
+                {
+                    // default home location X
+                    attri = "";
+                    attri = configData.GetAttribute("DefaultLocationX");
+                    if (attri == "")
+                    {
+                        string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
+                        configData.SetAttribute("DefaultLocationX", location);
+                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
+                    }
+                    else
+                    {
+                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri);
+                    }
+
+                    // default home location Y
+                    attri = "";
+                    attri = configData.GetAttribute("DefaultLocationY");
+                    if (attri == "")
+                    {
+                        string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
+                        configData.SetAttribute("DefaultLocationY", location);
+                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
+                    }
+                    else
+                    {
+                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri);
+                    }
+                }
+                if (!isSandbox)
+                {
+                    //Grid Server 
+                    attri = "";
+                    attri = configData.GetAttribute("GridServerURL");
+                    if (attri == "")
+                    {
+                        this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
+                        configData.SetAttribute("GridServerURL", this.GridURL);
+                    }
+                    else
+                    {
+                        this.GridURL = attri;
+                    }
+
+                    //Grid Send Key
+                    attri = "";
+                    attri = configData.GetAttribute("GridSendKey");
+                    if (attri == "")
+                    {
+                        this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
+                        configData.SetAttribute("GridSendKey", this.GridSendKey);
+                    }
+                    else
+                    {
+                        this.GridSendKey = attri;
+                    }
+
+                    //Grid Receive Key
+                    attri = "";
+                    attri = configData.GetAttribute("GridRecvKey");
+                    if (attri == "")
+                    {
+                        this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
+                        configData.SetAttribute("GridRecvKey", this.GridRecvKey);
+                    }
+                    else
+                    {
+                        this.GridRecvKey = attri;
+                    }
+
+                    attri = "";
+                    attri = configData.GetAttribute("AssetServerURL");
+                    if (attri == "")
+                    {
+                        this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
+                        configData.SetAttribute("AssetServerURL", this.GridURL);
+                    }
+                    else
+                    {
+                        this.AssetURL = attri;
+                    }
+
+                }
+                configData.Commit();
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
new file mode 100644
index 0000000..40f128a
--- /dev/null
+++ b/OpenSim/Framework/General/Types/ParcelData.cs
@@ -0,0 +1,115 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    
+        public class ParcelData
+        {
+            public byte[] parcelBitmapByteArray = new byte[512];
+            public string parcelName = "";
+            public string parcelDesc = "";
+            public LLUUID ownerID = new LLUUID();
+            public bool isGroupOwned = false;
+            public LLVector3 AABBMin = new LLVector3();
+            public LLVector3 AABBMax = new LLVector3();
+            public int area = 0;
+            public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
+            public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
+            public libsecondlife.Parcel.ParcelCategory category = new libsecondlife.Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
+            public int claimDate = 0; //Unemplemented
+            public int claimPrice = 0; //Unemplemented
+            public LLUUID groupID = new LLUUID(); //Unemplemented
+            public int groupPrims = 0; //Unemplemented
+            public int salePrice = 0; //Unemeplemented. Parcels price.
+            public libsecondlife.Parcel.ParcelStatus parcelStatus = libsecondlife.Parcel.ParcelStatus.None;
+            public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None;
+            public byte landingType = 0;
+            public byte mediaAutoScale = 0;
+            public LLUUID mediaID = LLUUID.Zero;
+            public int localID = 0;
+            public LLUUID globalID = new LLUUID();
+
+            public string mediaURL = "";
+            public string musicURL = "";
+            public float passHours = 0;
+            public int passPrice = 0;
+            public LLUUID snapshotID = LLUUID.Zero;
+            public LLVector3 userLocation = new LLVector3();
+            public LLVector3 userLookAt = new LLVector3();
+
+            public ParcelData()
+            {
+                globalID = LLUUID.Random();
+            }
+
+            public ParcelData Copy()
+            {
+                ParcelData parcelData = new ParcelData();
+
+                parcelData.AABBMax = this.AABBMax;
+                parcelData.AABBMin = this.AABBMin;
+                parcelData.area = this.area;
+                parcelData.auctionID = this.auctionID;
+                parcelData.authBuyerID = this.authBuyerID;
+                parcelData.category = this.category;
+                parcelData.claimDate = this.claimDate;
+                parcelData.claimPrice = this.claimPrice;
+                parcelData.globalID = this.globalID;
+                parcelData.groupID = this.groupID;
+                parcelData.groupPrims = this.groupPrims;
+                parcelData.isGroupOwned = this.isGroupOwned;
+                parcelData.localID = this.localID;
+                parcelData.landingType = this.landingType;
+                parcelData.mediaAutoScale = this.mediaAutoScale;
+                parcelData.mediaID = this.mediaID;
+                parcelData.mediaURL = this.mediaURL;
+                parcelData.musicURL = this.musicURL;
+                parcelData.ownerID = this.ownerID;
+                parcelData.parcelBitmapByteArray = (byte[])this.parcelBitmapByteArray.Clone();
+                parcelData.parcelDesc = this.parcelDesc;
+                parcelData.parcelFlags = this.parcelFlags;
+                parcelData.parcelName = this.parcelName;
+                parcelData.parcelStatus = this.parcelStatus;
+                parcelData.passHours = this.passHours;
+                parcelData.passPrice = this.passPrice;
+                parcelData.salePrice = this.salePrice;
+                parcelData.snapshotID = this.snapshotID;
+                parcelData.userLocation = this.userLocation;
+                parcelData.userLookAt = this.userLookAt;
+
+                return parcelData;
+           
+            }
+        }
+    
+}
diff --git a/OpenSim/Framework/General/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs
new file mode 100644
index 0000000..f84ae3e
--- /dev/null
+++ b/OpenSim/Framework/General/Types/PrimData.cs
@@ -0,0 +1,230 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class PrimData
+    {
+        private const uint FULL_MASK_PERMISSIONS = 2147483647;
+
+        public LLUUID OwnerID;
+        public byte PCode;
+        public ushort PathBegin;
+        public ushort PathEnd;
+        public byte PathScaleX;
+        public byte PathScaleY;
+        public byte PathShearX;
+        public byte PathShearY;
+        public sbyte PathSkew;
+        public ushort ProfileBegin;
+        public ushort ProfileEnd;
+        public LLVector3 Scale;
+        public byte PathCurve;
+        public byte ProfileCurve;
+        public uint ParentID = 0;
+        public ushort ProfileHollow;
+        public sbyte PathRadiusOffset;
+        public byte PathRevolutions;
+        public sbyte PathTaperX;
+        public sbyte PathTaperY;
+        public sbyte PathTwist;
+        public sbyte PathTwistBegin;
+        public byte[] TextureEntry; // a LL textureEntry in byte[] format
+
+        public Int32 CreationDate;
+        public uint OwnerMask = FULL_MASK_PERMISSIONS;
+        public uint NextOwnerMask = FULL_MASK_PERMISSIONS;
+        public uint GroupMask = FULL_MASK_PERMISSIONS;
+        public uint EveryoneMask = FULL_MASK_PERMISSIONS;
+        public uint BaseMask = FULL_MASK_PERMISSIONS;
+
+        //following only used during prim storage
+        public LLVector3 Position;
+        public LLQuaternion Rotation = new LLQuaternion(0, 1, 0, 0);
+        public uint LocalID;
+        public LLUUID FullID;
+
+        public PrimData()
+        {
+
+        }
+
+        public PrimData(byte[] data)
+        {
+            int i = 0;
+
+            this.OwnerID = new LLUUID(data, i); i += 16;
+            this.PCode = data[i++];
+            this.PathBegin = (ushort)(data[i++] + (data[i++] << 8));
+            this.PathEnd = (ushort)(data[i++] + (data[i++] << 8));
+            this.PathScaleX = data[i++];
+            this.PathScaleY = data[i++];
+            this.PathShearX = data[i++];
+            this.PathShearY = data[i++];
+            this.PathSkew = (sbyte)data[i++];
+            this.ProfileBegin = (ushort)(data[i++] + (data[i++] << 8));
+            this.ProfileEnd = (ushort)(data[i++] + (data[i++] << 8));
+            this.Scale = new LLVector3(data, i); i += 12;
+            this.PathCurve = data[i++];
+            this.ProfileCurve = data[i++];
+            this.ParentID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.ProfileHollow = (ushort)(data[i++] + (data[i++] << 8));
+            this.PathRadiusOffset = (sbyte)data[i++];
+            this.PathRevolutions = data[i++];
+            this.PathTaperX = (sbyte)data[i++];
+            this.PathTaperY = (sbyte)data[i++];
+            this.PathTwist = (sbyte)data[i++];
+            this.PathTwistBegin = (sbyte)data[i++];
+            ushort length = (ushort)(data[i++] + (data[i++] << 8));
+            this.TextureEntry = new byte[length];
+            Array.Copy(data, i, TextureEntry, 0, length); i += length;
+            this.CreationDate = (Int32)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.OwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.NextOwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.GroupMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.EveryoneMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.BaseMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.Position = new LLVector3(data, i); i += 12;
+            this.Rotation = new LLQuaternion(data, i, true); i += 12;
+            this.LocalID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));
+            this.FullID = new LLUUID(data, i); i += 16;
+
+        }
+
+        public byte[] ToBytes()
+        {
+            int i = 0;
+            byte[] bytes = new byte[126 + TextureEntry.Length];
+            Array.Copy(OwnerID.GetBytes(), 0, bytes, i, 16); i += 16;
+            bytes[i++] = this.PCode;
+            bytes[i++] = (byte)(this.PathBegin % 256);
+            bytes[i++] = (byte)((this.PathBegin >> 8) % 256);
+            bytes[i++] = (byte)(this.PathEnd % 256);
+            bytes[i++] = (byte)((this.PathEnd >> 8) % 256);
+            bytes[i++] = this.PathScaleX;
+            bytes[i++] = this.PathScaleY;
+            bytes[i++] = this.PathShearX;
+            bytes[i++] = this.PathShearY;
+            bytes[i++] = (byte)this.PathSkew;
+            bytes[i++] = (byte)(this.ProfileBegin % 256);
+            bytes[i++] = (byte)((this.ProfileBegin >> 8) % 256);
+            bytes[i++] = (byte)(this.ProfileEnd % 256);
+            bytes[i++] = (byte)((this.ProfileEnd >> 8) % 256);
+            Array.Copy(Scale.GetBytes(), 0, bytes, i, 12); i += 12;
+            bytes[i++] = this.PathCurve;
+            bytes[i++] = this.ProfileCurve;
+            bytes[i++] = (byte)(ParentID % 256);
+            bytes[i++] = (byte)((ParentID >> 8) % 256);
+            bytes[i++] = (byte)((ParentID >> 16) % 256);
+            bytes[i++] = (byte)((ParentID >> 24) % 256);
+            bytes[i++] = (byte)(this.ProfileHollow % 256);
+            bytes[i++] = (byte)((this.ProfileHollow >> 8) % 256);
+            bytes[i++] = ((byte)this.PathRadiusOffset);
+            bytes[i++] = this.PathRevolutions;
+            bytes[i++] = ((byte)this.PathTaperX);
+            bytes[i++] = ((byte)this.PathTaperY);
+            bytes[i++] = ((byte)this.PathTwist);
+            bytes[i++] = ((byte)this.PathTwistBegin);
+            bytes[i++] = (byte)(TextureEntry.Length % 256);
+            bytes[i++] = (byte)((TextureEntry.Length >> 8) % 256);
+            Array.Copy(TextureEntry, 0, bytes, i, TextureEntry.Length); i += TextureEntry.Length;
+            bytes[i++] = (byte)(this.CreationDate % 256);
+            bytes[i++] = (byte)((this.CreationDate >> 8) % 256);
+            bytes[i++] = (byte)((this.CreationDate >> 16) % 256);
+            bytes[i++] = (byte)((this.CreationDate >> 24) % 256);
+            bytes[i++] = (byte)(this.OwnerMask % 256);
+            bytes[i++] = (byte)((this.OwnerMask >> 8) % 256);
+            bytes[i++] = (byte)((this.OwnerMask >> 16) % 256);
+            bytes[i++] = (byte)((this.OwnerMask >> 24) % 256);
+            bytes[i++] = (byte)(this.NextOwnerMask % 256);
+            bytes[i++] = (byte)((this.NextOwnerMask >> 8) % 256);
+            bytes[i++] = (byte)((this.NextOwnerMask >> 16) % 256);
+            bytes[i++] = (byte)((this.NextOwnerMask >> 24) % 256);
+            bytes[i++] = (byte)(this.GroupMask % 256);
+            bytes[i++] = (byte)((this.GroupMask >> 8) % 256);
+            bytes[i++] = (byte)((this.GroupMask >> 16) % 256);
+            bytes[i++] = (byte)((this.GroupMask >> 24) % 256);
+            bytes[i++] = (byte)(this.EveryoneMask % 256);
+            bytes[i++] = (byte)((this.EveryoneMask >> 8) % 256);
+            bytes[i++] = (byte)((this.EveryoneMask >> 16) % 256);
+            bytes[i++] = (byte)((this.EveryoneMask >> 24) % 256);
+            bytes[i++] = (byte)(this.BaseMask % 256);
+            bytes[i++] = (byte)((this.BaseMask >> 8) % 256);
+            bytes[i++] = (byte)((this.BaseMask >> 16) % 256);
+            bytes[i++] = (byte)((this.BaseMask >> 24) % 256);
+            Array.Copy(this.Position.GetBytes(), 0, bytes, i, 12); i += 12;
+            if (this.Rotation == new LLQuaternion(0, 0, 0, 0))
+            {
+                this.Rotation = new LLQuaternion(0, 1, 0, 0);
+            }
+            Array.Copy(this.Rotation.GetBytes(), 0, bytes, i, 12); i += 12;
+            bytes[i++] = (byte)(this.LocalID % 256);
+            bytes[i++] = (byte)((this.LocalID >> 8) % 256);
+            bytes[i++] = (byte)((this.LocalID >> 16) % 256);
+            bytes[i++] = (byte)((this.LocalID >> 24) % 256);
+            Array.Copy(FullID.GetBytes(), 0, bytes, i, 16); i += 16;
+
+            return bytes;
+        }
+
+        public static PrimData DefaultCube()
+        {
+            PrimData primData = new PrimData();
+            primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            primData.FullID = LLUUID.Random();
+            primData.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
+            primData.Rotation = new LLQuaternion(0, 0, 0, 1);
+            primData.PCode = 9;
+            primData.ParentID = 0;
+            primData.PathBegin = 0;
+            primData.PathEnd = 0;
+            primData.PathScaleX = 0;
+            primData.PathScaleY = 0;
+            primData.PathShearX = 0;
+            primData.PathShearY = 0;
+            primData.PathSkew = 0;
+            primData.ProfileBegin = 0;
+            primData.ProfileEnd = 0;
+            primData.PathCurve = 16;
+            primData.ProfileCurve = 1;
+            primData.ProfileHollow = 0;
+            primData.PathRadiusOffset = 0;
+            primData.PathRevolutions = 0;
+            primData.PathTaperX = 0;
+            primData.PathTaperY = 0;
+            primData.PathTwist = 0;
+            primData.PathTwistBegin = 0;
+
+            return primData;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs
new file mode 100644
index 0000000..1271d04
--- /dev/null
+++ b/OpenSim/Framework/General/Types/RegionHandle.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Net;
+
+namespace OpenSim.Framework.Types
+{
+    /// <summary>
+    /// A class for manipulating RegionHandle coordinates
+    /// </summary>
+    class RegionHandle
+    {
+        private UInt64 handle;
+
+        /// <summary>
+        /// Initialises a new grid-aware RegionHandle
+        /// </summary>
+        /// <param name="ip">IP Address of the Grid Server for this region</param>
+        /// <param name="x">Grid X Coordinate</param>
+        /// <param name="y">Grid Y Coordinate</param>
+        public RegionHandle(string ip, short x, short y)
+        {
+            IPAddress addr = IPAddress.Parse(ip);
+
+            long baseHandle = addr.Address;
+
+            // Split the IP address in half
+            short a = (short)((baseHandle << 16) & 0xFFFF);
+            short b = (short)((baseHandle <<  0) & 0xFFFF);
+
+            // Raise the bounds a little
+            uint nx = (uint)x;
+            uint ny = (uint)y;
+
+            // Multiply grid coords to get region coords
+            nx *= 256;
+            ny *= 256;
+
+            // Stuff the IP address in too
+            nx = (uint)a << 16;
+            ny = (uint)b << 16;
+
+            handle = ((UInt64)nx << 32) | (uint)ny;
+        }
+
+        /// <summary>
+        /// Initialises a new RegionHandle that is not inter-grid aware
+        /// </summary>
+        /// <param name="x">Grid X Coordinate</param>
+        /// <param name="y">Grid Y Coordinate</param>
+        public RegionHandle(uint x, uint y)
+        {
+            handle = ((x * 256) << 32) | (y * 256);
+        }
+
+        /// <summary>
+        /// Initialises a new RegionHandle from an existing value
+        /// </summary>
+        /// <param name="Region">A U64 RegionHandle</param>
+        public RegionHandle(UInt64 Region)
+        {
+            handle = Region;
+        }
+
+        /// <summary>
+        /// Returns the Grid Masked RegionHandle - For use in Teleport packets and other packets where sending the grid IP address may be handy.
+        /// </summary>
+        /// <remarks>Do not use for SimulatorEnable packets. The client will choke.</remarks>
+        /// <returns>Region Handle including IP Address encoding</returns>
+        public UInt64 getTeleportHandle()
+        {
+            return handle;
+        }
+
+        /// <summary>
+        /// Returns a RegionHandle which may be used for SimulatorEnable packets. Removes the IP address encoding and returns the lower bounds.
+        /// </summary>
+        /// <returns>A U64 RegionHandle for use in SimulatorEnable packets.</returns>
+        public UInt64 getNeighbourHandle()
+        {
+            UInt64 mask = 0x0000FFFF0000FFFF;
+
+            return handle | mask;
+        }
+
+        /// <summary>
+        /// Returns the IP Address of the GridServer from a Grid-Encoded RegionHandle
+        /// </summary>
+        /// <returns>Grid Server IP Address</returns>
+        public IPAddress getGridIP()
+        {
+            uint a = (uint)((handle >> 16) & 0xFFFF);
+            uint b = (uint)((handle >> 48) & 0xFFFF);
+
+            return new IPAddress((long)(a << 16) | (long)b);
+        }
+
+        /// <summary>
+        /// Returns the X Coordinate from a Grid-Encoded RegionHandle
+        /// </summary>
+        /// <returns>X Coordinate</returns>
+        public uint getGridX()
+        {
+            uint x = (uint)((handle >> 32) & 0xFFFF);
+
+            return x;
+        }
+
+        /// <summary>
+        /// Returns the Y Coordinate from a Grid-Encoded RegionHandle
+        /// </summary>
+        /// <returns>Y Coordinate</returns>
+        public uint getGridY()
+        {
+            uint y = (uint)((handle >> 0) & 0xFFFF);
+
+            return y;
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
new file mode 100644
index 0000000..48e6922
--- /dev/null
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -0,0 +1,304 @@
+/*
+* 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.Globalization;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Console;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+    public class RegionInfo
+    {
+        public LLUUID SimUUID = new LLUUID();
+        public string RegionName = "";
+        public uint RegionLocX = 0;
+        public uint RegionLocY = 0;
+        public ulong RegionHandle = 0;
+
+        public string DataStore = "";
+        public bool isSandbox = false;
+
+        public LLUUID MasterAvatarAssignedUUID = new LLUUID();
+        public string MasterAvatarFirstName = "";
+        public string MasterAvatarLastName = "";
+        public string MasterAvatarSandboxPassword = "";
+
+        /// <summary>
+        /// Port used for listening (TCP and UDP)
+        /// </summary>
+        /// <remarks>Seperate TCP and UDP</remarks>
+        public int CommsIPListenPort = 0;
+        /// <summary>
+        /// Address used for internal listening (default: 0.0.0.0?)
+        /// </summary>
+        public string CommsIPListenAddr = "";
+        /// <summary>
+        /// Address used for external addressing (DNS or IP)
+        /// </summary>
+        public string CommsExternalAddress = "";
+
+
+        public EstateSettings estateSettings;
+
+        public RegionInfo()
+        {
+            estateSettings = new EstateSettings();
+        }
+
+
+        public void InitConfig(bool sandboxMode, IGenericConfig configData)
+        {
+            this.isSandbox = sandboxMode;
+            try
+            {
+                // Sim UUID
+                string attri = "";
+                attri = configData.GetAttribute("SimUUID");
+                if (attri == "")
+                {
+                    this.SimUUID = LLUUID.Random();
+                    configData.SetAttribute("SimUUID", this.SimUUID.ToString());
+                }
+                else
+                {
+                    this.SimUUID = new LLUUID(attri);
+                }
+
+                // Sim name
+                attri = "";
+                attri = configData.GetAttribute("SimName");
+                if (attri == "")
+                {
+                    this.RegionName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Name", "OpenSim test");
+                    configData.SetAttribute("SimName", this.RegionName);
+                }
+                else
+                {
+                    this.RegionName = attri;
+                }
+                // Sim/Grid location X
+                attri = "";
+                attri = configData.GetAttribute("SimLocationX");
+                if (attri == "")
+                {
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");
+                    configData.SetAttribute("SimLocationX", location);
+                    this.RegionLocX = (uint)Convert.ToUInt32(location);
+                }
+                else
+                {
+                    this.RegionLocX = (uint)Convert.ToUInt32(attri);
+                }
+                // Sim/Grid location Y
+                attri = "";
+                attri = configData.GetAttribute("SimLocationY");
+                if (attri == "")
+                {
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");
+                    configData.SetAttribute("SimLocationY", location);
+                    this.RegionLocY = (uint)Convert.ToUInt32(location);
+                }
+                else
+                {
+                    this.RegionLocY = (uint)Convert.ToUInt32(attri);
+                }
+
+                // Local storage datastore
+                attri = "";
+                attri = configData.GetAttribute("Datastore");
+                if (attri == "")
+                {
+                    string datastore = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Filename for local storage", "localworld.yap");
+                    configData.SetAttribute("Datastore", datastore);
+                    this.DataStore = datastore;
+                }
+                else
+                {
+                    this.DataStore = attri;
+                }
+
+                //Sim Listen Port
+                attri = "";
+                attri = configData.GetAttribute("SimListenPort");
+                if (attri == "")
+                {
+                    string port = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("UDP port for client connections", "9000");
+                    configData.SetAttribute("SimListenPort", port);
+                    this.CommsIPListenPort = Convert.ToInt32(port);
+                }
+                else
+                {
+                    this.CommsIPListenPort = Convert.ToInt32(attri);
+                }
+
+                //Sim Listen Address
+                attri = "";
+                attri = configData.GetAttribute("SimListenAddress");
+                if (attri == "")
+                {
+                    this.CommsIPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "0.0.0.0");
+                    configData.SetAttribute("SimListenAddress", this.CommsIPListenAddr);
+                }
+                else
+                {
+                    // Probably belongs elsewhere, but oh well.
+                    if (attri.Trim().StartsWith("SYSTEMIP"))
+                    {
+                        string localhostname = System.Net.Dns.GetHostName();
+                        System.Net.IPAddress[] ips = System.Net.Dns.GetHostAddresses(localhostname);
+                        try
+                        {
+                            this.CommsIPListenAddr = "0.0.0.0"; // Incase a IPv4 address isnt found
+
+                            foreach (System.Net.IPAddress ip in ips)
+                            {
+                                if (ip.AddressFamily.ToString() == System.Net.Sockets.ProtocolFamily.InterNetwork.ToString())
+                                {
+                                    this.CommsIPListenAddr = ip.ToString();
+                                    break;
+                                }
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            e.ToString();
+                            this.CommsIPListenAddr = "0.0.0.0"; // Use the default if we fail
+                        }
+                    }
+                    else
+                    {
+                        this.CommsIPListenAddr = attri;
+                    }
+                }
+
+                // Sim External Address
+                attri = "";
+                attri = configData.GetAttribute("SimExternalAddress");
+                if (attri == "")
+                {
+                    this.CommsExternalAddress = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP or DNS address to send external clients to", "localhost");
+                    configData.SetAttribute("SimExternalAddress", this.CommsExternalAddress);
+                }
+                else
+                {
+                    this.CommsExternalAddress = attri;
+                }
+
+                attri = "";
+                attri = configData.GetAttribute("TerrainFile");
+                if (attri == "")
+                {
+                    this.estateSettings.terrainFile = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
+                    configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile);
+                }
+                else
+                {
+                    this.estateSettings.terrainFile = attri;
+                }
+
+                attri = "";
+                attri = configData.GetAttribute("TerrainMultiplier");
+                if (attri == "")
+                {
+                    string re = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
+                    this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
+                    configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
+                }
+                else
+                {
+                    this.estateSettings.terrainMultiplier = Convert.ToDouble(attri);
+                }
+
+                attri = "";
+                attri = configData.GetAttribute("MasterAvatarFirstName");
+                if (attri == "")
+                {
+                    this.MasterAvatarFirstName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
+
+                    configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
+                }
+                else
+                {
+                    this.MasterAvatarFirstName = attri;
+                }
+
+                attri = "";
+                attri = configData.GetAttribute("MasterAvatarLastName");
+                if (attri == "")
+                {
+                    this.MasterAvatarLastName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
+
+                    configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
+                }
+                else
+                {
+                    this.MasterAvatarLastName = attri;
+                }
+
+                if (isSandbox) //Sandbox Mode Specific Settings
+                {
+                    attri = "";
+                    attri = configData.GetAttribute("MasterAvatarSandboxPassword");
+                    if (attri == "")
+                    {
+                        this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
+
+                        //Should I store this?
+                        configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
+                    }
+                    else
+                    {
+                        this.MasterAvatarSandboxPassword = attri;
+                    }
+                }
+
+                this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
+               
+                configData.Commit();
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+            }
+
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:");
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "UUID: " + this.SimUUID.ToStringHyphenated());
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Name: " + this.RegionName);
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Handle: " + this.RegionHandle.ToString());
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Listening on IP: " + this.CommsIPListenAddr + ":" + this.CommsIPListenPort);
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Sandbox Mode? " + isSandbox.ToString());
+  
+        }
+    }
+}
diff --git a/OpenSim/Framework/General/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
new file mode 100644
index 0000000..04ff20b
--- /dev/null
+++ b/OpenSim/Framework/General/UserProfile.cs
@@ -0,0 +1,89 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework.Inventory;
+using System.Security.Cryptography;
+
+namespace OpenSim.Framework.User
+{
+    public class UserProfile
+    {
+
+        public string firstname;
+        public string lastname;
+        public ulong homeregionhandle;
+        public LLVector3 homepos;
+        public LLVector3 homelookat;
+
+        public bool IsGridGod = false;
+        public bool IsLocal = true;	// will be used in future for visitors from foreign grids
+        public string AssetURL;
+        public string MD5passwd;
+
+        public LLUUID CurrentSessionID;
+        public LLUUID CurrentSecureSessionID;
+        public LLUUID UUID;
+        public Dictionary<LLUUID, uint> Circuits = new Dictionary<LLUUID, uint>();	// tracks circuit codes
+
+        public AgentInventory Inventory;
+
+        public UserProfile()
+        {
+            Circuits = new Dictionary<LLUUID, uint>();
+            Inventory = new AgentInventory();
+            homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
+            homepos = new LLVector3();
+	    homelookat = new LLVector3();
+        }
+
+        public void InitSessionData()
+        {
+            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
+
+            byte[] randDataS = new byte[16];
+            byte[] randDataSS = new byte[16];
+
+            rand.GetBytes(randDataS);
+            rand.GetBytes(randDataSS);
+
+            CurrentSecureSessionID = new LLUUID(randDataSS,0);
+            CurrentSessionID = new LLUUID(randDataS,0);
+            
+        }
+
+        public void AddSimCircuit(uint circuitCode, LLUUID regionUUID)
+        {
+            if (this.Circuits.ContainsKey(regionUUID) == false)
+                this.Circuits.Add(regionUUID, circuitCode);
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
new file mode 100644
index 0000000..8c34c9b
--- /dev/null
+++ b/OpenSim/Framework/General/Util.cs
@@ -0,0 +1,186 @@
+/*
+* 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.Security.Cryptography;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim.Framework.Utilities
+{
+    public class Util
+    {
+        private static Random randomClass = new Random();
+        private static uint nextXferID = 5000;
+        private static object XferLock = new object();
+
+        public static ulong UIntsToLong(uint X, uint Y)
+        {
+            return Helpers.UIntsToLong(X, Y);
+        }
+
+        public static Random RandomClass
+        {
+            get
+            {
+                return randomClass;
+            }
+        }
+
+        public static uint GetNextXferID()
+        {
+            uint id = 0;
+            lock(XferLock)
+            {
+                id = nextXferID;
+                nextXferID++;
+            }
+            return id;
+        }
+
+        public static int UnixTimeSinceEpoch()
+        {
+            TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1));
+            int timestamp = (int)t.TotalSeconds;
+            return timestamp;
+        }
+
+        public static string Md5Hash(string pass)
+        {
+            MD5 md5 = MD5CryptoServiceProvider.Create();
+            byte[] dataMd5 = md5.ComputeHash(Encoding.Default.GetBytes(pass));
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < dataMd5.Length; i++)
+                sb.AppendFormat("{0:x2}", dataMd5[i]);
+            return sb.ToString();
+        }
+
+        public static string GetRandomCapsPath()
+        {
+            LLUUID caps = LLUUID.Random();
+            string capsPath = caps.ToStringHyphenated();
+            capsPath = capsPath.Remove(capsPath.Length - 4, 4);
+            return capsPath;
+        }
+
+        //public static int fast_distance2d(int x, int y)
+        //{
+        //    x = System.Math.Abs(x);
+        //    y = System.Math.Abs(y);
+
+        //    int min = System.Math.Min(x, y);
+
+        //    return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
+        //}
+
+        public static string FieldToString(byte[] bytes)
+        {
+            return FieldToString(bytes, String.Empty);
+        }
+
+        /// <summary>
+        /// Convert a variable length field (byte array) to a string, with a
+        /// field name prepended to each line of the output
+        /// </summary>
+        /// <remarks>If the byte array has unprintable characters in it, a 
+        /// hex dump will be put in the string instead</remarks>
+        /// <param name="bytes">The byte array to convert to a string</param>
+        /// <param name="fieldName">A field name to prepend to each line of output</param>
+        /// <returns>An ASCII string or a string containing a hex dump, minus 
+        /// the null terminator</returns>
+        public static string FieldToString(byte[] bytes, string fieldName)
+        {
+            // Check for a common case
+            if (bytes.Length == 0) return String.Empty;
+
+            StringBuilder output = new StringBuilder();
+            bool printable = true;
+
+            for (int i = 0; i < bytes.Length; ++i)
+            {
+                // Check if there are any unprintable characters in the array
+                if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09
+                    && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)
+                {
+                    printable = false;
+                    break;
+                }
+            }
+
+            if (printable)
+            {
+                if (fieldName.Length > 0)
+                {
+                    output.Append(fieldName);
+                    output.Append(": ");
+                }
+
+                if (bytes[bytes.Length - 1] == 0x00)
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));
+                else
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes));
+            }
+            else
+            {
+                for (int i = 0; i < bytes.Length; i += 16)
+                {
+                    if (i != 0)
+                        output.Append(Environment.NewLine);
+                    if (fieldName.Length > 0)
+                    {
+                        output.Append(fieldName);
+                        output.Append(": ");
+                    }
+
+                    for (int j = 0; j < 16; j++)
+                    {
+                        if ((i + j) < bytes.Length)
+                            output.Append(String.Format("{0:X2} ", bytes[i + j]));
+                        else
+                            output.Append("   ");
+                    }
+
+                    for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
+                    {
+                        if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
+                            output.Append((char)bytes[i + j]);
+                        else
+                            output.Append(".");
+                    }
+                }
+            }
+
+            return output.ToString();
+        }
+        public Util()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
new file mode 100644
index 0000000..aae8cd2
--- /dev/null
+++ b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj
@@ -0,0 +1,93 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C74E4A30-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.GenericConfig.Xml</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.GenericConfig.Xml</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="XmlConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj.user b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs b/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..de5f48d
--- /dev/null
+++ b/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.GenericConfig")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.GenericConfig")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("285a3047-f165-46c8-8767-b51428738a09")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
new file mode 100644
index 0000000..c526aec
--- /dev/null
+++ b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
@@ -0,0 +1,123 @@
+/*
+* 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.Xml;
+using OpenSim.Framework.Interfaces;
+
+namespace OpenSim.GenericConfig
+{
+    public class XmlConfig : IGenericConfig
+    {
+        private XmlDocument doc;
+        private XmlNode rootNode;
+        private XmlNode configNode;
+        private string fileName;
+        private bool createdFile = false;
+
+        public XmlConfig(string filename)
+        {
+            fileName = filename;
+        }
+
+        public void LoadData()
+        {
+            doc = new XmlDocument();
+
+            if (System.IO.File.Exists(fileName))
+            {
+                XmlTextReader reader = new XmlTextReader(fileName);
+                reader.WhitespaceHandling = WhitespaceHandling.None;
+                doc.Load(reader);
+                reader.Close();
+            }
+            else
+            {
+                createdFile = true;
+                rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");
+                doc.AppendChild(rootNode);
+                configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");
+                rootNode.AppendChild(configNode);
+            }
+
+
+            rootNode = doc.FirstChild;
+            if (rootNode.Name != "Root")
+                throw new Exception("Error: Invalid .xml File. Missing <Root>");
+
+            configNode = rootNode.FirstChild;
+            if (configNode.Name != "Config")
+                throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>");
+
+            if (createdFile)
+            {
+                this.Commit();
+            }
+        }
+
+        public string GetAttribute(string attributeName)
+        {
+            string result = "";
+            if (configNode.Attributes[attributeName] != null)
+            {
+                result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value;
+            }
+            return result;
+        }
+
+        public bool SetAttribute(string attributeName, string attributeValue)
+        {
+            if (configNode.Attributes[attributeName] != null)
+            {
+                ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue;
+            }
+            else
+            {
+                XmlAttribute attri;
+                attri = doc.CreateAttribute(attributeName);
+                attri.Value = attributeValue;
+                configNode.Attributes.Append(attri);
+            }
+            return true;
+        }
+
+        public void Commit()
+        {
+            doc.Save(fileName);
+        }
+
+        public void Close()
+        {
+            configNode = null;
+            rootNode = null;
+            doc = null;
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
new file mode 100644
index 0000000..e55e33c
--- /dev/null
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -0,0 +1,312 @@
+/*
+* 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.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+//using OpenSim.CAPS;
+using Nwc.XmlRpc;
+using System.Collections;
+using OpenSim.Framework.Console;
+
+namespace OpenSim.Servers
+{
+    public class BaseHttpServer
+    {
+        protected class RestMethodEntry
+        {
+            private string m_path;
+            public string Path
+            {
+                get { return m_path; }
+            }
+
+            private RestMethod m_restMethod;
+            public RestMethod RestMethod
+            {
+                get { return m_restMethod; }
+            }
+
+            public RestMethodEntry(string path, RestMethod restMethod)
+            {
+                m_path = path;
+                m_restMethod = restMethod;
+            }
+        }
+
+        protected Thread m_workerThread;
+        protected HttpListener m_httpListener;
+        protected Dictionary<string, RestMethodEntry> m_restHandlers = new Dictionary<string, RestMethodEntry>();
+        protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
+        protected int m_port;
+        protected bool firstcaps = true;
+
+        public BaseHttpServer(int port)
+        {
+            m_port = port;
+        }
+
+        public bool AddRestHandler(string method, string path, RestMethod handler)
+        {
+           //Console.WriteLine("adding new REST handler for path " + path);
+            string methodKey = String.Format("{0}: {1}", method, path);
+
+            if (!this.m_restHandlers.ContainsKey(methodKey))
+            {
+                this.m_restHandlers.Add(methodKey, new RestMethodEntry(path, handler));
+                return true;
+            }
+
+            //must already have a handler for that path so return false
+            return false;
+        }
+
+        public bool RemoveRestHandler(string method, string path)
+        {
+            string methodKey = String.Format("{0}: {1}", method, path);
+            if (this.m_restHandlers.ContainsKey(methodKey))
+            {
+                this.m_restHandlers.Remove(methodKey);
+                return true;
+            }
+            return false;
+        }
+
+        public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)
+        {
+            if (!this.m_rpcHandlers.ContainsKey(method))
+            {
+                this.m_rpcHandlers.Add(method, handler);
+                return true;
+            }
+
+            //must already have a handler for that path so return false
+            return false;
+        }
+
+        protected virtual string ProcessXMLRPCMethod(string methodName, XmlRpcRequest request)
+        {
+            XmlRpcResponse response;
+
+            XmlRpcMethod method;
+            if (this.m_rpcHandlers.TryGetValue(methodName, out method))
+            {
+                response = method(request);
+            }
+            else
+            {
+                response = new XmlRpcResponse();
+                Hashtable unknownMethodError = new Hashtable();
+                unknownMethodError["reason"] = "XmlRequest"; ;
+                unknownMethodError["message"] = "Unknown Rpc request";
+                unknownMethodError["login"] = "false";
+                response.Value = unknownMethodError;
+            }
+
+            return XmlRpcResponseSerializer.Singleton.Serialize(response);
+        }
+
+        protected virtual string ParseREST(string request, string path, string method)
+        {
+            string response;
+
+            string requestKey = String.Format("{0}: {1}", method, path);
+
+            string bestMatch = String.Empty;
+            foreach (string currentKey in m_restHandlers.Keys)
+            {
+                if (requestKey.StartsWith(currentKey))
+                {
+                    if (currentKey.Length > bestMatch.Length)
+                    {
+                        bestMatch = currentKey;
+                    }
+                }
+            }
+
+            RestMethodEntry restMethodEntry;
+            if (m_restHandlers.TryGetValue(bestMatch, out restMethodEntry))
+            {
+                RestMethod restMethod = restMethodEntry.RestMethod;
+
+                string param = path.Substring(restMethodEntry.Path.Length);
+                response = restMethod(request, path, param);
+
+            }
+            else
+            {
+                response = String.Empty;
+            }
+
+            return response;
+        }
+
+        protected virtual string ParseLLSDXML(string requestBody)
+        {
+            // dummy function for now - IMPLEMENT ME!
+            Console.WriteLine("LLSD request "+requestBody);
+            string resp = "";
+            if (firstcaps)
+            {
+                resp = "<llsd><map><key>MapLayer</key><string>http://127.0.0.1:9000/CAPS/</string></map></llsd>";
+                firstcaps = false;
+            }
+            return resp;
+        }
+
+        protected virtual string ParseXMLRPC(string requestBody)
+        {
+            string responseString = String.Empty;
+
+            try
+            {
+                XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
+
+                string methodName = request.MethodName;
+
+                responseString = ProcessXMLRPCMethod(methodName, request);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+            return responseString;
+        }
+
+        public virtual void HandleRequest(Object stateinfo)
+        {
+            try
+            {
+                HttpListenerContext context = (HttpListenerContext)stateinfo;
+
+                HttpListenerRequest request = context.Request;
+                HttpListenerResponse response = context.Response;
+
+                response.KeepAlive = false;
+                response.SendChunked = false;
+
+                System.IO.Stream body = request.InputStream;
+                System.Text.Encoding encoding = System.Text.Encoding.UTF8;
+                System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
+
+                string requestBody = reader.ReadToEnd();
+                body.Close();
+                reader.Close();
+
+                //Console.WriteLine(request.HttpMethod + " " + request.RawUrl + " Http/" + request.ProtocolVersion.ToString() + " content type: " + request.ContentType);
+                //Console.WriteLine(requestBody);
+
+                string responseString = "";
+               // Console.WriteLine("new request " + request.ContentType +" at "+ request.RawUrl);
+                switch (request.ContentType)
+                {
+                    case "text/xml":
+                        // must be XML-RPC, so pass to the XML-RPC parser
+
+                        responseString = ParseXMLRPC(requestBody);
+                        responseString = Regex.Replace(responseString, "utf-16", "utf-8");
+
+                        response.AddHeader("Content-type", "text/xml");
+                        break;
+
+                    case "application/xml":
+                        // probably LLSD we hope, otherwise it should be ignored by the parser
+                       // responseString = ParseLLSDXML(requestBody);
+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
+                        response.AddHeader("Content-type", "application/xml");
+                        break;
+
+                    case "application/octet-stream":
+                        // probably LLSD we hope, otherwise it should be ignored by the parser
+                        // responseString = ParseLLSDXML(requestBody);
+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
+                        response.AddHeader("Content-type", "application/xml");
+                        break;
+
+                    case "application/x-www-form-urlencoded":
+                        // a form data POST so send to the REST parser
+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
+                        response.AddHeader("Content-type", "text/html");
+                        break;
+
+                    case null:
+                        // must be REST or invalid crap, so pass to the REST parser
+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
+                        response.AddHeader("Content-type", "text/html");
+                        break;
+
+                }
+
+                byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
+                System.IO.Stream output = response.OutputStream;
+                response.SendChunked = false;
+                response.ContentLength64 = buffer.Length;
+                output.Write(buffer, 0, buffer.Length);
+                output.Close();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+        public void Start()
+        {
+            OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
+
+            m_workerThread = new Thread(new ThreadStart(StartHTTP));
+            m_workerThread.IsBackground = true;
+            m_workerThread.Start();
+        }
+
+        private void StartHTTP()
+        {
+            try
+            {
+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
+                m_httpListener = new HttpListener();
+
+                m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
+                m_httpListener.Start();
+
+                HttpListenerContext context;
+                while (true)
+                {
+                    context = m_httpListener.GetContext();
+                    ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
new file mode 100644
index 0000000..a359205
--- /dev/null
+++ b/OpenSim/Framework/Servers/CheckSumServer.cs
@@ -0,0 +1,141 @@
+/*
+* 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.Text;
+using System.IO;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Console;
+
+
+namespace OpenSim.Servers
+{
+/*    public class CheckSumServer : UDPServerBase
+    {
+        //protected ConsoleBase m_log;
+
+        public CheckSumServer(int port)
+            : base(port)
+        {
+        }
+
+        protected override void OnReceivedData(IAsyncResult result)
+        {
+            ipeSender = new IPEndPoint(IPAddress.Any, 0);
+            epSender = (EndPoint)ipeSender;
+            Packet packet = null;
+            int numBytes = Server.EndReceiveFrom(result, ref epSender);
+            int packetEnd = numBytes - 1;
+
+            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
+
+            if (packet.Type == PacketType.SecuredTemplateChecksumRequest)
+            {
+                SecuredTemplateChecksumRequestPacket checksum = (SecuredTemplateChecksumRequestPacket)packet;
+                TemplateChecksumReplyPacket checkreply = new TemplateChecksumReplyPacket();
+                checkreply.DataBlock.Checksum = 3220703154;//180572585;
+                checkreply.DataBlock.Flags = 0;
+                checkreply.DataBlock.MajorVersion = 1;
+                checkreply.DataBlock.MinorVersion = 15;
+                checkreply.DataBlock.PatchVersion = 0;
+                checkreply.DataBlock.ServerVersion = 0;
+                checkreply.TokenBlock.Token = checksum.TokenBlock.Token;
+                this.SendPacket(checkreply, epSender);
+
+                /*
+                //if we wanted to echo the the checksum/ version from the client (so that any client worked)
+                SecuredTemplateChecksumRequestPacket checkrequest = new SecuredTemplateChecksumRequestPacket();
+                checkrequest.TokenBlock.Token = checksum.TokenBlock.Token;
+                this.SendPacket(checkrequest, epSender);
+                
+            }
+            else if (packet.Type == PacketType.TemplateChecksumReply)
+            {
+                //echo back the client checksum reply (Hegemon's method)
+                TemplateChecksumReplyPacket checksum2 = (TemplateChecksumReplyPacket)packet;
+                TemplateChecksumReplyPacket checkreply2 = new TemplateChecksumReplyPacket();
+                checkreply2.DataBlock.Checksum = checksum2.DataBlock.Checksum;
+                checkreply2.DataBlock.Flags = checksum2.DataBlock.Flags;
+                checkreply2.DataBlock.MajorVersion = checksum2.DataBlock.MajorVersion;
+                checkreply2.DataBlock.MinorVersion = checksum2.DataBlock.MinorVersion;
+                checkreply2.DataBlock.PatchVersion = checksum2.DataBlock.PatchVersion;
+                checkreply2.DataBlock.ServerVersion = checksum2.DataBlock.ServerVersion;
+                checkreply2.TokenBlock.Token = checksum2.TokenBlock.Token;
+                this.SendPacket(checkreply2, epSender);
+            }
+            else
+            {
+            }
+
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+        }
+
+        private void SendPacket(Packet Pack, EndPoint endp)
+        {
+            if (!Pack.Header.Resent)
+            {
+                Pack.Header.Sequence = 1;
+            }
+
+            byte[] ZeroOutBuffer = new byte[4096];
+            byte[] sendbuffer;
+            sendbuffer = Pack.ToBytes();
+
+            try
+            {
+                if (Pack.Header.Zerocoded)
+                {
+                    int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
+                    this.SendPackTo(ZeroOutBuffer, packetsize, SocketFlags.None, endp);
+                }
+                else
+                {
+                    this.SendPackTo(sendbuffer, sendbuffer.Length, SocketFlags.None, endp);
+                }
+            }
+            catch (Exception)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
+
+            }
+        }
+
+        private void SendPackTo(byte[] buffer, int size, SocketFlags flags, EndPoint endp)
+        {
+            this.Server.SendTo(buffer, size, flags, endp);
+        }
+ * 
+    }*/
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/IRestHandler.cs b/OpenSim/Framework/Servers/IRestHandler.cs
new file mode 100644
index 0000000..3aa508c
--- /dev/null
+++ b/OpenSim/Framework/Servers/IRestHandler.cs
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Servers
+{
+    public delegate string RestMethod( string request, string path, string param );
+}
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
new file mode 100644
index 0000000..399f456
--- /dev/null
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -0,0 +1,116 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2CC71860-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.Servers</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.Servers</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BaseHttpServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CheckSumServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IRestHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UDPServerBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="XmlRpcMethod.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj.user b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs
new file mode 100644
index 0000000..b472c97
--- /dev/null
+++ b/OpenSim/Framework/Servers/UDPServerBase.cs
@@ -0,0 +1,95 @@
+/*
+* 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.Text;
+using System.IO;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim.Servers
+{
+    public class UDPServerBase
+    {
+        public Socket Server;
+        protected IPEndPoint ServerIncoming;
+        protected byte[] RecvBuffer = new byte[4096];
+        protected byte[] ZeroBuffer = new byte[8192];
+        protected IPEndPoint ipeSender;
+        protected EndPoint epSender;
+        protected AsyncCallback ReceivedData;
+        protected int listenPort;
+
+        public UDPServerBase(int port)
+        {
+            listenPort = port;
+        }
+
+        protected virtual void OnReceivedData(IAsyncResult result)
+        {
+            ipeSender = new IPEndPoint(IPAddress.Any, 0);
+            epSender = (EndPoint)ipeSender;
+            Packet packet = null;
+            int numBytes = Server.EndReceiveFrom(result, ref epSender);
+            int packetEnd = numBytes - 1;
+
+            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
+
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+        }
+
+        protected virtual void AddNewClient(Packet packet)
+        {
+        }
+
+        public virtual void ServerListener()
+        {
+
+            ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
+            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            Server.Bind(ServerIncoming);
+
+            ipeSender = new IPEndPoint(IPAddress.Any, 0);
+            epSender = (EndPoint)ipeSender;
+            ReceivedData = new AsyncCallback(this.OnReceivedData);
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+        }
+
+        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
+        {
+
+        }
+    }
+}
+
diff --git a/OpenSim/Framework/Servers/XmlRpcMethod.cs b/OpenSim/Framework/Servers/XmlRpcMethod.cs
new file mode 100644
index 0000000..05cbf2e
--- /dev/null
+++ b/OpenSim/Framework/Servers/XmlRpcMethod.cs
@@ -0,0 +1,34 @@
+/*
+* 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 Nwc.XmlRpc;
+
+namespace OpenSim.Servers
+{
+    public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );    
+}
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
new file mode 100644
index 0000000..5ca223f
--- /dev/null
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -0,0 +1,645 @@
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Collections;
+using System.Xml;
+using libsecondlife;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Interfaces;
+using Nwc.XmlRpc;
+
+namespace OpenSim.Framework.UserManagement
+{
+
+    /// <summary>
+    /// A temp class to handle login response.
+    /// Should make use of UserProfileManager where possible.
+    /// </summary>
+
+    public class LoginResponse
+    {
+        private Hashtable loginFlagsHash;
+        private Hashtable globalTexturesHash;
+        private Hashtable loginError;
+        private Hashtable eventCategoriesHash;
+        private Hashtable uiConfigHash;
+        private Hashtable classifiedCategoriesHash;
+
+        private ArrayList loginFlags;
+        private ArrayList globalTextures;
+        private ArrayList eventCategories;
+        private ArrayList uiConfig;
+        private ArrayList classifiedCategories;
+        private ArrayList inventoryRoot;
+        private ArrayList initialOutfit;
+        private ArrayList agentInventory;
+
+        private UserInfo userProfile;
+
+        private LLUUID agentID;
+        private LLUUID sessionID;
+        private LLUUID secureSessionID;
+
+        // Login Flags
+        private string dst;
+        private string stipendSinceLogin;
+        private string gendered;
+        private string everLoggedIn;
+        private string login;
+        private int simPort;
+        private string simAddress;
+        private string agentAccess;
+        private Int32 circuitCode;
+        private uint regionX;
+        private uint regionY;
+
+        // Login
+        private string firstname;
+        private string lastname;
+
+        // Global Textures
+        private string sunTexture;
+        private string cloudTexture;
+        private string moonTexture;
+
+        // Error Flags
+        private string errorReason;
+        private string errorMessage;
+
+        // Response
+        private XmlRpcResponse xmlRpcResponse;
+        private XmlRpcResponse defaultXmlRpcResponse;
+
+        private string welcomeMessage;
+        private string startLocation;
+        private string allowFirstLife;
+        private string home;
+        private string seedCapability;
+        private string lookAt;
+
+        public LoginResponse()
+        {
+            this.loginFlags = new ArrayList();
+            this.globalTextures = new ArrayList();
+            this.eventCategories = new ArrayList();
+            this.uiConfig = new ArrayList();
+            this.classifiedCategories = new ArrayList();
+
+            this.loginError = new Hashtable();
+            this.eventCategoriesHash = new Hashtable();
+            this.classifiedCategoriesHash = new Hashtable();
+            this.uiConfigHash = new Hashtable();
+
+            this.defaultXmlRpcResponse = new XmlRpcResponse();
+            this.userProfile = new UserInfo();
+            this.inventoryRoot = new ArrayList();
+            this.initialOutfit = new ArrayList();
+            this.agentInventory = new ArrayList();
+
+            this.xmlRpcResponse = new XmlRpcResponse();
+            this.defaultXmlRpcResponse = new XmlRpcResponse();
+
+            this.SetDefaultValues();
+        } // LoginServer
+
+        public void SetDefaultValues()
+        {
+                this.DST = "N";
+                this.StipendSinceLogin = "N";
+                this.Gendered = "Y";
+                this.EverLoggedIn = "Y";
+                this.login = "false";
+                this.firstname = "Test";
+                this.lastname = "User";
+                this.agentAccess = "M";
+                this.startLocation = "last";
+                this.allowFirstLife = "Y";
+
+                this.SunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271";
+                this.CloudTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
+                this.MoonTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
+
+                this.ErrorMessage = "You have entered an invalid name/password combination.  Check Caps/lock.";
+                this.ErrorReason = "key";
+                this.welcomeMessage = "Welcome to OpenSim!";
+                this.seedCapability = "";
+                this.home = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
+                this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
+                this.RegionX = (uint)255232;
+                this.RegionY = (uint)254976;
+
+                // Classifieds;
+                this.AddClassifiedCategory((Int32)1, "Shopping");
+                this.AddClassifiedCategory((Int32)2, "Land Rental");
+                this.AddClassifiedCategory((Int32)3, "Property Rental");
+                this.AddClassifiedCategory((Int32)4, "Special Attraction");
+                this.AddClassifiedCategory((Int32)5, "New Products");
+                this.AddClassifiedCategory((Int32)6, "Employment");
+                this.AddClassifiedCategory((Int32)7, "Wanted");
+                this.AddClassifiedCategory((Int32)8, "Service");
+                this.AddClassifiedCategory((Int32)9, "Personal");
+                
+
+                this.SessionID = LLUUID.Random();
+                this.SecureSessionID = LLUUID.Random();
+                this.AgentID = LLUUID.Random();
+
+                Hashtable InitialOutfitHash = new Hashtable();
+                InitialOutfitHash["folder_name"] = "Nightclub Female";
+                InitialOutfitHash["gender"] = "female";
+                this.initialOutfit.Add(InitialOutfitHash);
+          
+
+        } // SetDefaultValues
+
+        #region Login Failure Methods
+        public XmlRpcResponse GenerateFailureResponse(string reason, string message, string login)
+        {
+            // Overwrite any default values;
+            this.xmlRpcResponse = new XmlRpcResponse();
+
+            // Ensure Login Failed message/reason;
+            this.ErrorMessage = message;
+            this.ErrorReason = reason;
+
+            this.loginError["reason"] = this.ErrorReason;
+            this.loginError["message"] = this.ErrorMessage;
+            this.loginError["login"] = login;
+            this.xmlRpcResponse.Value = this.loginError;
+            return (this.xmlRpcResponse);
+        } // GenerateResponse
+
+        public XmlRpcResponse CreateFailedResponse()
+        {
+            return (this.CreateLoginFailedResponse());
+        } // CreateErrorConnectingToGridResponse()
+
+        public XmlRpcResponse CreateLoginFailedResponse()
+        {
+            return (this.GenerateFailureResponse("key", "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", "false"));
+        } // LoginFailedResponse
+
+        public XmlRpcResponse CreateAlreadyLoggedInResponse()
+        {
+            return (this.GenerateFailureResponse("presence", "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner", "false"));
+        } // CreateAlreadyLoggedInResponse()
+
+        public XmlRpcResponse CreateDeadRegionResponse()
+        {
+            return (this.GenerateFailureResponse("key", "The region you are attempting to log into is not responding. Please select another region and try again.", "false"));
+        }
+
+         public XmlRpcResponse CreateGridErrorResponse()
+        {
+            return (this.GenerateFailureResponse("key", "Error connecting to grid. Could not percieve credentials from login XML.", "false"));
+        }
+        
+        #endregion
+
+        public XmlRpcResponse ToXmlRpcResponse()
+        {
+            try
+            {
+
+                Hashtable responseData = new Hashtable();
+
+                this.loginFlagsHash = new Hashtable();
+                this.loginFlagsHash["daylight_savings"] = this.DST;
+                this.loginFlagsHash["stipend_since_login"] = this.StipendSinceLogin;
+                this.loginFlagsHash["gendered"] = this.Gendered;
+                this.loginFlagsHash["ever_logged_in"] = this.EverLoggedIn;
+                this.loginFlags.Add(this.loginFlagsHash);
+
+                responseData["first_name"] = this.Firstname;
+                responseData["last_name"] = this.Lastname;
+                responseData["agent_access"] = this.agentAccess;
+
+                this.globalTexturesHash = new Hashtable();
+                this.globalTexturesHash["sun_texture_id"] = this.SunTexture;
+                this.globalTexturesHash["cloud_texture_id"] = this.CloudTexture;
+                this.globalTexturesHash["moon_texture_id"] = this.MoonTexture;
+                this.globalTextures.Add(this.globalTexturesHash);
+                this.eventCategories.Add(this.eventCategoriesHash);
+
+                this.AddToUIConfig("allow_first_life", this.allowFirstLife);
+                this.uiConfig.Add(this.uiConfigHash);
+
+                responseData["sim_port"] =(Int32) this.SimPort;
+                responseData["sim_ip"] = this.SimAddress;
+                responseData["agent_id"] = this.AgentID.ToStringHyphenated();
+                responseData["session_id"] = this.SessionID.ToStringHyphenated();
+                responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
+                responseData["circuit_code"] = this.CircuitCode;
+                responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+                responseData["login-flags"] = this.loginFlags;
+                responseData["global-textures"] = this.globalTextures;
+                responseData["seed_capability"] = this.seedCapability;
+
+                responseData["event_categories"] = this.eventCategories;
+                responseData["event_notifications"] = new ArrayList(); // todo
+                responseData["classified_categories"] = this.classifiedCategories;
+                responseData["ui-config"] = this.uiConfig;
+
+                responseData["inventory-skeleton"] = this.agentInventory;
+                responseData["inventory-skel-lib"] = new ArrayList(); // todo
+                responseData["inventory-root"] = this.inventoryRoot;
+                responseData["gestures"] = new ArrayList(); // todo
+                responseData["inventory-lib-owner"] = new ArrayList(); // todo
+                responseData["initial-outfit"] = this.initialOutfit;
+                responseData["start_location"] = this.startLocation;
+                responseData["seed_capability"] = this.seedCapability;
+                responseData["home"] = this.home;
+                responseData["look_at"] = this.lookAt;
+                responseData["message"] = this.welcomeMessage;
+                responseData["region_x"] = (Int32)this.RegionX * 256;
+                responseData["region_y"] = (Int32)this.RegionY * 256;
+
+                //responseData["inventory-lib-root"] = new ArrayList(); // todo
+                //responseData["buddy-list"] = new ArrayList(); // todo
+
+                responseData["login"] = "true";
+                this.xmlRpcResponse.Value = responseData;
+
+                return (this.xmlRpcResponse);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(
+                    OpenSim.Framework.Console.LogPriority.LOW,
+                    "LoginResponse: Error creating XML-RPC Response: " + e.Message
+                );
+                return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));
+
+            }
+
+        } // ToXmlRpcResponse
+
+        public void SetEventCategories(string category, string value)
+        {
+            this.eventCategoriesHash[category] = value;
+        } // SetEventCategories
+
+        public void AddToUIConfig(string itemName, string item)
+        {
+            this.uiConfigHash[itemName] = item;
+        } // SetUIConfig
+
+        public void AddClassifiedCategory(Int32 ID, string categoryName)
+        {
+            this.classifiedCategoriesHash["category_name"] = categoryName;
+            this.classifiedCategoriesHash["category_id"] = ID;
+            this.classifiedCategories.Add(this.classifiedCategoriesHash);
+            // this.classifiedCategoriesHash.Clear();
+        } // SetClassifiedCategory
+
+        #region Properties
+        public string Login
+        {
+            get
+            {
+                return this.login;
+            }
+            set
+            {
+                this.login = value;
+            }
+        } // Login
+
+        public string DST
+        {
+            get
+            {
+                return this.dst;
+            }
+            set
+            {
+                this.dst = value;
+            }
+        } // DST
+
+        public string StipendSinceLogin
+        {
+            get
+            {
+                return this.stipendSinceLogin;
+            }
+            set
+            {
+                this.stipendSinceLogin = value;
+            }
+        } // StipendSinceLogin
+
+        public string Gendered
+        {
+            get
+            {
+                return this.gendered;
+            }
+            set
+            {
+                this.gendered = value;
+            }
+        } // Gendered
+
+        public string EverLoggedIn
+        {
+            get
+            {
+                return this.everLoggedIn;
+            }
+            set
+            {
+                this.everLoggedIn = value;
+            }
+        } // EverLoggedIn
+
+        public int SimPort
+        {
+            get
+            {
+                return this.simPort;
+            }
+            set
+            {
+                this.simPort = value;
+            }
+        } // SimPort
+
+        public string SimAddress
+        {
+            get
+            {
+                return this.simAddress;
+            }
+            set
+            {
+                this.simAddress = value;
+            }
+        } // SimAddress
+
+        public LLUUID AgentID
+        {
+            get
+            {
+                return this.agentID;
+            }
+            set
+            {
+                this.agentID = value;
+            }
+        } // AgentID
+
+        public LLUUID SessionID
+        {
+            get
+            {
+                return this.sessionID;
+            }
+            set
+            {
+                this.sessionID = value;
+            }
+        } // SessionID
+
+        public LLUUID SecureSessionID
+        {
+            get
+            {
+                return this.secureSessionID;
+            }
+            set
+            {
+                this.secureSessionID = value;
+            }
+        } // SecureSessionID
+
+        public Int32 CircuitCode
+        {
+            get
+            {
+                return this.circuitCode;
+            }
+            set
+            {
+                this.circuitCode = value;
+            }
+        } // CircuitCode
+
+        public uint RegionX
+        {
+            get
+            {
+                return this.regionX;
+            }
+            set
+            {
+                this.regionX = value;
+            }
+        } // RegionX
+
+        public uint RegionY
+        {
+            get
+            {
+                return this.regionY;
+            }
+            set
+            {
+                this.regionY = value;
+            }
+        } // RegionY
+
+        public string SunTexture
+        {
+            get
+            {
+                return this.sunTexture;
+            }
+            set
+            {
+                this.sunTexture = value;
+            }
+        } // SunTexture
+
+        public string CloudTexture
+        {
+            get
+            {
+                return this.cloudTexture;
+            }
+            set
+            {
+                this.cloudTexture = value;
+            }
+        } // CloudTexture
+
+        public string MoonTexture
+        {
+            get
+            {
+                return this.moonTexture;
+            }
+            set
+            {
+                this.moonTexture = value;
+            }
+        } // MoonTexture
+
+        public string Firstname
+        {
+            get
+            {
+                return this.firstname;
+            }
+            set
+            {
+                this.firstname = value;
+            }
+        } // Firstname
+
+        public string Lastname
+        {
+            get
+            {
+                return this.lastname;
+            }
+            set
+            {
+                this.lastname = value;
+            }
+        } // Lastname
+
+        public string AgentAccess
+        {
+            get
+            {
+                return this.agentAccess;
+            }
+            set
+            {
+                this.agentAccess = value;
+            }
+        }
+
+        public string StartLocation
+        {
+            get
+            {
+                return this.startLocation;
+            }
+            set
+            {
+                this.startLocation = value;
+            }
+        } // StartLocation
+
+        public string LookAt
+        {
+            get
+            {
+                return this.lookAt;
+            }
+            set
+            {
+                this.lookAt = value;
+            }
+        }
+
+        public string SeedCapability
+        {
+            get
+            {
+                return this.seedCapability;
+            }
+            set
+            {
+                this.seedCapability = value;
+            }
+        } // SeedCapability
+
+        public string ErrorReason
+        {
+            get
+            {
+                return this.errorReason;
+            }
+            set
+            {
+                this.errorReason = value;
+            }
+        } // ErrorReason
+
+        public string ErrorMessage
+        {
+            get
+            {
+                return this.errorMessage;
+            }
+            set
+            {
+                this.errorMessage = value;
+            }
+        } // ErrorMessage
+
+        public ArrayList InventoryRoot
+        {
+            get
+            {
+                return this.inventoryRoot;
+            }
+            set
+            {
+                this.inventoryRoot = value;
+            }
+        }
+
+        public ArrayList InventorySkeleton
+        {
+            get
+            {
+                return this.agentInventory;
+            }
+            set
+            {
+                this.agentInventory = value;
+            }
+        }
+
+        public string Home
+        {
+            get
+            {
+                return this.home;
+            }
+            set
+            {
+                this.home = value;
+            }
+        }
+
+        public string Message
+        {
+            get
+            {
+                return this.welcomeMessage;
+            }
+            set
+            {
+                this.welcomeMessage = value;
+            }
+        }
+        #endregion
+
+
+        public class UserInfo
+        {
+            public string firstname;
+            public string lastname;
+            public ulong homeregionhandle;
+            public LLVector3 homepos;
+            public LLVector3 homelookat;
+        }
+    }
+}
+
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
new file mode 100644
index 0000000..02aa3f3
--- /dev/null
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
@@ -0,0 +1,125 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{586E2916-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Framework.UserManagement</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Framework.UserManagement</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework" >
+      <HintPath>OpenSim.Framework.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Console" >
+      <HintPath>OpenSim.Framework.Console.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
+      <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Servers" >
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LoginResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserManagerBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj.user b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
new file mode 100644
index 0000000..eb46c14
--- /dev/null
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -0,0 +1,641 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Data;
+using libsecondlife;
+using System.Reflection;
+
+using System.Xml;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+
+using System.Security.Cryptography;
+
+namespace OpenSim.Framework.UserManagement
+{
+    public class UserManagerBase
+    {
+        public OpenSim.Framework.Interfaces.UserConfig _config;
+        Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
+
+        /// <summary>
+        /// Adds a new user server plugin - user servers will be requested in the order they were loaded.
+        /// </summary>
+        /// <param name="FileName">The filename to the user server plugin DLL</param>
+        public void AddPlugin(string FileName)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
+            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (!pluginType.IsAbstract)
+                {
+                    Type typeInterface = pluginType.GetInterface("IUserData", true);
+
+                    if (typeInterface != null)
+                    {
+                        IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        plug.Initialise();
+                        this._plugins.Add(plug.getName(), plug);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
+                    }
+
+                    typeInterface = null;
+                }
+            }
+
+            pluginAssembly = null;
+        }
+
+        #region Get UserProfile 
+        /// <summary>
+        /// Loads a user profile from a database by UUID
+        /// </summary>
+        /// <param name="uuid">The target UUID</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData getUserProfile(LLUUID uuid)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    UserProfileData profile = plugin.Value.getUserByUUID(uuid);
+                    profile.currentAgent = getUserAgent(profile.UUID);
+                    return profile;
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+            return null;
+        }
+
+
+        /// <summary>
+        /// Loads a user profile by name
+        /// </summary>
+        /// <param name="name">The target name</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData getUserProfile(string name)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    UserProfileData profile = plugin.Value.getUserByName(name);
+                    profile.currentAgent = getUserAgent(profile.UUID);
+                    return profile;
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Loads a user profile by name
+        /// </summary>
+        /// <param name="fname">First name</param>
+        /// <param name="lname">Last name</param>
+        /// <returns>A user profile</returns>
+        public UserProfileData getUserProfile(string fname, string lname)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    UserProfileData profile = plugin.Value.getUserByName(fname,lname);
+                    try
+                    {
+                        profile.currentAgent = getUserAgent(profile.UUID);
+                    }
+                    catch (Exception e)
+                    {
+                        // Ignore
+                    }
+                    return profile;
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+            return null;
+        }
+        #endregion
+
+        #region Get UserAgent
+        /// <summary>
+        /// Loads a user agent by uuid (not called directly)
+        /// </summary>
+        /// <param name="uuid">The agents UUID</param>
+        /// <returns>Agent profiles</returns>
+        public UserAgentData getUserAgent(LLUUID uuid)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    return plugin.Value.getAgentByUUID(uuid);
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Loads a user agent by name (not called directly)
+        /// </summary>
+        /// <param name="name">The agents name</param>
+        /// <returns>A user agent</returns>
+        public UserAgentData getUserAgent(string name)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    return plugin.Value.getAgentByName(name);
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Loads a user agent by name (not called directly)
+        /// </summary>
+        /// <param name="fname">The agents firstname</param>
+        /// <param name="lname">The agents lastname</param>
+        /// <returns>A user agent</returns>
+        public UserAgentData getUserAgent(string fname, string lname)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    return plugin.Value.getAgentByName(fname,lname);
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+            return null;
+        }
+
+        #endregion
+
+        #region CreateAgent
+        /// <summary>
+        /// Creates and initialises a new user agent - make sure to use CommitAgent when done to submit to the DB
+        /// </summary>
+        /// <param name="profile">The users profile</param>
+        /// <param name="request">The users loginrequest</param>
+        public void CreateAgent(ref UserProfileData profile, XmlRpcRequest request)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            UserAgentData agent = new UserAgentData();
+
+            // User connection
+            agent.agentIP = "";
+            agent.agentOnline = true;
+            agent.agentPort = 0;
+
+            // Generate sessions
+            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
+            byte[] randDataS = new byte[16];
+            byte[] randDataSS = new byte[16];
+            rand.GetBytes(randDataS);
+            rand.GetBytes(randDataSS);
+
+            agent.secureSessionID = new LLUUID(randDataSS, 0);
+            agent.sessionID = new LLUUID(randDataS, 0);
+
+            // Profile UUID
+            agent.UUID = profile.UUID;
+
+            // Current position (from Home)
+            agent.currentHandle = profile.homeRegion;
+            agent.currentPos = profile.homeLocation;
+
+            // If user specified additional start, use that
+            if (requestData.ContainsKey("start"))
+            {
+                string startLoc = ((string)requestData["start"]).Trim();
+                if (!(startLoc == "last" || startLoc == "home"))
+                {
+                    // Format: uri:Ahern&162&213&34
+                    try
+                    {
+                        string[] parts = startLoc.Remove(0, 4).Split('&');
+                        string region = parts[0];
+
+                        ////////////////////////////////////////////////////
+                        //SimProfile SimInfo = new SimProfile();
+                        //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
+                    }
+                    catch (Exception e)
+                    {
+
+                    }
+                }
+            }
+
+            // What time did the user login?
+            agent.loginTime = Util.UnixTimeSinceEpoch();
+            agent.logoutTime = 0;
+
+            // Current location
+            agent.regionID = new LLUUID(); // Fill in later
+            agent.currentRegion = new LLUUID();      // Fill in later
+
+            profile.currentAgent = agent;
+        }
+
+        /// <summary>
+        /// Saves a target agent to the database
+        /// </summary>
+        /// <param name="profile">The users profile</param>
+        /// <returns>Successful?</returns>
+        public bool CommitAgent(ref UserProfileData profile)
+        {
+            // Saves the agent to database
+            return true;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Checks a user against it's password hash
+        /// </summary>
+        /// <param name="profile">The users profile</param>
+        /// <param name="password">The supplied password</param>
+        /// <returns>Authenticated?</returns>
+        public virtual bool AuthenticateUser(ref UserProfileData profile, string password)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose(
+                "Authenticating " + profile.username + " " + profile.surname);
+
+            password = password.Remove(0, 3); //remove $1$
+
+            string s = Util.Md5Hash(password + ":" + profile.passwordSalt);
+
+            return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        #region Xml Response
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="firstname"></param>
+        /// <param name="lastname"></param>
+        /// <returns></returns>
+        public virtual UserProfileData GetTheUser(string firstname, string lastname)
+        {
+            return getUserProfile(firstname, lastname);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public virtual string GetMessage()
+        {
+            return _config.DefaultStartupMsg;
+        }
+
+        /// <summary>
+        /// Customises the login response and fills in missing values.
+        /// </summary>
+        /// <param name="response">The existing response</param>
+        /// <param name="theUser">The user profile</param>
+        public virtual void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
+        {
+       
+        }
+
+        /// <summary>
+        /// Main user login function
+        /// </summary>
+        /// <param name="request">The XMLRPC request</param>
+        /// <returns>The response to send</returns>
+        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));
+            bool GoodLogin = false;
+            string firstname = "";
+            string lastname = "";
+            string passwd = "";
+
+            UserProfileData TheUser;
+            LoginResponse logResponse = new LoginResponse();
+
+            if (GoodXML)
+            {
+                firstname = (string)requestData["first"];
+                lastname = (string)requestData["last"];
+                passwd = (string)requestData["passwd"];
+
+                TheUser = GetTheUser(firstname, lastname);
+                if (TheUser == null)
+                    return logResponse.CreateLoginFailedResponse();
+
+                GoodLogin = AuthenticateUser(ref TheUser, passwd);
+            }
+            else
+            {
+                return logResponse.CreateGridErrorResponse();
+            }
+
+            if (!GoodLogin)
+            {
+                return logResponse.CreateLoginFailedResponse();
+            }
+            else
+            {
+                // If we already have a session...
+                if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline)
+                {
+                    // Reject the login
+                    return logResponse.CreateAlreadyLoggedInResponse();
+                }
+                // Otherwise...
+                // Create a new agent session
+                CreateAgent(ref TheUser, request);
+
+                try
+                {
+
+                    LLUUID AgentID = TheUser.UUID;
+
+                    // Inventory Library Section
+                    ArrayList AgentInventoryArray = new ArrayList();
+                    Hashtable TempHash;
+
+                    AgentInventory Library = new AgentInventory();
+                    Library.CreateRootFolder(AgentID, true);
+
+                    foreach (InventoryFolder InvFolder in Library.InventoryFolders.Values)
+                    {
+                        TempHash = new Hashtable();
+                        TempHash["name"] = InvFolder.FolderName;
+                        TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
+                        TempHash["version"] = (Int32)InvFolder.Version;
+                        TempHash["type_default"] = (Int32)InvFolder.DefaultType;
+                        TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
+                        AgentInventoryArray.Add(TempHash);
+                    }
+
+                    Hashtable InventoryRootHash = new Hashtable();
+                    InventoryRootHash["folder_id"] = Library.InventoryRoot.FolderID.ToStringHyphenated();
+                    ArrayList InventoryRoot = new ArrayList();
+                    InventoryRoot.Add(InventoryRootHash);
+
+                    // Circuit Code
+                    uint circode = (uint)(Util.RandomClass.Next());
+
+                    logResponse.Lastname = TheUser.surname;
+                    logResponse.Firstname = TheUser.username;
+                    logResponse.AgentID = AgentID.ToStringHyphenated();
+                    logResponse.SessionID = TheUser.currentAgent.sessionID.ToStringHyphenated();
+                    logResponse.SecureSessionID = TheUser.currentAgent.secureSessionID.ToStringHyphenated();
+                    logResponse.InventoryRoot = InventoryRoot;
+                    logResponse.InventorySkeleton = AgentInventoryArray;
+                    logResponse.CircuitCode = (Int32)circode;
+                    logResponse.RegionX = 0; //overwritten
+                    logResponse.RegionY = 0; //overwritten
+                    logResponse.Home = "!!null temporary value {home}!!";   // Overwritten
+                    //logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
+                    logResponse.SimAddress = "127.0.0.1"; //overwritten
+                    logResponse.SimPort = 0; //overwritten
+                    logResponse.Message = this.GetMessage();
+                    
+                    try
+                    {
+                        this.CustomiseResponse(ref logResponse, ref TheUser);
+                    }
+                    catch (Exception e)
+                    {
+                        System.Console.WriteLine(e.ToString());
+                        return logResponse.CreateDeadRegionResponse();
+                    }
+                    CommitAgent(ref TheUser);
+
+                    return logResponse.ToXmlRpcResponse();
+
+                }
+                catch (Exception E)
+                {
+                    System.Console.WriteLine(E.ToString());
+                }
+                //}
+            }
+            return response;
+
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Deletes an active agent session
+        /// </summary>
+        /// <param name="request">The request</param>
+        /// <param name="path">The path (eg /bork/narf/test)</param>
+        /// <param name="param">Parameters sent</param>
+        /// <returns>Success "OK" else error</returns>
+        public string RestDeleteUserSessionMethod(string request, string path, string param)
+        {
+            // TODO! Important!
+
+            return "OK";
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="user"></param>
+        public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
+        {
+            UserProfileData user = new UserProfileData();
+            user.homeLocation = new LLVector3(128, 128, 100);
+            user.UUID = LLUUID.Random();
+            user.username = firstName;
+            user.surname = lastName;
+            user.passwordHash = pass;
+            user.passwordSalt = "";
+            user.created = Util.UnixTimeSinceEpoch();
+            user.homeLookAt = new LLVector3(100, 100, 100);
+            user.homeRegion = Util.UIntsToLong((regX * 256), (regY * 256));
+
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    plugin.Value.addNewUserProfile(user);
+
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns an error message that the user could not be found in the database
+        /// </summary>
+        /// <returns>XML string consisting of a error element containing individual error(s)</returns>
+        public string CreateUnknownUserErrorResponse()
+        {
+            System.IO.StringWriter sw = new System.IO.StringWriter();
+            XmlTextWriter xw = new XmlTextWriter(sw);
+
+            // Header
+            xw.Formatting = Formatting.Indented;
+            xw.WriteStartDocument();
+            xw.WriteDocType("error", null, null, null);
+            xw.WriteComment("An error occured");
+            xw.WriteStartElement("error");
+
+            // User
+            xw.WriteElementString("unknownuser", "Unable to find a user with that name");
+
+            // Footer
+            xw.WriteEndElement();
+            xw.Flush();
+            xw.Close();
+
+            return sw.ToString();
+        }
+
+        /// <summary>
+        /// Converts a user profile to an XML element which can be returned
+        /// </summary>
+        /// <param name="profile">The user profile</param>
+        /// <returns>A string containing an XML Document of the user profile</returns>
+        public string ProfileToXml(UserProfileData profile)
+        {
+            System.IO.StringWriter sw = new System.IO.StringWriter();
+            XmlTextWriter xw = new XmlTextWriter(sw);
+
+            // Header
+            xw.Formatting = Formatting.Indented;
+            xw.WriteStartDocument();
+            xw.WriteDocType("userprofile", null, null, null);
+            xw.WriteComment("Found user profiles matching the request");
+            xw.WriteStartElement("users");
+
+            // User
+            xw.WriteStartElement("user");
+            // Account information
+            xw.WriteAttributeString("firstname", profile.username);
+            xw.WriteAttributeString("lastname", profile.surname);
+            xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());
+            // Server Information
+            xw.WriteAttributeString("server_inventory", profile.userInventoryURI);
+            xw.WriteAttributeString("server_asset", profile.userAssetURI);
+            // Profile Information
+            xw.WriteAttributeString("profile_about", profile.profileAboutText);
+            xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);
+            xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());
+            xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());
+            xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());
+            xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());
+            xw.WriteAttributeString("profile_created",profile.created.ToString());
+            xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());
+            // Home region information
+            xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());
+            xw.WriteAttributeString("home_region", profile.homeRegion.ToString());
+            xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());
+
+            xw.WriteEndElement();
+
+            // Footer
+            xw.WriteEndElement();
+            xw.Flush();
+            xw.Close();
+
+            return sw.ToString();
+        }
+
+        #region REST Methods 
+        //should most likely move out of here and into the grid's userserver sub class
+        public string RestGetUserMethodName(string request, string path, string param)
+        {
+            UserProfileData userProfile = getUserProfile(param.Trim());
+
+            if (userProfile == null)
+            {
+                return CreateUnknownUserErrorResponse();
+            }
+
+            return ProfileToXml(userProfile);
+        }
+
+        public string RestGetUserMethodUUID(string request, string path, string param)
+        {
+            UserProfileData userProfile = getUserProfile(new LLUUID(param));
+
+            if (userProfile == null)
+            {
+                return CreateUnknownUserErrorResponse();
+            }
+
+            return ProfileToXml(userProfile);
+        }
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
new file mode 100644
index 0000000..6fc6bf8
--- /dev/null
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -0,0 +1,130 @@
+/*
+* 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.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+//using OpenSim.CAPS;
+using Nwc.XmlRpc;
+using System.Collections;
+using OpenSim.Framework.Console;
+using OpenSim.Servers;
+
+namespace OpenGridServices.AssetServer
+{
+    /// <summary>
+    /// An HTTP server for sending assets
+    /// </summary>
+    public class AssetHttpServer :BaseHttpServer
+    {
+        /// <summary>
+        /// Creates the new asset server
+        /// </summary>
+        /// <param name="port">Port to initalise on</param>
+        public AssetHttpServer(int port)
+            : base(port)
+        {
+        }
+
+        /// <summary>
+        /// Handles an HTTP request
+        /// </summary>
+        /// <param name="stateinfo">HTTP State Info</param>
+        public override void HandleRequest(Object stateinfo)
+        {
+            try
+            {
+                HttpListenerContext context = (HttpListenerContext)stateinfo;
+
+                HttpListenerRequest request = context.Request;
+                HttpListenerResponse response = context.Response;
+
+                response.KeepAlive = false;
+                response.SendChunked = false;
+
+                System.IO.Stream body = request.InputStream;
+                System.Text.Encoding encoding = System.Text.Encoding.UTF8;
+                System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
+
+                string requestBody = reader.ReadToEnd();
+                body.Close();
+                reader.Close();
+
+                //Console.WriteLine(request.HttpMethod + " " + request.RawUrl + " Http/" + request.ProtocolVersion.ToString() + " content type: " + request.ContentType);
+                //Console.WriteLine(requestBody);
+
+                string responseString = "";
+                switch (request.ContentType)
+                {
+                    case "text/xml":
+                        // must be XML-RPC, so pass to the XML-RPC parser
+
+                        responseString = ParseXMLRPC(requestBody);
+                        responseString = Regex.Replace(responseString, "utf-16", "utf-8");
+
+                        response.AddHeader("Content-type", "text/xml");
+                        break;
+
+                    case "application/xml":
+                        // probably LLSD we hope, otherwise it should be ignored by the parser
+                        responseString = ParseLLSDXML(requestBody);
+                        response.AddHeader("Content-type", "application/xml");
+                        break;
+
+                    case "application/x-www-form-urlencoded":
+                        // a form data POST so send to the REST parser
+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
+                        response.AddHeader("Content-type", "text/plain");
+                        break;
+
+                    case null:
+                        // must be REST or invalid crap, so pass to the REST parser
+                        responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
+                        response.AddHeader("Content-type", "text/plain");
+                        break;
+
+                }
+
+                Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+                byte[] buffer = Windows1252Encoding.GetBytes(responseString);
+                System.IO.Stream output = response.OutputStream;
+                response.SendChunked = false;
+                response.ContentLength64 = buffer.Length;
+                output.Write(buffer, 0, buffer.Length);
+                output.Close();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+    }
+}
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
new file mode 100644
index 0000000..96c9dba
--- /dev/null
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -0,0 +1,337 @@
+/*
+* 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.IO;
+using System.Text;
+using System.Timers;
+using System.Net;
+using System.Reflection;
+using System.Threading;
+using libsecondlife;
+using OpenSim.Framework;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Utilities;
+using OpenSim.Servers;
+using Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+
+namespace OpenGridServices.AssetServer
+{
+    /// <summary>
+    /// An asset server
+    /// </summary>
+    public class OpenAsset_Main :  conscmd_callback
+    {
+        private IObjectContainer db;
+
+        public static OpenAsset_Main assetserver;
+
+        private LogBase m_console;
+
+        [STAThread]
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("Starting...\n");
+
+            assetserver = new OpenAsset_Main();
+            assetserver.Startup();
+
+            assetserver.Work();
+        }
+
+        private void Work()
+        {
+            m_console.Notice("Enter help for a list of commands");
+
+            while (true)
+            {
+                m_console.MainLogPrompt();
+            }
+        }
+
+        private OpenAsset_Main()
+        {
+            m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);
+            OpenSim.Framework.Console.MainLog.Instance = m_console;
+        }
+
+        public void Startup()
+        {
+            m_console.Verbose( "Main.cs:Startup() - Setting up asset DB");
+            setupDB();
+
+            m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
+            AssetHttpServer httpServer = new AssetHttpServer(8003);
+
+
+            httpServer.AddRestHandler("GET", "/assets/", this.assetGetMethod);
+            httpServer.AddRestHandler("POST", "/assets/", this.assetPostMethod);
+
+            httpServer.Start();
+
+        }
+
+        public string assetPostMethod(string requestBody, string path, string param)
+        {
+            AssetBase asset = new AssetBase();
+            asset.Name = "";
+            asset.FullID = new LLUUID(param);
+            Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+            byte[] buffer = Windows1252Encoding.GetBytes(requestBody);
+            asset.Data = buffer;
+            AssetStorage store = new AssetStorage();
+            store.Data = asset.Data;
+            store.Name = asset.Name;
+            store.UUID = asset.FullID;
+            db.Set(store);
+            db.Commit();
+            return "";
+        }
+
+        public string assetGetMethod(string request, string path, string param)
+        {
+            Console.WriteLine("got a request " + param);
+            byte[] assetdata = getAssetData(new LLUUID(param), false);
+            if (assetdata != null)
+            {
+                 Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+                 string ret = Windows1252Encoding.GetString(assetdata);
+                //string ret = System.Text.Encoding.Unicode.GetString(assetdata);
+
+                return ret;
+               
+            }
+            else
+            {
+                return "";
+            }
+
+        }
+
+        public byte[] getAssetData(LLUUID assetID, bool isTexture)
+        {
+            bool found = false;
+            AssetStorage foundAsset = null;
+
+            IObjectSet result = db.Get(new AssetStorage(assetID));
+            if (result.Count > 0)
+            {
+                foundAsset = (AssetStorage)result.Next();
+                found = true;
+            }
+
+            if (found)
+            {
+                return foundAsset.Data;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public void setupDB()
+        {
+            bool yapfile = System.IO.File.Exists("assets.yap");
+            try
+            {
+                db = Db4oFactory.OpenFile("assets.yap");
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "Main.cs:setupDB() - creation");
+            }
+            catch (Exception e)
+            {
+                db.Close();
+                OpenSim.Framework.Console.MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+            }
+            if (!yapfile)
+            {
+                this.LoadDB();
+            }
+        }
+
+        public void LoadDB()
+        {
+            try
+            {
+
+                Console.WriteLine("setting up Asset database");
+
+                AssetBase Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
+                Image.Name = "Bricks";
+                this.LoadAsset(Image, true, "bricks.jp2");
+                AssetStorage store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
+                Image.Name = "Plywood";
+                this.LoadAsset(Image, true, "plywood.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
+                Image.Name = "Rocks";
+                this.LoadAsset(Image, true, "rocks.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
+                Image.Name = "Granite";
+                this.LoadAsset(Image, true, "granite.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
+                Image.Name = "Hardwood";
+                this.LoadAsset(Image, true, "hardwood.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
+                Image.Name = "Prim Base Texture";
+                this.LoadAsset(Image, true, "plywood.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
+                Image.Name = "Shape";
+                this.LoadAsset(Image, false, "base_shape.dat");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+            }
+        }
+
+        private void LoadAsset(AssetBase info, bool image, string filename)
+        {
+
+
+            string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
+            string fileName = Path.Combine(dataPath, filename);
+            FileInfo fInfo = new FileInfo(fileName);
+            long numBytes = fInfo.Length;
+            FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
+            byte[] idata = new byte[numBytes];
+            BinaryReader br = new BinaryReader(fStream);
+            idata = br.ReadBytes((int)numBytes);
+            br.Close();
+            fStream.Close();
+            info.Data = idata;
+            //info.loaded=true;
+        }
+
+        /*private GridConfig LoadConfigDll(string dllName)
+        {
+            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+            GridConfig config = null;
+
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (pluginType.IsPublic)
+                {
+                    if (!pluginType.IsAbstract)
+                    {
+                        Type typeInterface = pluginType.GetInterface("IGridConfig", true);
+
+                        if (typeInterface != null)
+                        {
+                            IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                            config = plug.GetConfigObject();
+                            break;
+                        }
+
+                        typeInterface = null;
+                    }
+                }
+            }
+            pluginAssembly = null;
+            return config;
+        }*/
+
+        public void RunCmd(string cmd, string[] cmdparams)
+        {
+            switch (cmd)
+            {
+                case "help":
+                    m_console.Notice("shutdown - shutdown this asset server (USE CAUTION!)");
+                    break;
+
+                case "shutdown":
+                    m_console.Close();
+                    Environment.Exit(0);
+                    break;
+            }
+        }
+
+        public void Show(string ShowWhat)
+        {
+        }
+    }
+}
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
new file mode 100644
index 0000000..caebca3
--- /dev/null
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -0,0 +1,118 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E5F1A03B-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Grid.AssetServer</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Grid.AssetServer</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework" >
+      <HintPath>OpenSim.Framework.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Console" >
+      <HintPath>OpenSim.Framework.Console.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Servers" >
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssetHttpServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Main.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f9a18a8
--- /dev/null
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
@@ -0,0 +1,60 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OGS-AssetServer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OGS-AssetServer")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
new file mode 100644
index 0000000..dfc572a
--- /dev/null
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -0,0 +1,140 @@
+/*
+* 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 Nwc.XmlRpc;
+using OpenSim.Framework;
+using OpenSim.Servers;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+
+namespace OpenGrid.Framework.Manager
+{
+    /// <summary>
+    /// Used to pass messages to the gridserver
+    /// </summary>
+    /// <param name="param">Pass this argument</param>
+    public delegate void GridManagerCallback(string param);
+
+    /// <summary>
+    /// Serverside listener for grid commands
+    /// </summary>
+    public class GridManagementAgent
+    {
+        /// <summary>
+        /// Passes grid server messages
+        /// </summary>
+        private GridManagerCallback thecallback;
+
+        /// <summary>
+        /// Security keys
+        /// </summary>
+        private string sendkey;
+        private string recvkey;
+
+        /// <summary>
+        /// Our component type
+        /// </summary>
+        private string component_type;
+
+        /// <summary>
+        /// List of active sessions
+        /// </summary>
+        private static ArrayList Sessions;
+
+        /// <summary>
+        /// Initialises a new GridManagementAgent
+        /// </summary>
+        /// <param name="app_httpd">HTTP Daemon for this server</param>
+        /// <param name="component_type">What component type are we?</param>
+        /// <param name="sendkey">Security send key</param>
+        /// <param name="recvkey">Security recieve key</param>
+        /// <param name="thecallback">Message callback</param>
+        public GridManagementAgent(BaseHttpServer app_httpd, string component_type, string sendkey, string recvkey, GridManagerCallback thecallback)
+        {
+            this.sendkey = sendkey;
+            this.recvkey = recvkey;
+            this.component_type = component_type;
+            this.thecallback = thecallback;
+            Sessions = new ArrayList();
+
+            app_httpd.AddXmlRPCHandler("manager_login", XmlRpcLoginMethod);
+
+            switch (component_type)
+            {
+                case "gridserver":
+                    GridServerManager.sendkey = this.sendkey;
+                    GridServerManager.recvkey = this.recvkey;
+                    GridServerManager.thecallback = thecallback;
+                    app_httpd.AddXmlRPCHandler("shutdown", GridServerManager.XmlRpcShutdownMethod);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Checks if a session exists
+        /// </summary>
+        /// <param name="sessionID">The session ID</param>
+        /// <returns>Exists?</returns>
+        public static bool SessionExists(LLUUID sessionID)
+        {
+            return Sessions.Contains(sessionID);
+        }
+
+        /// <summary>
+        /// Logs a new session to the grid manager
+        /// </summary>
+        /// <param name="request">the XMLRPC request</param>
+        /// <returns>An XMLRPC reply</returns>
+        public static XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable responseData = new Hashtable();
+
+            // TODO: Switch this over to using OpenGrid.Framework.Data
+            if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
+            {
+                response.IsFault = false;
+                LLUUID new_session = LLUUID.Random();
+                Sessions.Add(new_session);
+                responseData["session_id"] = new_session.ToString();
+                responseData["msg"] = "Login OK";
+            }
+            else
+            {
+                response.IsFault = true;
+                responseData["error"] = "Invalid username or password";
+            }
+
+            response.Value = responseData;
+            return response;
+
+        }
+
+    }
+}
diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
new file mode 100644
index 0000000..e276556
--- /dev/null
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -0,0 +1,94 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Nwc.XmlRpc;
+using System.Threading;
+using libsecondlife;
+
+namespace OpenGrid.Framework.Manager {
+
+    /// <summary>
+    /// A remote management system for the grid server
+    /// </summary>
+	public class GridServerManager 
+	{
+        /// <summary>
+        /// Triggers events from the grid manager
+        /// </summary>
+		public static GridManagerCallback thecallback;
+
+        /// <summary>
+        /// Security keys
+        /// </summary>
+		public static string sendkey;
+		public static string recvkey;
+
+        /// <summary>
+        /// Disconnects the grid server and shuts it down
+        /// </summary>
+        /// <param name="request">XmlRpc Request</param>
+        /// <returns>An XmlRpc response containing either a "msg" or an "error"</returns>
+		public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)
+         	{
+           		XmlRpcResponse response = new XmlRpcResponse();
+            		Hashtable requestData = (Hashtable)request.Params[0];
+	    		Hashtable responseData = new Hashtable();
+         
+			if(requestData.ContainsKey("session_id")) {
+				if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) {
+					responseData["msg"]="Shutdown command accepted";
+					(new Thread(new ThreadStart(ShutdownServer))).Start();
+				} else {
+					response.IsFault=true;
+					responseData["error"]="bad session ID";
+				}
+			} else {
+				response.IsFault=true;
+				responseData["error"]="no session ID";
+			}
+
+	    		response.Value = responseData;
+	    		return response;
+		}
+
+		/// <summary>
+        /// Shuts down the grid server
+		/// </summary>
+		public static void ShutdownServer()
+		{
+			Console.WriteLine("Shutting down the grid server - recieved a grid manager request");
+            Console.WriteLine("Terminating in three seconds...");
+			Thread.Sleep(3000);
+			thecallback("shutdown");
+		}
+	 }
+}
+
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
new file mode 100644
index 0000000..9a98ff4
--- /dev/null
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
@@ -0,0 +1,99 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4B7BFD1C-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Grid.Framework.Manager</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Grid.Framework.Manager</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework" >
+      <HintPath>OpenSim.Framework.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Servers" >
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GridManagementAgent.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="GridServerManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj.user b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
new file mode 100644
index 0000000..c9701d6
--- /dev/null
+++ b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("GridConfig")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("GridConfig")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
new file mode 100644
index 0000000..2218004
--- /dev/null
+++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
@@ -0,0 +1,161 @@
+/*
+* 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 OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using Db4objects.Db4o;
+
+namespace OpenGrid.Config.GridConfigDb4o
+{
+    /// <summary>
+    /// A grid configuration interface for returning the DB4o Config Provider
+    /// </summary>
+	public class Db40ConfigPlugin: IGridConfig
+	{
+        /// <summary>
+        /// Loads and returns a configuration objeect
+        /// </summary>
+        /// <returns>A grid configuration object</returns>
+		public GridConfig GetConfigObject()
+		{
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll");
+			return ( new DbGridConfig());
+		}
+	}
+	
+    /// <summary>
+    /// A DB4o based Gridserver configuration object
+    /// </summary>
+	public class DbGridConfig : GridConfig
+	{
+        /// <summary>
+        /// The DB4o Database
+        /// </summary>
+		private IObjectContainer db;	
+		
+        /// <summary>
+        /// User configuration for the Grid Config interfaces
+        /// </summary>
+		public void LoadDefaults() {
+			OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+			
+            // About the grid options
+			this.GridOwner = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
+
+            // Asset Options
+			this.DefaultAssetServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
+            this.AssetSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to asset server","null");
+            this.AssetRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
+
+            // User Server Options
+	        this.DefaultUserServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
+        	this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server","null");
+        	this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server","null");
+
+            // Region Server Options
+            this.SimSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to sims","null");
+            this.SimRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from sims","null");
+		}
+
+        /// <summary>
+        /// Initialises a new configuration object
+        /// </summary>
+		public override void InitConfig() {
+			try {
+                // Perform Db4o initialisation
+				db = Db4oFactory.OpenFile("opengrid.yap");
+
+                // Locate the grid configuration object
+				IObjectSet result = db.Get(typeof(DbGridConfig));
+                // Found?
+				if(result.Count==1) {
+					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
+					foreach (DbGridConfig cfg in result) {
+                        // Import each setting into this class
+                        // Grid Settings
+						this.GridOwner=cfg.GridOwner;
+                        // Asset Settings
+						this.DefaultAssetServer=cfg.DefaultAssetServer;
+						this.AssetSendKey=cfg.AssetSendKey;
+						this.AssetRecvKey=cfg.AssetRecvKey;
+                        // User Settings
+						this.DefaultUserServer=cfg.DefaultUserServer;
+						this.UserSendKey=cfg.UserSendKey;
+						this.UserRecvKey=cfg.UserRecvKey;
+                        // Region Settings
+						this.SimSendKey=cfg.SimSendKey;
+						this.SimRecvKey=cfg.SimRecvKey;
+					}
+                // Create a new configuration object from this class
+				} else {
+					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+
+                    // Load default settings into this class
+					LoadDefaults();
+
+                    // Saves to the database file...
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "Writing out default settings to local database");
+					db.Set(this);
+
+                    // Closes file locks
+					db.Close();
+				}
+			} catch(Exception e) {
+				OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+			}
+			
+            // Grid Settings
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid settings loaded:");
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid owner: " + this.GridOwner);
+
+            // Asset Settings
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
+
+            // User Settings
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
+
+            // Region Settings
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
+		}
+	
+        /// <summary>
+        /// Closes down the database and releases filesystem locks
+        /// </summary>
+		public void Shutdown() {
+			db.Close();
+		}
+	}
+	
+}
diff --git a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj
new file mode 100644
index 0000000..24e845c
--- /dev/null
+++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj
@@ -0,0 +1,107 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{1442B635-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Grid.GridServer.Config</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Grid.GridServer.Config</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework" >
+      <HintPath>OpenSim.Framework.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Console" >
+      <HintPath>OpenSim.Framework.Console.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data.dll" >
+      <HintPath>..\..\..\bin\System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DbGridConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj.user b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
new file mode 100644
index 0000000..bf80652
--- /dev/null
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -0,0 +1,599 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using OpenGrid.Framework.Data;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Sims;
+using libsecondlife;
+using Nwc.XmlRpc;
+using System.Xml;
+
+namespace OpenGridServices.GridServer
+{
+    class GridManager
+    {
+        Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
+        Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>();
+
+        public OpenSim.Framework.Interfaces.GridConfig config;
+
+        /// <summary>
+        /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
+        /// </summary>
+        /// <param name="FileName">The filename to the grid server plugin DLL</param>
+        public void AddPlugin(string FileName)
+		{
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);
+			Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+			foreach (Type pluginType in pluginAssembly.GetTypes())
+			{
+                if (!pluginType.IsAbstract)
+                {
+                    // Regions go here
+                    Type typeInterface = pluginType.GetInterface("IGridData", true);
+
+                    if (typeInterface != null)
+                    {
+                        IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        plug.Initialise();
+                        this._plugins.Add(plug.getName(), plug);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Added IGridData Interface");
+                    }
+
+                    typeInterface = null;
+
+                    // Logs go here
+                    typeInterface = pluginType.GetInterface("ILogData", true);
+
+                    if (typeInterface != null)
+                    {
+                        ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        plug.Initialise();
+                        this._logplugins.Add(plug.getName(), plug);
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose( "Storage: Added ILogData Interface");
+                    }
+
+                    typeInterface = null;
+                }
+			}
+			
+			pluginAssembly = null; 
+        }
+
+        /// <summary>
+        /// Logs a piece of information to the database
+        /// </summary>
+        /// <param name="target">What you were operating on (in grid server, this will likely be the region UUIDs)</param>
+        /// <param name="method">Which method is being called?</param>
+        /// <param name="args">What arguments are being passed?</param>
+        /// <param name="priority">How high priority is this? 1 = Max, 6 = Verbose</param>
+        /// <param name="message">The message to log</param>
+        private void logToDB(string target, string method, string args, int priority, string message)
+        {
+            foreach (KeyValuePair<string, ILogData> kvp in _logplugins)
+            {
+                try
+                {
+                    kvp.Value.saveLog("Gridserver", target, method, args, priority, message);
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a region by argument
+        /// </summary>
+        /// <param name="uuid">A UUID key of the region to return</param>
+        /// <returns>A SimProfileData for the region</returns>
+        public SimProfileData getRegion(libsecondlife.LLUUID uuid)
+        {
+            foreach(KeyValuePair<string,IGridData> kvp in _plugins) {
+                try
+                {
+                    return kvp.Value.GetProfileByLLUUID(uuid);
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a region by argument
+        /// </summary>
+        /// <param name="uuid">A regionHandle of the region to return</param>
+        /// <returns>A SimProfileData for the region</returns>
+        public SimProfileData getRegion(ulong handle)
+        {
+            foreach (KeyValuePair<string, IGridData> kvp in _plugins)
+            {
+                try
+                {
+                    return kvp.Value.GetProfileByHandle(handle);
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
+                }
+            }
+            return null;
+        }
+
+        public Dictionary<ulong, SimProfileData> getRegions(uint xmin, uint ymin, uint xmax, uint ymax)
+        {
+            Dictionary<ulong, SimProfileData> regions = new Dictionary<ulong, SimProfileData>();
+
+            SimProfileData[] neighbours;
+
+            foreach (KeyValuePair<string, IGridData> kvp in _plugins)
+            {
+                try
+                {
+                    neighbours = kvp.Value.GetProfilesInRange(xmin, ymin, xmax, ymax);
+                    foreach (SimProfileData neighbour in neighbours)
+                    {
+                        regions[neighbour.regionHandle] = neighbour;
+                    }
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
+                }
+            }
+
+            return regions;
+        }
+
+        /// <summary>
+        /// Returns a XML String containing a list of the neighbouring regions
+        /// </summary>
+        /// <param name="reqhandle">The regionhandle for the center sim</param>
+        /// <returns>An XML string containing neighbour entities</returns>
+        public string GetXMLNeighbours(ulong reqhandle)
+        {
+            string response = "";
+            SimProfileData central_region = getRegion(reqhandle);
+            SimProfileData neighbour;
+            for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++)
+                {
+                    if (getRegion(Util.UIntsToLong((uint)((central_region.regionLocX + x) * 256), (uint)(central_region.regionLocY + y) * 256)) != null)
+                    {
+                        neighbour = getRegion(Util.UIntsToLong((uint)((central_region.regionLocX + x) * 256), (uint)(central_region.regionLocY + y) * 256));
+                        response += "<neighbour>";
+                        response += "<sim_ip>" + neighbour.serverIP + "</sim_ip>";
+                        response += "<sim_port>" + neighbour.serverPort.ToString() + "</sim_port>";
+                        response += "<locx>" + neighbour.regionLocX.ToString() + "</locx>";
+                        response += "<locy>" + neighbour.regionLocY.ToString() + "</locy>";
+                        response += "<regionhandle>" + neighbour.regionHandle.ToString() + "</regionhandle>";
+                        response += "</neighbour>";
+
+                    }
+                }
+            return response;
+        }
+
+        /// <summary>
+        /// Performed when a region connects to the grid server initially.
+        /// </summary>
+        /// <param name="request">The XMLRPC Request</param>
+        /// <returns>Startup parameters</returns>
+        public XmlRpcResponse XmlRpcLoginToSimulatorMethod(XmlRpcRequest request)
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable responseData = new Hashtable();
+            response.Value = responseData;
+
+            SimProfileData TheSim = null;
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            if (requestData.ContainsKey("UUID"))
+            {
+                TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
+                logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcLoginToSimulatorMethod","", 5,"Region attempting login with UUID.");
+            }
+            else if (requestData.ContainsKey("region_handle"))
+            {
+                TheSim = getRegion((ulong)Convert.ToUInt64(requestData["region_handle"]));
+                logToDB((string)requestData["region_handle"], "XmlRpcLoginToSimulatorMethod", "", 5, "Region attempting login with regionHandle.");
+            }
+            else
+            {
+                responseData["error"] = "No UUID or region_handle passed to grid server - unable to connect you";
+                return response;
+            }
+
+            if (TheSim == null)
+            {
+                responseData["error"] = "sim not found";
+                return response;
+            }
+            else
+            {
+
+                ArrayList SimNeighboursData = new ArrayList();
+
+                SimProfileData neighbour;
+                Hashtable NeighbourBlock;
+
+                bool fastMode = false; // Only compatible with MySQL right now
+
+                if (fastMode)
+                {
+                    Dictionary<ulong, SimProfileData> neighbours = getRegions(TheSim.regionLocX - 1, TheSim.regionLocY - 1, TheSim.regionLocX + 1, TheSim.regionLocY + 1);
+
+                    foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours)
+                    {
+                        NeighbourBlock = new Hashtable();
+                        NeighbourBlock["sim_ip"] = aSim.Value.serverIP.ToString();
+                        NeighbourBlock["sim_port"] = aSim.Value.serverPort.ToString();
+                        NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString();
+                        NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString();
+                        NeighbourBlock["UUID"] = aSim.Value.UUID.ToString();
+
+                        if (aSim.Value.UUID != TheSim.UUID)
+                            SimNeighboursData.Add(NeighbourBlock);
+                    }
+                }
+                else
+                {
+                    for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++)
+                        {
+                            if (getRegion(Helpers.UIntsToLong((uint)((TheSim.regionLocX + x) * 256), (uint)(TheSim.regionLocY + y) * 256)) != null)
+                            {
+                                neighbour = getRegion(Helpers.UIntsToLong((uint)((TheSim.regionLocX + x) * 256), (uint)(TheSim.regionLocY + y) * 256));
+
+                                NeighbourBlock = new Hashtable();
+                                NeighbourBlock["sim_ip"] = neighbour.serverIP;
+                                NeighbourBlock["sim_port"] = neighbour.serverPort.ToString();
+                                NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString();
+                                NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString();
+                                NeighbourBlock["UUID"] = neighbour.UUID.ToString();
+
+                                if (neighbour.UUID != TheSim.UUID) SimNeighboursData.Add(NeighbourBlock);
+                            }
+                        }
+                }
+
+                responseData["UUID"] = TheSim.UUID.ToString();
+                responseData["region_locx"] = TheSim.regionLocX.ToString();
+                responseData["region_locy"] = TheSim.regionLocY.ToString();
+                responseData["regionname"] = TheSim.regionName;
+                responseData["estate_id"] = "1";
+                responseData["neighbours"] = SimNeighboursData;
+
+                responseData["sim_ip"] = TheSim.serverIP;
+                responseData["sim_port"] = TheSim.serverPort.ToString();
+                responseData["asset_url"] = TheSim.regionAssetURI;
+                responseData["asset_sendkey"] = TheSim.regionAssetSendKey;
+                responseData["asset_recvkey"] = TheSim.regionAssetRecvKey;
+                responseData["user_url"] = TheSim.regionUserURI;
+                responseData["user_sendkey"] = TheSim.regionUserSendKey;
+                responseData["user_recvkey"] = TheSim.regionUserRecvKey;
+                responseData["authkey"] = TheSim.regionSecret;
+
+                // New! If set, use as URL to local sim storage (ie http://remotehost/region.yap)
+                responseData["data_uri"] = TheSim.regionDataURI;
+            }
+
+            return response;
+        }
+
+        public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request)
+        {
+            int xmin=980, ymin=980, xmax=1020, ymax=1020;
+
+            Hashtable requestData = (Hashtable)request.Params[0];
+            if (requestData.ContainsKey("xmin"))
+            {
+                xmin = (Int32)requestData["xmin"];
+            }
+            if (requestData.ContainsKey("ymin"))
+            {
+                ymin = (Int32)requestData["ymin"];
+            }
+            if (requestData.ContainsKey("xmax"))
+            {
+                xmax = (Int32)requestData["xmax"];
+            }
+            if (requestData.ContainsKey("ymax"))
+            {
+                ymax = (Int32)requestData["ymax"];
+            }
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable responseData = new Hashtable();
+            response.Value = responseData;
+            IList simProfileList = new ArrayList();
+
+            bool fastMode = true; // MySQL Only
+
+            if (fastMode)
+            {
+                Dictionary<ulong, SimProfileData> neighbours = getRegions((uint)xmin, (uint)ymin, (uint)xmax, (uint)ymax);
+
+                foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours)
+                {
+                    Hashtable simProfileBlock = new Hashtable();
+                    simProfileBlock["x"] = aSim.Value.regionLocX.ToString();
+                    simProfileBlock["y"] = aSim.Value.regionLocY.ToString();
+                    simProfileBlock["name"] = aSim.Value.regionName;
+                    simProfileBlock["access"] = 21;
+                    simProfileBlock["region-flags"] = 512;
+                    simProfileBlock["water-height"] = 0;
+                    simProfileBlock["agents"] = 1;
+                    simProfileBlock["map-image-id"] = aSim.Value.regionMapTextureID.ToString();
+
+                    // For Sugilite compatibility
+                    simProfileBlock["regionhandle"] = aSim.Value.regionHandle.ToString();
+                    simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString();
+                    simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString();
+                    simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString();
+                    simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated();
+
+                    simProfileList.Add(simProfileBlock);
+                }
+                OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
+            }
+            else
+            {
+                SimProfileData simProfile;
+                for (int x = xmin; x < xmax; x++)
+                {
+                    for (int y = ymin; y < ymax; y++)
+                    {
+                        simProfile = getRegion(Helpers.UIntsToLong((uint)(x * 256), (uint)(y * 256)));
+                        if (simProfile != null)
+                        {
+                            Hashtable simProfileBlock = new Hashtable();
+                            simProfileBlock["x"] = x;
+                            simProfileBlock["y"] = y;
+                            simProfileBlock["name"] = simProfile.regionName;
+                            simProfileBlock["access"] = 0;
+                            simProfileBlock["region-flags"] = 0;
+                            simProfileBlock["water-height"] = 20;
+                            simProfileBlock["agents"] = 1;
+                            simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString();
+
+                            // For Sugilite compatibility
+                            simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString();
+                            simProfileBlock["sim_ip"] = simProfile.serverIP.ToString();
+                            simProfileBlock["sim_port"] = simProfile.serverPort.ToString();
+                            simProfileBlock["sim_uri"] = simProfile.serverURI.ToString();
+                            simProfileBlock["uuid"] = simProfile.UUID.ToStringHyphenated();
+
+                            simProfileList.Add(simProfileBlock);
+                        }
+                    }
+                }
+                OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
+            }
+
+            responseData["sim-profiles"] = simProfileList;
+
+            return response;
+        }
+
+
+
+        /// <summary>
+        /// Performs a REST Get Operation
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string RestGetRegionMethod(string request, string path, string param)
+        {
+            return RestGetSimMethod("", "/sims/", param);
+        }
+
+        /// <summary>
+        /// Performs a REST Set Operation
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string RestSetRegionMethod(string request, string path, string param)
+        {
+            return RestSetSimMethod("", "/sims/", param);
+        }
+
+        /// <summary>
+        /// Returns information about a sim via a REST Request
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns>Information about the sim in XML</returns>
+        public string RestGetSimMethod(string request, string path, string param)
+        {
+            string respstring = String.Empty;
+
+            SimProfileData TheSim;
+            LLUUID UUID = new LLUUID(param);
+            TheSim = getRegion(UUID);
+
+            if (!(TheSim == null))
+            {
+                respstring = "<Root>";
+                respstring += "<authkey>" + TheSim.regionSendKey + "</authkey>";
+                respstring += "<sim>";
+                respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>";
+                respstring += "<regionname>" + TheSim.regionName + "</regionname>";
+                respstring += "<sim_ip>" + TheSim.serverIP + "</sim_ip>";
+                respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>";
+                respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>";
+                respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>";
+                respstring += "<estate_id>1</estate_id>";
+                respstring += "</sim>";
+                respstring += "</Root>";
+            }
+
+            return respstring;
+        }
+
+        /// <summary>
+        /// Creates or updates a sim via a REST Method Request
+        /// BROKEN with SQL Update
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns>"OK" or an error</returns>
+        public string RestSetSimMethod(string request, string path, string param)
+        {
+            Console.WriteLine("Processing region update");
+            SimProfileData TheSim;
+            TheSim = getRegion(new LLUUID(param));
+            if ((TheSim) == null)
+            {
+                TheSim = new SimProfileData();
+                LLUUID UUID = new LLUUID(param);
+                TheSim.UUID = UUID;
+                TheSim.regionRecvKey = config.SimRecvKey;
+            }
+
+            XmlDocument doc = new XmlDocument();
+            doc.LoadXml(request);
+            XmlNode rootnode = doc.FirstChild;
+            XmlNode authkeynode = rootnode.ChildNodes[0];
+            if (authkeynode.Name != "authkey")
+            {
+                return "ERROR! bad XML - expected authkey tag";
+            }
+
+            XmlNode simnode = rootnode.ChildNodes[1];
+            if (simnode.Name != "sim")
+            {
+                return "ERROR! bad XML - expected sim tag";
+            }
+
+            if (authkeynode.InnerText != TheSim.regionRecvKey)
+            {
+                return "ERROR! invalid key";
+            }
+
+            //TheSim.regionSendKey = Cfg;
+            TheSim.regionRecvKey = config.SimRecvKey;
+            TheSim.regionSendKey = config.SimSendKey;
+            TheSim.regionSecret = config.SimRecvKey;
+            TheSim.regionDataURI = "";
+            TheSim.regionAssetURI = config.DefaultAssetServer;
+            TheSim.regionAssetRecvKey = config.AssetRecvKey;
+            TheSim.regionAssetSendKey = config.AssetSendKey;
+            TheSim.regionUserURI = config.DefaultUserServer;
+            TheSim.regionUserSendKey = config.UserSendKey;
+            TheSim.regionUserRecvKey = config.UserRecvKey;
+
+
+            for (int i = 0; i < simnode.ChildNodes.Count; i++)
+            {
+                switch (simnode.ChildNodes[i].Name)
+                {
+                    case "regionname":
+                        TheSim.regionName = simnode.ChildNodes[i].InnerText;
+                        break;
+
+                    case "sim_ip":
+                        TheSim.serverIP = simnode.ChildNodes[i].InnerText;
+                        break;
+
+                    case "sim_port":
+                        TheSim.serverPort = Convert.ToUInt32(simnode.ChildNodes[i].InnerText);
+                        break;
+
+                    case "region_locx":
+                        TheSim.regionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
+                        TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
+                        break;
+
+                    case "region_locy":
+                        TheSim.regionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
+                        TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
+                        break;
+                }
+            }
+
+            TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
+
+            bool requirePublic = false;
+
+            if (requirePublic && (TheSim.serverIP.StartsWith("172.16") || TheSim.serverIP.StartsWith("192.168") || TheSim.serverIP.StartsWith("10.") || TheSim.serverIP.StartsWith("0.") || TheSim.serverIP.StartsWith("255.")))
+            {
+                return "ERROR! Servers must register with public addresses.";
+            }
+
+            
+            try
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
+                foreach (KeyValuePair<string, IGridData> kvp in _plugins)
+                {
+                    try
+                    {
+                        //Check reservations
+                        ReservationData reserveData = kvp.Value.GetReservationAtPoint(TheSim.regionLocX, TheSim.regionLocY);
+                        if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null))
+                        {
+                            kvp.Value.AddProfile(TheSim);
+                            OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");
+                            logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");
+                        }
+                        else
+                        {
+                            return "Unable to update region (RestSetSimMethod): Incorrect auth key.";
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
+                    }
+                }
+                return "OK";
+            }
+            catch (Exception e)
+            {
+                return "ERROR! Could not save to database! (" + e.ToString() + ")";
+            }
+        }
+
+    }
+}
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
new file mode 100644
index 0000000..b948fd6
--- /dev/null
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -0,0 +1,271 @@
+/*
+* 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.IO;
+using System.Text;
+using System.Timers;
+using System.Net;
+using System.Threading;
+using System.Reflection;
+using libsecondlife;
+using OpenGrid.Framework.Manager;
+using OpenSim.Framework;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Servers;
+using OpenSim.GenericConfig;
+
+namespace OpenGridServices.GridServer
+{
+    /// <summary>
+    /// </summary>
+    public class OpenGrid_Main : conscmd_callback
+    {
+        private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
+        private string GridDll = "OpenGrid.Framework.Data.MySQL.dll";
+        public GridConfig Cfg;
+
+        public static OpenGrid_Main thegrid;
+        protected IGenericConfig localXMLConfig;
+
+        public static bool setuponly;
+
+        //public LLUUID highestUUID;
+
+        //        private SimProfileManager m_simProfileManager;
+
+        private GridManager m_gridManager;
+
+        private LogBase m_console;
+
+        [STAThread]
+        public static void Main(string[] args)
+        {
+            if (args.Length > 0)
+            {
+                if (args[0] == "-setuponly") setuponly = true;
+            }
+            Console.WriteLine("Starting...\n");
+
+            thegrid = new OpenGrid_Main();
+            thegrid.Startup();
+
+            thegrid.Work();
+        }
+
+        private void Work()
+        {
+            while (true)
+            {
+                Thread.Sleep(5000);
+                // should flush the DB etc here
+            }
+        }
+
+        private OpenGrid_Main()
+        {
+            m_console = new LogBase("opengrid-gridserver-console.log", "OpenGrid", this, false);
+            MainLog.Instance = m_console;
+
+
+        }
+
+        public void managercallback(string cmd)
+        {
+            switch (cmd)
+            {
+                case "shutdown":
+                    RunCmd("shutdown", new string[0]);
+                    break;
+            }
+        }
+
+
+        public void Startup()
+        {
+            this.localXMLConfig = new XmlConfig("GridServerConfig.xml");
+            this.localXMLConfig.LoadData();
+            this.ConfigDB(this.localXMLConfig);
+            this.localXMLConfig.Close();
+
+            m_console.Verbose( "Main.cs:Startup() - Loading configuration");
+            Cfg = this.LoadConfigDll(this.ConfigDll);
+            Cfg.InitConfig();
+            if (setuponly) Environment.Exit(0);
+
+            m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server");
+            m_gridManager = new GridManager();
+            m_gridManager.AddPlugin(GridDll); // Made of win
+            m_gridManager.config = Cfg;
+
+            m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
+            BaseHttpServer httpServer = new BaseHttpServer(8001);
+            //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
+
+            httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod);
+            httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);
+
+            httpServer.AddRestHandler("GET", "/sims/", m_gridManager.RestGetSimMethod);
+            httpServer.AddRestHandler("POST", "/sims/", m_gridManager.RestSetSimMethod);
+            httpServer.AddRestHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod);
+            httpServer.AddRestHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod);
+
+
+            // lbsa71 : This code snippet taken from old http server.
+            // I have no idea what this was supposed to do - looks like an infinite recursion to me.
+            //        case "regions":
+            //// DIRTY HACK ALERT
+            //Console.Notice("/regions/ accessed");
+            //TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1]));
+            //respstring = ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod);
+            //break;
+
+            // lbsa71 : I guess these were never used?
+            //Listener.Prefixes.Add("http://+:8001/gods/");
+            //Listener.Prefixes.Add("http://+:8001/highestuuid/");
+            //Listener.Prefixes.Add("http://+:8001/uuidblocks/");
+
+            httpServer.Start();
+
+            m_console.Verbose( "Main.cs:Startup() - Starting sim status checker");
+
+            System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates.
+            simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
+            simCheckTimer.Enabled = true;
+        }
+
+        private GridConfig LoadConfigDll(string dllName)
+        {
+            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+            GridConfig config = null;
+
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (pluginType.IsPublic)
+                {
+                    if (!pluginType.IsAbstract)
+                    {
+                        Type typeInterface = pluginType.GetInterface("IGridConfig", true);
+
+                        if (typeInterface != null)
+                        {
+                            IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                            config = plug.GetConfigObject();
+                            break;
+                        }
+
+                        typeInterface = null;
+                    }
+                }
+            }
+            pluginAssembly = null;
+            return config;
+        }
+
+        public void CheckSims(object sender, ElapsedEventArgs e)
+        {
+            /*
+            foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values)
+            {
+                string SimResponse = "";
+                try
+                {
+                    WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/");
+                    CheckSim.Method = "GET";
+                    CheckSim.ContentType = "text/plaintext";
+                    CheckSim.ContentLength = 0;
+
+                    StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII);
+                    stOut.Write("");
+                    stOut.Close();
+
+                    StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream());
+                    SimResponse = stIn.ReadToEnd();
+                    stIn.Close();
+                }
+                catch
+                {
+                }
+                
+                if (SimResponse == "OK")
+                {
+                    m_simProfileManager.SimProfiles[sim.UUID].online = true;
+                }
+                else
+                {
+                    m_simProfileManager.SimProfiles[sim.UUID].online = false;
+                }
+            }
+            */
+        }
+
+        public void RunCmd(string cmd, string[] cmdparams)
+        {
+            switch (cmd)
+            {
+                case "help":
+                    m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
+                    break;
+
+                case "shutdown":
+                    m_console.Close();
+                    Environment.Exit(0);
+                    break;
+            }
+        }
+
+        public void Show(string ShowWhat)
+        {
+        }
+
+        private void ConfigDB(IGenericConfig configData)
+        {
+            try
+            {
+                string attri = "";
+                attri = configData.GetAttribute("DataBaseProvider");
+                if (attri == "")
+                {
+                    GridDll = "OpenGrid.Framework.Data.DB4o.dll";
+                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
+                }
+                else
+                {
+                    GridDll = attri;
+                }
+                configData.Commit();
+            }
+            catch (Exception e)
+            {
+
+            }
+        }
+    }
+}
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
new file mode 100644
index 0000000..424072e
--- /dev/null
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
@@ -0,0 +1,134 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{60FCC3A6-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Grid.GridServer</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Grid.GridServer</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework" >
+      <HintPath>OpenSim.Framework.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Console" >
+      <HintPath>OpenSim.Framework.Console.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
+      <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Servers" >
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Framework.Manager\OpenSim.Grid.Framework.Manager.csproj">
+      <Name>OpenSim.Grid.Framework.Manager</Name>
+      <Project>{4B7BFD1C-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GridManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Main.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj.user b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..303dddf
--- /dev/null
+++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
@@ -0,0 +1,60 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OGS-GridServer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OGS-GridServer")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
new file mode 100644
index 0000000..9ca9b5e
--- /dev/null
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -0,0 +1,125 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using OpenGrid.Framework.Data;
+using libsecondlife;
+using System.Reflection;
+
+using System.Xml;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+
+using System.Security.Cryptography;
+
+namespace OpenGridServices.InventoryServer
+{
+    class InventoryManager
+    {
+        Dictionary<string, IInventoryData> _plugins = new Dictionary<string, IInventoryData>();
+
+        /// <summary>
+        /// Adds a new inventory server plugin - user servers will be requested in the order they were loaded.
+        /// </summary>
+        /// <param name="FileName">The filename to the inventory server plugin DLL</param>
+        public void AddPlugin(string FileName)
+        {
+            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Invenstorage: Attempting to load " + FileName);
+            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+
+            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Invenstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (!pluginType.IsAbstract)
+                {
+                    Type typeInterface = pluginType.GetInterface("IInventoryData", true);
+
+                    if (typeInterface != null)
+                    {
+                        IInventoryData plug = (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        plug.Initialise();
+                        this._plugins.Add(plug.getName(), plug);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Invenstorage: Added IUserData Interface");
+                    }
+
+                    typeInterface = null;
+                }
+            }
+
+            pluginAssembly = null;
+        }
+
+        public List<InventoryFolderBase> getRootFolders(LLUUID user)
+        {
+            foreach (KeyValuePair<string, IInventoryData> kvp in _plugins)
+            {
+                try
+                {
+                    return kvp.Value.getUserRootFolders(user);
+                }
+                catch (Exception e)
+                {
+                    OpenSim.Framework.Console.MainConsole.Instance.Notice("Unable to get root folders via " + kvp.Key + " (" + e.ToString() + ")");
+                }
+            }
+            return null;
+        }
+
+        public XmlRpcResponse XmlRpcInventoryRequest(XmlRpcRequest request)
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            Hashtable responseData = new Hashtable();
+
+            // Stuff happens here
+
+            if (requestData.ContainsKey("Access-type"))
+            {
+                if (requestData["access-type"] == "rootfolders")
+                {
+//                    responseData["rootfolders"] =
+                }
+            }
+            else
+            {
+                responseData["error"] = "No access-type specified.";
+            }
+
+
+            // Stuff stops happening here
+
+            response.Value = responseData;
+            return response;
+        }
+    }
+}
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
new file mode 100644
index 0000000..f479a79
--- /dev/null
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -0,0 +1,87 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.IO;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework.User;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Console;
+using OpenSim.Servers;
+using OpenSim.Framework.Utilities;
+
+namespace OpenGridServices.InventoryServer
+{
+    public class OpenInventory_Main : BaseServer, conscmd_callback
+    {
+        ConsoleBase m_console;
+        InventoryManager m_inventoryManager;
+
+        public static void Main(string[] args)
+        {
+        }
+
+        public OpenInventory_Main()
+        {
+            m_console = new ConsoleBase("opengrid-inventory-console.log", "OpenInventory", this, false);
+            MainConsole.Instance = m_console;
+        }
+
+        public void Startup()
+        {
+            MainConsole.Instance.Notice("Initialising inventory manager...");
+            m_inventoryManager = new InventoryManager();
+
+            MainConsole.Instance.Notice("Starting HTTP server");
+            BaseHttpServer httpServer = new BaseHttpServer(8004);
+
+            httpServer.AddXmlRPCHandler("rootfolders", m_inventoryManager.XmlRpcInventoryRequest);
+            //httpServer.AddRestHandler("GET","/rootfolders/",Rest
+        }
+
+        public void RunCmd(string cmd, string[] cmdparams)
+        {
+            switch (cmd)
+            {
+                case "shutdown":
+                    m_console.Close();
+                    Environment.Exit(0);
+                    break;
+            }
+        }
+
+        public void Show(string ShowWhat)
+        {
+        }
+    }
+}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager.mds b/OpenSim/Grid/Manager/OpenGridServices.Manager.mds
new file mode 100644
index 0000000..ed7bc24
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager.mds
@@ -0,0 +1,16 @@
+<Combine name="OpenGridServices.Manager" fileversion="2.0" outputpath="../../mono-1.2.3.1/lib/monodevelop/bin" MakePkgConfig="False" MakeLibPC="True">
+  <Configurations active="Debug">
+    <Configuration name="Debug" ctype="CombineConfiguration">
+      <Entry build="True" name="OpenGridServices.Manager" configuration="Debug" />
+    </Configuration>
+    <Configuration name="Release" ctype="CombineConfiguration">
+      <Entry build="True" name="OpenGridServices.Manager" configuration="Release" />
+    </Configuration>
+  </Configurations>
+  <StartMode startupentry="OpenGridServices.Manager" single="True">
+    <Execute type="None" entry="OpenGridServices.Manager" />
+  </StartMode>
+  <Entries>
+    <Entry filename="./OpenGridServices.Manager/OpenGridServices.Manager.mdp" />
+  </Entries>
+</Combine>
\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs b/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs
new file mode 100644
index 0000000..f221509
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<UserCombinePreferences filename="/home/gareth/OpenGridServices.Manager/OpenGridServices.Manager.mds">
+  <Files>
+    <File filename="Welcome" />
+    <File filename="./OpenGridServices.Manager/MainWindow.cs" />
+    <File filename="./OpenGridServices.Manager/ConnectToGridServerDialog.cs" />
+    <File filename="./OpenGridServices.Manager/Main.cs" />
+  </Files>
+  <Views>
+    <ViewMemento Id="MonoDevelop.Ide.Gui.Pads.ProjectPad">
+      <TreeView>
+        <Node expanded="True">
+          <Node name="OpenGridServices.Manager" expanded="True">
+            <Node name="References" expanded="True" />
+            <Node name="Resources" expanded="True" />
+            <Node name="UserInterface" expanded="True" />
+            <Node name="ConnectToGridServerDialog.cs" expanded="False" selected="True" />
+          </Node>
+        </Node>
+      </TreeView>
+    </ViewMemento>
+    <ViewMemento Id="MonoDevelop.Ide.Gui.Pads.ClassPad">
+      <TreeView>
+        <Node expanded="True" />
+      </TreeView>
+    </ViewMemento>
+    <ViewMemento Id="MonoDevelop.NUnit.TestPad">
+      <TreeView>
+        <Node expanded="False" />
+      </TreeView>
+    </ViewMemento>
+  </Views>
+  <Properties>
+    <Properties>
+      <Property key="ActiveConfiguration" value="Debug" />
+      <Property key="ActiveWindow" value="/home/gareth/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs" />
+    </Properties>
+  </Properties>
+</UserCombinePreferences>
\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks b/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks
new file mode 100644
index 0000000..d887d0e
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ArrayOfUserTask xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
new file mode 100644
index 0000000..af4e275
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
@@ -0,0 +1,32 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes specify the key for the sign of your assembly. See the
+// .NET Framework documentation for more information about signing.
+// This is not required, if you don't want signing let these attributes like they're.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs
new file mode 100644
index 0000000..83685fc
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Threading;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenGridServices.Manager
+{
+    public class BlockingQueue<T>
+    {
+        private Queue<T> _queue = new Queue<T>();
+        private object _queueSync = new object();
+
+        public void Enqueue(T value)
+        {
+            lock (_queueSync)
+            {
+                _queue.Enqueue(value);
+                Monitor.Pulse(_queueSync);
+            }
+        }
+
+        public T Dequeue()
+        {
+            lock (_queueSync)
+            {
+                if (_queue.Count < 1)
+                    Monitor.Wait(_queueSync);
+
+                return _queue.Dequeue();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Connect to grid server.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Connect to grid server.cs
new file mode 100644
index 0000000..0d509ef
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Connect to grid server.cs	
@@ -0,0 +1,16 @@
+
+using System;
+
+namespace OpenGridServices.Manager
+{
+	
+	
+	public partial class Connect to grid server : Gtk.Dialog
+	{
+		
+		public Connect to grid server()
+		{
+			this.Build();
+		}
+	}
+}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
new file mode 100644
index 0000000..8a80b1d
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
@@ -0,0 +1,29 @@
+using Gtk;
+using System;
+
+namespace OpenGridServices.Manager {
+	public partial class ConnectToGridServerDialog : Gtk.Dialog
+	{
+		
+		public ConnectToGridServerDialog()
+		{
+			this.Build();
+		}
+
+		protected virtual void OnResponse(object o, Gtk.ResponseArgs args)
+		{
+			switch(args.ResponseId) {
+				case Gtk.ResponseType.Ok:
+					MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text);
+				break;
+				
+				case Gtk.ResponseType.Cancel:
+				break;
+			}
+			this.Hide();
+			
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
new file mode 100644
index 0000000..6b632d6
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
@@ -0,0 +1,106 @@
+using Nwc.XmlRpc;
+using System;
+using System.Net;
+using System.IO;
+using System.Xml;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+
+namespace OpenGridServices.Manager
+{
+	public class GridServerConnectionManager
+	{
+		private string ServerURL;
+		public LLUUID SessionID;
+		public bool connected=false;
+		
+		public RegionBlock[][] WorldMap;
+		
+		public bool Connect(string GridServerURL, string username, string password)
+		{
+			try {
+				this.ServerURL=GridServerURL;
+				Hashtable LoginParamsHT = new Hashtable();
+				LoginParamsHT["username"]=username;
+				LoginParamsHT["password"]=password;
+				ArrayList LoginParams = new ArrayList();
+				LoginParams.Add(LoginParamsHT);
+				XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams);
+				XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000);
+				if(GridResp.IsFault) {
+					connected=false;
+					return false;
+				} else {
+					Hashtable gridrespData = (Hashtable)GridResp.Value;
+					this.SessionID = new LLUUID((string)gridrespData["session_id"]);
+					connected=true;
+					return true;
+				}
+			} catch(Exception e) {
+				Console.WriteLine(e.ToString());
+				connected=false;
+				return false;
+			}
+		}
+		
+		public void DownloadMap()
+		{
+			System.Net.WebClient mapdownloader = new WebClient();
+			Stream regionliststream = mapdownloader.OpenRead(ServerURL + "/regionlist");
+			
+			RegionBlock TempRegionData;
+			
+			XmlDocument doc = new XmlDocument();
+            doc.Load(regionliststream);
+            regionliststream.Close();
+            XmlNode rootnode = doc.FirstChild;
+            if (rootnode.Name != "regions")
+            {
+				// TODO - ERROR!
+            }
+
+            for(int i=0; i<=rootnode.ChildNodes.Count; i++)
+            {
+                if(rootnode.ChildNodes.Item(i).Name != "region") {
+                	// TODO - ERROR!
+                } else {
+					TempRegionData = new RegionBlock();
+
+					
+                }
+			}
+		}
+		
+		public bool RestartServer()
+		{
+			return true;
+		}
+		
+		public bool ShutdownServer()
+		{
+			try {
+				Hashtable ShutdownParamsHT = new Hashtable();
+				ArrayList ShutdownParams = new ArrayList();
+				ShutdownParamsHT["session_id"]=this.SessionID.ToString();
+				ShutdownParams.Add(ShutdownParamsHT);
+				XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams);
+				XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL,3000);
+				if(GridResp.IsFault) {
+					return false;
+				} else {
+					connected=false;
+					return true;
+				}
+			} catch(Exception e) {
+				Console.WriteLine(e.ToString());
+				return false;
+			}
+		}
+	
+		public void DisconnectServer()
+		{
+			this.connected=false;
+		}
+	}
+}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
new file mode 100644
index 0000000..42e09e0
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
@@ -0,0 +1,96 @@
+// project created on 5/14/2007 at 2:04 PM
+using System;
+using System.Threading;
+using Gtk;
+
+namespace OpenGridServices.Manager
+{
+	class MainClass
+	{
+
+		public static bool QuitReq=false;
+		public static BlockingQueue<string> PendingOperations = new BlockingQueue<string>();
+
+		private static Thread OperationsRunner;
+		
+		private static GridServerConnectionManager gridserverConn;
+		
+		private static MainWindow win;
+
+		public static void DoMainLoop()
+		{
+			while(!QuitReq)
+			{
+				Application.RunIteration();
+			}
+		}
+
+		public static void RunOperations()
+		{
+			string operation;
+			string cmd;
+			char[] sep = new char[1];
+			sep[0]=' ';
+			while(!QuitReq)
+			{
+				operation=PendingOperations.Dequeue();
+				Console.WriteLine(operation);
+				cmd = operation.Split(sep)[0];
+				switch(cmd) {
+					case "connect_to_gridserver":
+						win.SetStatus("Connecting to grid server...");						
+						if(gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3])) {
+							win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID);
+							win.SetGridServerConnected(true);
+							Thread.Sleep(3000);
+							win.SetStatus("Downloading region maps...");
+							gridserverConn.DownloadMap();
+						} else {
+							win.SetStatus("Could not connect");
+						}
+					break;
+					
+					case "restart_gridserver":
+						win.SetStatus("Restarting grid server...");
+						if(gridserverConn.RestartServer()) {
+							win.SetStatus("Restarted server OK");
+							Thread.Sleep(3000);
+							win.SetStatus("");
+						} else {
+							win.SetStatus("Error restarting grid server!!!");
+						}
+					break;
+					
+					case "shutdown_gridserver":
+						win.SetStatus("Shutting down grid server...");
+						if(gridserverConn.ShutdownServer()) {
+							win.SetStatus("Grid server shutdown");
+							win.SetGridServerConnected(false);
+							Thread.Sleep(3000);
+							win.SetStatus("");
+						} else {
+							win.SetStatus("Could not shutdown grid server!!!");
+						}
+					break;
+					
+					case "disconnect_gridserver":
+						gridserverConn.DisconnectServer();
+						win.SetGridServerConnected(false);
+					break;
+				}
+			}
+		}
+
+		public static void Main (string[] args)
+		{
+			gridserverConn = new GridServerConnectionManager();
+			Application.Init ();
+			win = new MainWindow ();
+			win.Show ();
+			OperationsRunner = new Thread(new ThreadStart(RunOperations));
+			OperationsRunner.IsBackground=true;
+			OperationsRunner.Start();
+			DoMainLoop();
+		}
+	}
+}
\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs
new file mode 100644
index 0000000..1db38f0
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs
@@ -0,0 +1,76 @@
+using System;
+using Gtk;
+
+namespace OpenGridServices.Manager {
+	public partial class MainWindow: Gtk.Window
+	{	
+		public MainWindow (): base (Gtk.WindowType.Toplevel)
+		{
+			Build ();
+		}
+		
+		public void SetStatus(string statustext)
+		{
+			this.statusbar1.Pop(0);
+			this.statusbar1.Push(0,statustext);
+		}
+
+		public void DrawGrid(RegionBlock[][] regions)
+		{
+			for(int x=0; x<=regions.GetUpperBound(0); x++) {
+			 for(int y=0; y<=regions.GetUpperBound(1); y++) {
+				Gdk.Image themap = new Gdk.Image(Gdk.ImageType.Fastest,Gdk.Visual.System,256,256);
+				this.drawingarea1.GdkWindow.DrawImage(new Gdk.GC(this.drawingarea1.GdkWindow),themap,0,0,x*256,y*256,256,256);
+			 }
+			}
+		}
+		
+		public void SetGridServerConnected(bool connected)
+		{
+			if(connected) {
+				this.ConnectToGridserver.Visible=false;
+				this.DisconnectFromGridServer.Visible=true;
+			} else {
+				this.ConnectToGridserver.Visible=true;
+				this.DisconnectFromGridServer.Visible=false;
+			}
+		}
+		
+		protected void OnDeleteEvent (object sender, DeleteEventArgs a)
+		{
+			Application.Quit ();
+			MainClass.QuitReq=true;
+			a.RetVal = true;
+		}
+	
+		protected virtual void QuitMenu(object sender, System.EventArgs e)
+		{
+			MainClass.QuitReq=true;
+			Application.Quit();
+		}
+	
+		protected virtual void ConnectToGridServerMenu(object sender, System.EventArgs e)
+		{
+			ConnectToGridServerDialog griddialog = new ConnectToGridServerDialog ();
+			griddialog.Show();
+		}
+
+		protected virtual void RestartGridserverMenu(object sender, System.EventArgs e)
+		{
+			MainClass.PendingOperations.Enqueue("restart_gridserver");
+		}
+
+		protected virtual void ShutdownGridserverMenu(object sender, System.EventArgs e)
+		{
+			MainClass.PendingOperations.Enqueue("shutdown_gridserver");
+		}
+
+		protected virtual void DisconnectGridServerMenu(object sender, System.EventArgs e)
+		{
+			MainClass.PendingOperations.Enqueue("disconnect_gridserver");
+		}
+
+	}
+}
+
+	
\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
new file mode 100644
index 0000000..cfdc085
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
@@ -0,0 +1,43 @@
+<Project name="OpenGridServices.Manager" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+  <Configurations active="Debug">
+    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+      <Output directory="./bin/Debug" assembly="OpenGridServices.Manager" />
+      <Build debugmode="True" target="Exe" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+    <Configuration name="Release" ctype="DotNetProjectConfiguration">
+      <Output directory="./bin/Release" assembly="OpenGridServices.Manager" />
+      <Build debugmode="False" target="Exe" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+  </Configurations>
+  <Contents>
+    <File name="./gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="./gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
+    <File name="./MainWindow.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Main.cs" subtype="Code" buildaction="Compile" />
+    <File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
+    <File name="./ConnectToGridServerDialog.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Util.cs" subtype="Code" buildaction="Compile" />
+    <File name="./gtk-gui/OpenGridServices.Manager.MainWindow.cs" subtype="Code" buildaction="Compile" />
+    <File name="./BlockingQueue.cs" subtype="Code" buildaction="Compile" />
+    <File name="./gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs" subtype="Code" buildaction="Compile" />
+    <File name="./GridServerConnectionManager.cs" subtype="Code" buildaction="Compile" />
+    <File name="./RegionBlock.cs" subtype="Code" buildaction="Compile" />
+  </Contents>
+  <References>
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../../bin/libsecondlife.dll" />
+    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../../bin/XMLRPC.dll" />
+    <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  </References>
+  <GtkDesignInfo partialTypes="True" />
+</Project>
\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
new file mode 100644
index 0000000..44e7a61
Binary files /dev/null and b/OpenSim/Grid/Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb differ
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs
new file mode 100644
index 0000000..00f7c65
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Xml;
+using libsecondlife;
+using OpenSim.Framework.Utilities;
+
+namespace OpenGridServices.Manager
+{
+	
+	
+	public class RegionBlock
+	{
+		public uint regloc_x;
+		public uint regloc_y;
+		
+		public string httpd_url;
+		
+		public string region_name;
+		
+		public ulong regionhandle {
+			get {  return Util.UIntsToLong(regloc_x*256,regloc_y*256); }
+		}
+
+		public Gdk.Pixbuf MiniMap;
+						
+		public RegionBlock()
+		{
+		}
+
+		public void LoadFromXmlNode(XmlNode sourcenode)
+		{
+			this.regloc_x=Convert.ToUInt32(sourcenode.Attributes.GetNamedItem("loc_x").Value);
+			this.regloc_y=Convert.ToUInt32(sourcenode.Attributes.GetNamedItem("loc_y").Value);
+			this.region_name=sourcenode.Attributes.GetNamedItem("region_name").Value;
+			this.httpd_url=sourcenode.Attributes.GetNamedItem("httpd_url").Value;
+		}
+	}
+}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
new file mode 100644
index 0000000..5bf7ff9
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim.Framework.Utilities
+{
+    public class Util
+    {
+        private static Random randomClass = new Random();
+        private static uint nextXferID = 5000;
+        private static object XferLock = new object();
+
+        public static ulong UIntsToLong(uint X, uint Y)
+        {
+            return Helpers.UIntsToLong(X, Y);
+        }
+
+        public static Random RandomClass
+        {
+            get
+            {
+                return randomClass;
+            }
+        }
+
+        public static uint GetNextXferID()
+        {
+            uint id = 0;
+            lock(XferLock)
+            {
+                id = nextXferID;
+                nextXferID++;
+            }
+            return id;
+        }
+
+        //public static int fast_distance2d(int x, int y)
+        //{
+        //    x = System.Math.Abs(x);
+        //    y = System.Math.Abs(y);
+
+        //    int min = System.Math.Min(x, y);
+
+        //    return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
+        //}
+
+        public static string FieldToString(byte[] bytes)
+        {
+            return FieldToString(bytes, String.Empty);
+        }
+
+        /// <summary>
+        /// Convert a variable length field (byte array) to a string, with a
+        /// field name prepended to each line of the output
+        /// </summary>
+        /// <remarks>If the byte array has unprintable characters in it, a 
+        /// hex dump will be put in the string instead</remarks>
+        /// <param name="bytes">The byte array to convert to a string</param>
+        /// <param name="fieldName">A field name to prepend to each line of output</param>
+        /// <returns>An ASCII string or a string containing a hex dump, minus 
+        /// the null terminator</returns>
+        public static string FieldToString(byte[] bytes, string fieldName)
+        {
+            // Check for a common case
+            if (bytes.Length == 0) return String.Empty;
+
+            StringBuilder output = new StringBuilder();
+            bool printable = true;
+
+            for (int i = 0; i < bytes.Length; ++i)
+            {
+                // Check if there are any unprintable characters in the array
+                if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09
+                    && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)
+                {
+                    printable = false;
+                    break;
+                }
+            }
+
+            if (printable)
+            {
+                if (fieldName.Length > 0)
+                {
+                    output.Append(fieldName);
+                    output.Append(": ");
+                }
+
+                if (bytes[bytes.Length - 1] == 0x00)
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));
+                else
+                    output.Append(UTF8Encoding.UTF8.GetString(bytes));
+            }
+            else
+            {
+                for (int i = 0; i < bytes.Length; i += 16)
+                {
+                    if (i != 0)
+                        output.Append(Environment.NewLine);
+                    if (fieldName.Length > 0)
+                    {
+                        output.Append(fieldName);
+                        output.Append(": ");
+                    }
+
+                    for (int j = 0; j < 16; j++)
+                    {
+                        if ((i + j) < bytes.Length)
+                            output.Append(String.Format("{0:X2} ", bytes[i + j]));
+                        else
+                            output.Append("   ");
+                    }
+
+                    for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
+                    {
+                        if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
+                            output.Append((char)bytes[i + j]);
+                        else
+                            output.Append(".");
+                    }
+                }
+            }
+
+            return output.ToString();
+        }
+        public Util()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
new file mode 100644
index 0000000..da6739e
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
@@ -0,0 +1,226 @@
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+namespace OpenGridServices.Manager {
+    
+    
+    public partial class ConnectToGridServerDialog {
+        
+        private Gtk.VBox vbox2;
+        
+        private Gtk.VBox vbox3;
+        
+        private Gtk.HBox hbox1;
+        
+        private Gtk.Label label1;
+        
+        private Gtk.Entry entry1;
+        
+        private Gtk.HBox hbox2;
+        
+        private Gtk.Label label2;
+        
+        private Gtk.Entry entry2;
+        
+        private Gtk.HBox hbox3;
+        
+        private Gtk.Label label3;
+        
+        private Gtk.Entry entry3;
+        
+        private Gtk.Button button2;
+        
+        private Gtk.Button button8;
+        
+        protected virtual void Build() {
+            Stetic.Gui.Initialize();
+            // Widget OpenGridServices.Manager.ConnectToGridServerDialog
+            this.Events = ((Gdk.EventMask)(256));
+            this.Name = "OpenGridServices.Manager.ConnectToGridServerDialog";
+            this.Title = Mono.Unix.Catalog.GetString("Connect to Grid server");
+            this.WindowPosition = ((Gtk.WindowPosition)(4));
+            this.HasSeparator = false;
+            // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.VBox
+            Gtk.VBox w1 = this.VBox;
+            w1.Events = ((Gdk.EventMask)(256));
+            w1.Name = "dialog_VBox";
+            w1.BorderWidth = ((uint)(2));
+            // Container child dialog_VBox.Gtk.Box+BoxChild
+            this.vbox2 = new Gtk.VBox();
+            this.vbox2.Name = "vbox2";
+            // Container child vbox2.Gtk.Box+BoxChild
+            this.vbox3 = new Gtk.VBox();
+            this.vbox3.Name = "vbox3";
+            // Container child vbox3.Gtk.Box+BoxChild
+            this.hbox1 = new Gtk.HBox();
+            this.hbox1.Name = "hbox1";
+            // Container child hbox1.Gtk.Box+BoxChild
+            this.label1 = new Gtk.Label();
+            this.label1.Name = "label1";
+            this.label1.Xalign = 1F;
+            this.label1.LabelProp = Mono.Unix.Catalog.GetString("Grid server URL: ");
+            this.label1.Justify = ((Gtk.Justification)(1));
+            this.hbox1.Add(this.label1);
+            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.label1]));
+            w2.Position = 0;
+            // Container child hbox1.Gtk.Box+BoxChild
+            this.entry1 = new Gtk.Entry();
+            this.entry1.CanFocus = true;
+            this.entry1.Name = "entry1";
+            this.entry1.Text = Mono.Unix.Catalog.GetString("http://gridserver:8001");
+            this.entry1.IsEditable = true;
+            this.entry1.MaxLength = 255;
+            this.entry1.InvisibleChar = '•';
+            this.hbox1.Add(this.entry1);
+            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox1[this.entry1]));
+            w3.Position = 1;
+            this.vbox3.Add(this.hbox1);
+            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox1]));
+            w4.Position = 0;
+            w4.Expand = false;
+            w4.Fill = false;
+            // Container child vbox3.Gtk.Box+BoxChild
+            this.hbox2 = new Gtk.HBox();
+            this.hbox2.Name = "hbox2";
+            // Container child hbox2.Gtk.Box+BoxChild
+            this.label2 = new Gtk.Label();
+            this.label2.Name = "label2";
+            this.label2.Xalign = 1F;
+            this.label2.LabelProp = Mono.Unix.Catalog.GetString("Username:");
+            this.label2.Justify = ((Gtk.Justification)(1));
+            this.hbox2.Add(this.label2);
+            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox2[this.label2]));
+            w5.Position = 0;
+            // Container child hbox2.Gtk.Box+BoxChild
+            this.entry2 = new Gtk.Entry();
+            this.entry2.CanFocus = true;
+            this.entry2.Name = "entry2";
+            this.entry2.IsEditable = true;
+            this.entry2.InvisibleChar = '•';
+            this.hbox2.Add(this.entry2);
+            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox2[this.entry2]));
+            w6.Position = 1;
+            this.vbox3.Add(this.hbox2);
+            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox2]));
+            w7.Position = 1;
+            w7.Expand = false;
+            w7.Fill = false;
+            // Container child vbox3.Gtk.Box+BoxChild
+            this.hbox3 = new Gtk.HBox();
+            this.hbox3.Name = "hbox3";
+            // Container child hbox3.Gtk.Box+BoxChild
+            this.label3 = new Gtk.Label();
+            this.label3.Name = "label3";
+            this.label3.Xalign = 1F;
+            this.label3.LabelProp = Mono.Unix.Catalog.GetString("Password:");
+            this.label3.Justify = ((Gtk.Justification)(1));
+            this.hbox3.Add(this.label3);
+            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox3[this.label3]));
+            w8.Position = 0;
+            // Container child hbox3.Gtk.Box+BoxChild
+            this.entry3 = new Gtk.Entry();
+            this.entry3.CanFocus = true;
+            this.entry3.Name = "entry3";
+            this.entry3.IsEditable = true;
+            this.entry3.InvisibleChar = '•';
+            this.hbox3.Add(this.entry3);
+            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.hbox3[this.entry3]));
+            w9.Position = 1;
+            this.vbox3.Add(this.hbox3);
+            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox3]));
+            w10.Position = 2;
+            w10.Expand = false;
+            w10.Fill = false;
+            this.vbox2.Add(this.vbox3);
+            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox2[this.vbox3]));
+            w11.Position = 2;
+            w11.Expand = false;
+            w11.Fill = false;
+            w1.Add(this.vbox2);
+            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
+            w12.Position = 0;
+            // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.ActionArea
+            Gtk.HButtonBox w13 = this.ActionArea;
+            w13.Events = ((Gdk.EventMask)(256));
+            w13.Name = "OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea";
+            w13.Spacing = 6;
+            w13.BorderWidth = ((uint)(5));
+            w13.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
+            // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+            this.button2 = new Gtk.Button();
+            this.button2.CanDefault = true;
+            this.button2.CanFocus = true;
+            this.button2.Name = "button2";
+            this.button2.UseUnderline = true;
+            // Container child button2.Gtk.Container+ContainerChild
+            Gtk.Alignment w14 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
+            w14.Name = "GtkAlignment";
+            // Container child GtkAlignment.Gtk.Container+ContainerChild
+            Gtk.HBox w15 = new Gtk.HBox();
+            w15.Name = "GtkHBox";
+            w15.Spacing = 2;
+            // Container child GtkHBox.Gtk.Container+ContainerChild
+            Gtk.Image w16 = new Gtk.Image();
+            w16.Name = "image1";
+            w16.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-apply", 16, 0);
+            w15.Add(w16);
+            // Container child GtkHBox.Gtk.Container+ContainerChild
+            Gtk.Label w18 = new Gtk.Label();
+            w18.Name = "GtkLabel";
+            w18.LabelProp = Mono.Unix.Catalog.GetString("Connect");
+            w18.UseUnderline = true;
+            w15.Add(w18);
+            w14.Add(w15);
+            this.button2.Add(w14);
+            this.AddActionWidget(this.button2, -5);
+            Gtk.ButtonBox.ButtonBoxChild w22 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button2]));
+            w22.Expand = false;
+            w22.Fill = false;
+            // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+            this.button8 = new Gtk.Button();
+            this.button8.CanDefault = true;
+            this.button8.CanFocus = true;
+            this.button8.Name = "button8";
+            this.button8.UseUnderline = true;
+            // Container child button8.Gtk.Container+ContainerChild
+            Gtk.Alignment w23 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
+            w23.Name = "GtkAlignment1";
+            // Container child GtkAlignment1.Gtk.Container+ContainerChild
+            Gtk.HBox w24 = new Gtk.HBox();
+            w24.Name = "GtkHBox1";
+            w24.Spacing = 2;
+            // Container child GtkHBox1.Gtk.Container+ContainerChild
+            Gtk.Image w25 = new Gtk.Image();
+            w25.Name = "image2";
+            w25.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-cancel", 16, 0);
+            w24.Add(w25);
+            // Container child GtkHBox1.Gtk.Container+ContainerChild
+            Gtk.Label w27 = new Gtk.Label();
+            w27.Name = "GtkLabel1";
+            w27.LabelProp = Mono.Unix.Catalog.GetString("Cancel");
+            w27.UseUnderline = true;
+            w24.Add(w27);
+            w23.Add(w24);
+            this.button8.Add(w23);
+            this.AddActionWidget(this.button8, -6);
+            Gtk.ButtonBox.ButtonBoxChild w31 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button8]));
+            w31.Position = 1;
+            w31.Expand = false;
+            w31.Fill = false;
+            if ((this.Child != null)) {
+                this.Child.ShowAll();
+            }
+            this.DefaultWidth = 476;
+            this.DefaultHeight = 137;
+            this.Show();
+            this.Response += new Gtk.ResponseHandler(this.OnResponse);
+        }
+    }
+}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
new file mode 100644
index 0000000..8798dac
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
@@ -0,0 +1,256 @@
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+namespace OpenGridServices.Manager {
+    
+    
+    public partial class MainWindow {
+        
+        private Gtk.Action Grid;
+        
+        private Gtk.Action User;
+        
+        private Gtk.Action Asset;
+        
+        private Gtk.Action Region;
+        
+        private Gtk.Action Services;
+        
+        private Gtk.Action ConnectToGridserver;
+        
+        private Gtk.Action RestartWholeGrid;
+        
+        private Gtk.Action ShutdownWholeGrid;
+        
+        private Gtk.Action ExitGridManager;
+        
+        private Gtk.Action ConnectToUserserver;
+        
+        private Gtk.Action AccountManagment;
+        
+        private Gtk.Action GlobalNotice;
+        
+        private Gtk.Action DisableAllLogins;
+        
+        private Gtk.Action DisableNonGodUsersOnly;
+        
+        private Gtk.Action ShutdownUserServer;
+        
+        private Gtk.Action ShutdownGridserverOnly;
+        
+        private Gtk.Action RestartGridserverOnly;
+        
+        private Gtk.Action DefaultLocalGridUserserver;
+        
+        private Gtk.Action CustomUserserver;
+        
+        private Gtk.Action RemoteGridDefaultUserserver;
+        
+        private Gtk.Action DisconnectFromGridServer;
+        
+        private Gtk.Action UploadAsset;
+        
+        private Gtk.Action AssetManagement;
+        
+        private Gtk.Action ConnectToAssetServer;
+        
+        private Gtk.Action ConnectToDefaultAssetServerForGrid;
+        
+        private Gtk.Action DefaultForLocalGrid;
+        
+        private Gtk.Action DefaultForRemoteGrid;
+        
+        private Gtk.Action CustomAssetServer;
+        
+        private Gtk.VBox vbox1;
+        
+        private Gtk.MenuBar menubar2;
+        
+        private Gtk.HBox hbox1;
+        
+        private Gtk.ScrolledWindow scrolledwindow1;
+        
+        private Gtk.DrawingArea drawingarea1;
+        
+        private Gtk.TreeView treeview1;
+        
+        private Gtk.Statusbar statusbar1;
+        
+        protected virtual void Build() {
+            Stetic.Gui.Initialize();
+            // Widget OpenGridServices.Manager.MainWindow
+            Gtk.UIManager w1 = new Gtk.UIManager();
+            Gtk.ActionGroup w2 = new Gtk.ActionGroup("Default");
+            this.Grid = new Gtk.Action("Grid", Mono.Unix.Catalog.GetString("Grid"), null, null);
+            this.Grid.HideIfEmpty = false;
+            this.Grid.ShortLabel = Mono.Unix.Catalog.GetString("Grid");
+            w2.Add(this.Grid, "<Alt><Mod2>g");
+            this.User = new Gtk.Action("User", Mono.Unix.Catalog.GetString("User"), null, null);
+            this.User.HideIfEmpty = false;
+            this.User.ShortLabel = Mono.Unix.Catalog.GetString("User");
+            w2.Add(this.User, null);
+            this.Asset = new Gtk.Action("Asset", Mono.Unix.Catalog.GetString("Asset"), null, null);
+            this.Asset.HideIfEmpty = false;
+            this.Asset.ShortLabel = Mono.Unix.Catalog.GetString("Asset");
+            w2.Add(this.Asset, null);
+            this.Region = new Gtk.Action("Region", Mono.Unix.Catalog.GetString("Region"), null, null);
+            this.Region.ShortLabel = Mono.Unix.Catalog.GetString("Region");
+            w2.Add(this.Region, null);
+            this.Services = new Gtk.Action("Services", Mono.Unix.Catalog.GetString("Services"), null, null);
+            this.Services.ShortLabel = Mono.Unix.Catalog.GetString("Services");
+            w2.Add(this.Services, null);
+            this.ConnectToGridserver = new Gtk.Action("ConnectToGridserver", Mono.Unix.Catalog.GetString("Connect to gridserver..."), null, "gtk-connect");
+            this.ConnectToGridserver.HideIfEmpty = false;
+            this.ConnectToGridserver.ShortLabel = Mono.Unix.Catalog.GetString("Connect to gridserver");
+            w2.Add(this.ConnectToGridserver, null);
+            this.RestartWholeGrid = new Gtk.Action("RestartWholeGrid", Mono.Unix.Catalog.GetString("Restart whole grid"), null, "gtk-refresh");
+            this.RestartWholeGrid.ShortLabel = Mono.Unix.Catalog.GetString("Restart whole grid");
+            w2.Add(this.RestartWholeGrid, null);
+            this.ShutdownWholeGrid = new Gtk.Action("ShutdownWholeGrid", Mono.Unix.Catalog.GetString("Shutdown whole grid"), null, "gtk-stop");
+            this.ShutdownWholeGrid.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown whole grid");
+            w2.Add(this.ShutdownWholeGrid, null);
+            this.ExitGridManager = new Gtk.Action("ExitGridManager", Mono.Unix.Catalog.GetString("Exit grid manager"), null, "gtk-close");
+            this.ExitGridManager.ShortLabel = Mono.Unix.Catalog.GetString("Exit grid manager");
+            w2.Add(this.ExitGridManager, null);
+            this.ConnectToUserserver = new Gtk.Action("ConnectToUserserver", Mono.Unix.Catalog.GetString("Connect to userserver"), null, "gtk-connect");
+            this.ConnectToUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Connect to userserver");
+            w2.Add(this.ConnectToUserserver, null);
+            this.AccountManagment = new Gtk.Action("AccountManagment", Mono.Unix.Catalog.GetString("Account managment"), null, "gtk-properties");
+            this.AccountManagment.ShortLabel = Mono.Unix.Catalog.GetString("Account managment");
+            w2.Add(this.AccountManagment, null);
+            this.GlobalNotice = new Gtk.Action("GlobalNotice", Mono.Unix.Catalog.GetString("Global notice"), null, "gtk-network");
+            this.GlobalNotice.ShortLabel = Mono.Unix.Catalog.GetString("Global notice");
+            w2.Add(this.GlobalNotice, null);
+            this.DisableAllLogins = new Gtk.Action("DisableAllLogins", Mono.Unix.Catalog.GetString("Disable all logins"), null, "gtk-no");
+            this.DisableAllLogins.ShortLabel = Mono.Unix.Catalog.GetString("Disable all logins");
+            w2.Add(this.DisableAllLogins, null);
+            this.DisableNonGodUsersOnly = new Gtk.Action("DisableNonGodUsersOnly", Mono.Unix.Catalog.GetString("Disable non-god users only"), null, "gtk-no");
+            this.DisableNonGodUsersOnly.ShortLabel = Mono.Unix.Catalog.GetString("Disable non-god users only");
+            w2.Add(this.DisableNonGodUsersOnly, null);
+            this.ShutdownUserServer = new Gtk.Action("ShutdownUserServer", Mono.Unix.Catalog.GetString("Shutdown user server"), null, "gtk-stop");
+            this.ShutdownUserServer.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown user server");
+            w2.Add(this.ShutdownUserServer, null);
+            this.ShutdownGridserverOnly = new Gtk.Action("ShutdownGridserverOnly", Mono.Unix.Catalog.GetString("Shutdown gridserver only"), null, "gtk-stop");
+            this.ShutdownGridserverOnly.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown gridserver only");
+            w2.Add(this.ShutdownGridserverOnly, null);
+            this.RestartGridserverOnly = new Gtk.Action("RestartGridserverOnly", Mono.Unix.Catalog.GetString("Restart gridserver only"), null, "gtk-refresh");
+            this.RestartGridserverOnly.ShortLabel = Mono.Unix.Catalog.GetString("Restart gridserver only");
+            w2.Add(this.RestartGridserverOnly, null);
+            this.DefaultLocalGridUserserver = new Gtk.Action("DefaultLocalGridUserserver", Mono.Unix.Catalog.GetString("Default local grid userserver"), null, null);
+            this.DefaultLocalGridUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Default local grid userserver");
+            w2.Add(this.DefaultLocalGridUserserver, null);
+            this.CustomUserserver = new Gtk.Action("CustomUserserver", Mono.Unix.Catalog.GetString("Custom userserver..."), null, null);
+            this.CustomUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Custom userserver");
+            w2.Add(this.CustomUserserver, null);
+            this.RemoteGridDefaultUserserver = new Gtk.Action("RemoteGridDefaultUserserver", Mono.Unix.Catalog.GetString("Remote grid default userserver..."), null, null);
+            this.RemoteGridDefaultUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Remote grid default userserver");
+            w2.Add(this.RemoteGridDefaultUserserver, null);
+            this.DisconnectFromGridServer = new Gtk.Action("DisconnectFromGridServer", Mono.Unix.Catalog.GetString("Disconnect from grid server"), null, "gtk-disconnect");
+            this.DisconnectFromGridServer.ShortLabel = Mono.Unix.Catalog.GetString("Disconnect from grid server");
+            this.DisconnectFromGridServer.Visible = false;
+            w2.Add(this.DisconnectFromGridServer, null);
+            this.UploadAsset = new Gtk.Action("UploadAsset", Mono.Unix.Catalog.GetString("Upload asset"), null, null);
+            this.UploadAsset.ShortLabel = Mono.Unix.Catalog.GetString("Upload asset");
+            w2.Add(this.UploadAsset, null);
+            this.AssetManagement = new Gtk.Action("AssetManagement", Mono.Unix.Catalog.GetString("Asset management"), null, null);
+            this.AssetManagement.ShortLabel = Mono.Unix.Catalog.GetString("Asset management");
+            w2.Add(this.AssetManagement, null);
+            this.ConnectToAssetServer = new Gtk.Action("ConnectToAssetServer", Mono.Unix.Catalog.GetString("Connect to asset server"), null, null);
+            this.ConnectToAssetServer.ShortLabel = Mono.Unix.Catalog.GetString("Connect to asset server");
+            w2.Add(this.ConnectToAssetServer, null);
+            this.ConnectToDefaultAssetServerForGrid = new Gtk.Action("ConnectToDefaultAssetServerForGrid", Mono.Unix.Catalog.GetString("Connect to default asset server for grid"), null, null);
+            this.ConnectToDefaultAssetServerForGrid.ShortLabel = Mono.Unix.Catalog.GetString("Connect to default asset server for grid");
+            w2.Add(this.ConnectToDefaultAssetServerForGrid, null);
+            this.DefaultForLocalGrid = new Gtk.Action("DefaultForLocalGrid", Mono.Unix.Catalog.GetString("Default for local grid"), null, null);
+            this.DefaultForLocalGrid.ShortLabel = Mono.Unix.Catalog.GetString("Default for local grid");
+            w2.Add(this.DefaultForLocalGrid, null);
+            this.DefaultForRemoteGrid = new Gtk.Action("DefaultForRemoteGrid", Mono.Unix.Catalog.GetString("Default for remote grid..."), null, null);
+            this.DefaultForRemoteGrid.ShortLabel = Mono.Unix.Catalog.GetString("Default for remote grid...");
+            w2.Add(this.DefaultForRemoteGrid, null);
+            this.CustomAssetServer = new Gtk.Action("CustomAssetServer", Mono.Unix.Catalog.GetString("Custom asset server..."), null, null);
+            this.CustomAssetServer.ShortLabel = Mono.Unix.Catalog.GetString("Custom asset server...");
+            w2.Add(this.CustomAssetServer, null);
+            w1.InsertActionGroup(w2, 0);
+            this.AddAccelGroup(w1.AccelGroup);
+            this.WidthRequest = 800;
+            this.HeightRequest = 600;
+            this.Name = "OpenGridServices.Manager.MainWindow";
+            this.Title = Mono.Unix.Catalog.GetString("Open Grid Services Manager");
+            this.Icon = Gtk.IconTheme.Default.LoadIcon("gtk-network", 48, 0);
+            // Container child OpenGridServices.Manager.MainWindow.Gtk.Container+ContainerChild
+            this.vbox1 = new Gtk.VBox();
+            this.vbox1.Name = "vbox1";
+            // Container child vbox1.Gtk.Box+BoxChild
+            w1.AddUiFromString("<ui><menubar name='menubar2'><menu action='Grid'><menuitem action='ConnectToGridserver'/><menuitem action='DisconnectFromGridServer'/><separator/><menuitem action='RestartWholeGrid'/><menuitem action='RestartGridserverOnly'/><separator/><menuitem action='ShutdownWholeGrid'/><menuitem action='ShutdownGridserverOnly'/><separator/><menuitem action='ExitGridManager'/></menu><menu action='User'><menu action='ConnectToUserserver'><menuitem action='DefaultLocalGridUserserver'/><menuitem action='CustomUserserver'/><menuitem action='RemoteGridDefaultUserserver'/></menu><separator/><menuitem action='AccountManagment'/><menuitem action='GlobalNotice'/><separator/><menuitem action='DisableAllLogins'/><menuitem action='DisableNonGodUsersOnly'/><separator/><menuitem action='ShutdownUserServer'/></menu><menu action='Asset'><menuitem action='UploadAsset'/><menuitem action='AssetManagement'/><menu action='ConnectToAssetServer'><menuitem action='DefaultForLocalGrid'/><menuitem action='DefaultForRemoteGrid'/><menuitem action='CustomAssetServer'/></menu></menu><menu action='Region'/><menu action='Services'/></menubar></ui>");
+            this.menubar2 = ((Gtk.MenuBar)(w1.GetWidget("/menubar2")));
+            this.menubar2.HeightRequest = 25;
+            this.menubar2.Name = "menubar2";
+            this.vbox1.Add(this.menubar2);
+            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.menubar2]));
+            w3.Position = 0;
+            w3.Expand = false;
+            w3.Fill = false;
+            // Container child vbox1.Gtk.Box+BoxChild
+            this.hbox1 = new Gtk.HBox();
+            this.hbox1.Name = "hbox1";
+            // Container child hbox1.Gtk.Box+BoxChild
+            this.scrolledwindow1 = new Gtk.ScrolledWindow();
+            this.scrolledwindow1.CanFocus = true;
+            this.scrolledwindow1.Name = "scrolledwindow1";
+            this.scrolledwindow1.VscrollbarPolicy = ((Gtk.PolicyType)(1));
+            this.scrolledwindow1.HscrollbarPolicy = ((Gtk.PolicyType)(1));
+            // Container child scrolledwindow1.Gtk.Container+ContainerChild
+            Gtk.Viewport w4 = new Gtk.Viewport();
+            w4.Name = "GtkViewport";
+            w4.ShadowType = ((Gtk.ShadowType)(0));
+            // Container child GtkViewport.Gtk.Container+ContainerChild
+            this.drawingarea1 = new Gtk.DrawingArea();
+            this.drawingarea1.Name = "drawingarea1";
+            w4.Add(this.drawingarea1);
+            this.scrolledwindow1.Add(w4);
+            this.hbox1.Add(this.scrolledwindow1);
+            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1]));
+            w7.Position = 1;
+            // Container child hbox1.Gtk.Box+BoxChild
+            this.treeview1 = new Gtk.TreeView();
+            this.treeview1.CanFocus = true;
+            this.treeview1.Name = "treeview1";
+            this.hbox1.Add(this.treeview1);
+            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox1[this.treeview1]));
+            w8.Position = 2;
+            this.vbox1.Add(this.hbox1);
+            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
+            w9.Position = 1;
+            // Container child vbox1.Gtk.Box+BoxChild
+            this.statusbar1 = new Gtk.Statusbar();
+            this.statusbar1.Name = "statusbar1";
+            this.statusbar1.Spacing = 5;
+            this.vbox1.Add(this.statusbar1);
+            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
+            w10.PackType = ((Gtk.PackType)(1));
+            w10.Position = 2;
+            w10.Expand = false;
+            w10.Fill = false;
+            this.Add(this.vbox1);
+            if ((this.Child != null)) {
+                this.Child.ShowAll();
+            }
+            this.DefaultWidth = 800;
+            this.DefaultHeight = 800;
+            this.Show();
+            this.DeleteEvent += new Gtk.DeleteEventHandler(this.OnDeleteEvent);
+            this.ConnectToGridserver.Activated += new System.EventHandler(this.ConnectToGridServerMenu);
+            this.ExitGridManager.Activated += new System.EventHandler(this.QuitMenu);
+            this.ShutdownGridserverOnly.Activated += new System.EventHandler(this.ShutdownGridserverMenu);
+            this.RestartGridserverOnly.Activated += new System.EventHandler(this.RestartGridserverMenu);
+            this.DisconnectFromGridServer.Activated += new System.EventHandler(this.DisconnectGridServerMenu);
+        }
+    }
+}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
new file mode 100644
index 0000000..dd4abdd
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
@@ -0,0 +1,35 @@
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+namespace Stetic {
+    
+    
+    internal class Gui {
+        
+        private static bool initialized;
+        
+        internal static void Initialize() {
+            if ((Stetic.Gui.initialized == false)) {
+                Stetic.Gui.initialized = true;
+            }
+        }
+    }
+    
+    internal class ActionGroups {
+        
+        public static Gtk.ActionGroup GetActionGroup(System.Type type) {
+            return Stetic.ActionGroups.GetActionGroup(type.FullName);
+        }
+        
+        public static Gtk.ActionGroup GetActionGroup(string name) {
+            return null;
+        }
+    }
+}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
new file mode 100644
index 0000000..c883f08
--- /dev/null
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="utf-8"?>
+<stetic-interface>
+  <widget class="Gtk.Window" id="OpenGridServices.Manager.MainWindow" design-size="800 800">
+    <action-group name="Default">
+      <action id="Grid">
+        <property name="Type">Action</property>
+        <property name="Accelerator">&lt;Alt&gt;&lt;Mod2&gt;g</property>
+        <property name="HideIfEmpty">False</property>
+        <property name="Label" translatable="yes">Grid</property>
+        <property name="ShortLabel" translatable="yes">Grid</property>
+      </action>
+      <action id="User">
+        <property name="Type">Action</property>
+        <property name="HideIfEmpty">False</property>
+        <property name="Label" translatable="yes">User</property>
+        <property name="ShortLabel" translatable="yes">User</property>
+      </action>
+      <action id="Asset">
+        <property name="Type">Action</property>
+        <property name="HideIfEmpty">False</property>
+        <property name="Label" translatable="yes">Asset</property>
+        <property name="ShortLabel" translatable="yes">Asset</property>
+      </action>
+      <action id="Region">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Region</property>
+        <property name="ShortLabel" translatable="yes">Region</property>
+      </action>
+      <action id="Services">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Services</property>
+        <property name="ShortLabel" translatable="yes">Services</property>
+      </action>
+      <action id="ConnectToGridserver">
+        <property name="Type">Action</property>
+        <property name="HideIfEmpty">False</property>
+        <property name="Label" translatable="yes">Connect to gridserver...</property>
+        <property name="ShortLabel" translatable="yes">Connect to gridserver</property>
+        <property name="StockId">gtk-connect</property>
+        <signal name="Activated" handler="ConnectToGridServerMenu" />
+      </action>
+      <action id="RestartWholeGrid">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Restart whole grid</property>
+        <property name="ShortLabel" translatable="yes">Restart whole grid</property>
+        <property name="StockId">gtk-refresh</property>
+      </action>
+      <action id="ShutdownWholeGrid">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Shutdown whole grid</property>
+        <property name="ShortLabel" translatable="yes">Shutdown whole grid</property>
+        <property name="StockId">gtk-stop</property>
+      </action>
+      <action id="ExitGridManager">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Exit grid manager</property>
+        <property name="ShortLabel" translatable="yes">Exit grid manager</property>
+        <property name="StockId">gtk-close</property>
+        <signal name="Activated" handler="QuitMenu" after="yes" />
+      </action>
+      <action id="ConnectToUserserver">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Connect to userserver</property>
+        <property name="ShortLabel" translatable="yes">Connect to userserver</property>
+        <property name="StockId">gtk-connect</property>
+      </action>
+      <action id="AccountManagment">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Account managment</property>
+        <property name="ShortLabel" translatable="yes">Account managment</property>
+        <property name="StockId">gtk-properties</property>
+      </action>
+      <action id="GlobalNotice">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Global notice</property>
+        <property name="ShortLabel" translatable="yes">Global notice</property>
+        <property name="StockId">gtk-network</property>
+      </action>
+      <action id="DisableAllLogins">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Disable all logins</property>
+        <property name="ShortLabel" translatable="yes">Disable all logins</property>
+        <property name="StockId">gtk-no</property>
+      </action>
+      <action id="DisableNonGodUsersOnly">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Disable non-god users only</property>
+        <property name="ShortLabel" translatable="yes">Disable non-god users only</property>
+        <property name="StockId">gtk-no</property>
+      </action>
+      <action id="ShutdownUserServer">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Shutdown user server</property>
+        <property name="ShortLabel" translatable="yes">Shutdown user server</property>
+        <property name="StockId">gtk-stop</property>
+      </action>
+      <action id="ShutdownGridserverOnly">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Shutdown gridserver only</property>
+        <property name="ShortLabel" translatable="yes">Shutdown gridserver only</property>
+        <property name="StockId">gtk-stop</property>
+        <signal name="Activated" handler="ShutdownGridserverMenu" after="yes" />
+      </action>
+      <action id="RestartGridserverOnly">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Restart gridserver only</property>
+        <property name="ShortLabel" translatable="yes">Restart gridserver only</property>
+        <property name="StockId">gtk-refresh</property>
+        <signal name="Activated" handler="RestartGridserverMenu" after="yes" />
+      </action>
+      <action id="DefaultLocalGridUserserver">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Default local grid userserver</property>
+        <property name="ShortLabel" translatable="yes">Default local grid userserver</property>
+      </action>
+      <action id="CustomUserserver">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Custom userserver...</property>
+        <property name="ShortLabel" translatable="yes">Custom userserver</property>
+      </action>
+      <action id="RemoteGridDefaultUserserver">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Remote grid default userserver...</property>
+        <property name="ShortLabel" translatable="yes">Remote grid default userserver</property>
+      </action>
+      <action id="DisconnectFromGridServer">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Disconnect from grid server</property>
+        <property name="ShortLabel" translatable="yes">Disconnect from grid server</property>
+        <property name="StockId">gtk-disconnect</property>
+        <property name="Visible">False</property>
+        <signal name="Activated" handler="DisconnectGridServerMenu" after="yes" />
+      </action>
+      <action id="UploadAsset">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Upload asset</property>
+        <property name="ShortLabel" translatable="yes">Upload asset</property>
+      </action>
+      <action id="AssetManagement">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Asset management</property>
+        <property name="ShortLabel" translatable="yes">Asset management</property>
+      </action>
+      <action id="ConnectToAssetServer">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Connect to asset server</property>
+        <property name="ShortLabel" translatable="yes">Connect to asset server</property>
+      </action>
+      <action id="ConnectToDefaultAssetServerForGrid">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Connect to default asset server for grid</property>
+        <property name="ShortLabel" translatable="yes">Connect to default asset server for grid</property>
+      </action>
+      <action id="DefaultForLocalGrid">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Default for local grid</property>
+        <property name="ShortLabel" translatable="yes">Default for local grid</property>
+      </action>
+      <action id="DefaultForRemoteGrid">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Default for remote grid...</property>
+        <property name="ShortLabel" translatable="yes">Default for remote grid...</property>
+      </action>
+      <action id="CustomAssetServer">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes">Custom asset server...</property>
+        <property name="ShortLabel" translatable="yes">Custom asset server...</property>
+      </action>
+    </action-group>
+    <property name="MemberName" />
+    <property name="WidthRequest">800</property>
+    <property name="HeightRequest">600</property>
+    <property name="Title" translatable="yes">Open Grid Services Manager</property>
+    <property name="Icon">stock:gtk-network Dialog</property>
+    <signal name="DeleteEvent" handler="OnDeleteEvent" />
+    <child>
+      <widget class="Gtk.VBox" id="vbox1">
+        <property name="MemberName" />
+        <child>
+          <widget class="Gtk.MenuBar" id="menubar2">
+            <property name="MemberName" />
+            <property name="HeightRequest">25</property>
+            <node name="menubar2" type="Menubar">
+              <node type="Menu" action="Grid">
+                <node type="Menuitem" action="ConnectToGridserver" />
+                <node type="Menuitem" action="DisconnectFromGridServer" />
+                <node type="Separator" />
+                <node type="Menuitem" action="RestartWholeGrid" />
+                <node type="Menuitem" action="RestartGridserverOnly" />
+                <node type="Separator" />
+                <node type="Menuitem" action="ShutdownWholeGrid" />
+                <node type="Menuitem" action="ShutdownGridserverOnly" />
+                <node type="Separator" />
+                <node type="Menuitem" action="ExitGridManager" />
+              </node>
+              <node type="Menu" action="User">
+                <node type="Menu" action="ConnectToUserserver">
+                  <node type="Menuitem" action="DefaultLocalGridUserserver" />
+                  <node type="Menuitem" action="CustomUserserver" />
+                  <node type="Menuitem" action="RemoteGridDefaultUserserver" />
+                </node>
+                <node type="Separator" />
+                <node type="Menuitem" action="AccountManagment" />
+                <node type="Menuitem" action="GlobalNotice" />
+                <node type="Separator" />
+                <node type="Menuitem" action="DisableAllLogins" />
+                <node type="Menuitem" action="DisableNonGodUsersOnly" />
+                <node type="Separator" />
+                <node type="Menuitem" action="ShutdownUserServer" />
+              </node>
+              <node type="Menu" action="Asset">
+                <node type="Menuitem" action="UploadAsset" />
+                <node type="Menuitem" action="AssetManagement" />
+                <node type="Menu" action="ConnectToAssetServer">
+                  <node type="Menuitem" action="DefaultForLocalGrid" />
+                  <node type="Menuitem" action="DefaultForRemoteGrid" />
+                  <node type="Menuitem" action="CustomAssetServer" />
+                </node>
+              </node>
+              <node type="Menu" action="Region" />
+              <node type="Menu" action="Services" />
+            </node>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.HBox" id="hbox1">
+            <property name="MemberName" />
+            <child>
+              <placeholder />
+            </child>
+            <child>
+              <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
+                <property name="MemberName" />
+                <property name="CanFocus">True</property>
+                <property name="VscrollbarPolicy">Automatic</property>
+                <property name="HscrollbarPolicy">Automatic</property>
+                <child>
+                  <widget class="Gtk.Viewport" id="GtkViewport">
+                    <property name="MemberName" />
+                    <property name="ShadowType">None</property>
+                    <child>
+                      <widget class="Gtk.DrawingArea" id="drawingarea1">
+                        <property name="MemberName" />
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+                <property name="AutoSize">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.TreeView" id="treeview1">
+                <property name="MemberName" />
+                <property name="CanFocus">True</property>
+              </widget>
+              <packing>
+                <property name="Position">2</property>
+                <property name="AutoSize">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="AutoSize">True</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Statusbar" id="statusbar1">
+            <property name="MemberName">statusBar1</property>
+            <property name="Spacing">5</property>
+            <child>
+              <placeholder />
+            </child>
+            <child>
+              <placeholder />
+            </child>
+          </widget>
+          <packing>
+            <property name="PackType">End</property>
+            <property name="Position">2</property>
+            <property name="AutoSize">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="Gtk.Dialog" id="OpenGridServices.Manager.ConnectToGridServerDialog" design-size="476 137">
+    <property name="MemberName" />
+    <property name="Events">ButtonPressMask</property>
+    <property name="Title" translatable="yes">Connect to Grid server</property>
+    <property name="WindowPosition">CenterOnParent</property>
+    <property name="Buttons">2</property>
+    <property name="HelpButton">False</property>
+    <property name="HasSeparator">False</property>
+    <signal name="Response" handler="OnResponse" />
+    <child internal-child="VBox">
+      <widget class="Gtk.VBox" id="dialog_VBox">
+        <property name="MemberName" />
+        <property name="Events">ButtonPressMask</property>
+        <property name="BorderWidth">2</property>
+        <child>
+          <widget class="Gtk.VBox" id="vbox2">
+            <property name="MemberName" />
+            <child>
+              <placeholder />
+            </child>
+            <child>
+              <placeholder />
+            </child>
+            <child>
+              <widget class="Gtk.VBox" id="vbox3">
+                <property name="MemberName" />
+                <child>
+                  <widget class="Gtk.HBox" id="hbox1">
+                    <property name="MemberName" />
+                    <child>
+                      <widget class="Gtk.Label" id="label1">
+                        <property name="MemberName" />
+                        <property name="Xalign">1</property>
+                        <property name="LabelProp" translatable="yes">Grid server URL: </property>
+                        <property name="Justify">Right</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Entry" id="entry1">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="Text" translatable="yes">http://gridserver:8001</property>
+                        <property name="IsEditable">True</property>
+                        <property name="MaxLength">255</property>
+                        <property name="InvisibleChar">•</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">0</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox2">
+                    <property name="MemberName" />
+                    <child>
+                      <widget class="Gtk.Label" id="label2">
+                        <property name="MemberName" />
+                        <property name="Xalign">1</property>
+                        <property name="LabelProp" translatable="yes">Username:</property>
+                        <property name="Justify">Right</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Entry" id="entry2">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="IsEditable">True</property>
+                        <property name="InvisibleChar">•</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">1</property>
+                    <property name="AutoSize">False</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox3">
+                    <property name="MemberName" />
+                    <child>
+                      <widget class="Gtk.Label" id="label3">
+                        <property name="MemberName" />
+                        <property name="Xalign">1</property>
+                        <property name="LabelProp" translatable="yes">Password:</property>
+                        <property name="Justify">Right</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Entry" id="entry3">
+                        <property name="MemberName" />
+                        <property name="CanFocus">True</property>
+                        <property name="IsEditable">True</property>
+                        <property name="InvisibleChar">•</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="Position">2</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="Position">2</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">True</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+    <child internal-child="ActionArea">
+      <widget class="Gtk.HButtonBox" id="OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea">
+        <property name="MemberName" />
+        <property name="Events">ButtonPressMask</property>
+        <property name="Spacing">6</property>
+        <property name="BorderWidth">5</property>
+        <property name="Size">2</property>
+        <property name="LayoutStyle">End</property>
+        <child>
+          <widget class="Gtk.Button" id="button2">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="Type">TextAndIcon</property>
+            <property name="Icon">stock:gtk-apply Menu</property>
+            <property name="Label" translatable="yes">Connect</property>
+            <property name="UseUnderline">True</property>
+            <property name="IsDialogButton">True</property>
+            <property name="ResponseId">-5</property>
+          </widget>
+          <packing>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Button" id="button8">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="Type">TextAndIcon</property>
+            <property name="Icon">stock:gtk-cancel Menu</property>
+            <property name="Label" translatable="yes">Cancel</property>
+            <property name="UseUnderline">True</property>
+            <property name="IsDialogButton">True</property>
+            <property name="ResponseId">-6</property>
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</stetic-interface>
\ No newline at end of file
diff --git a/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs b/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
new file mode 100644
index 0000000..25e0211
--- /dev/null
+++ b/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("UserConfig")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("UserConfig")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
new file mode 100644
index 0000000..770a6b9
--- /dev/null
+++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
@@ -0,0 +1,96 @@
+/*
+* 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 OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using Db4objects.Db4o;
+
+namespace OpenUser.Config.UserConfigDb4o
+{
+	public class Db4oConfigPlugin: IUserConfig
+	{
+		public UserConfig GetConfigObject()
+		{
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll");
+			return ( new DbUserConfig());
+		}
+	}
+	
+	public class DbUserConfig : UserConfig
+	{
+		private IObjectContainer db;	
+		
+		public void LoadDefaults() {
+			OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+			
+			this.DefaultStartupMsg = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
+
+			this.GridServerURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
+            		this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server","null");
+            		this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
+		}
+
+		public override void InitConfig() {
+			try {
+				db = Db4oFactory.OpenFile("openuser.yap");
+				IObjectSet result = db.Get(typeof(DbUserConfig));
+				if(result.Count==1) {
+					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
+					foreach (DbUserConfig cfg in result) {
+						this.GridServerURL=cfg.GridServerURL;
+						this.GridSendKey=cfg.GridSendKey;
+						this.GridRecvKey=cfg.GridRecvKey;
+						this.DefaultStartupMsg=cfg.DefaultStartupMsg;
+					}
+				} else {
+					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+					LoadDefaults();
+					OpenSim.Framework.Console.MainLog.Instance.Verbose("Writing out default settings to local database");
+					db.Set(this);
+					db.Close();
+				}
+			} catch(Exception e) {
+				OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+			}
+			
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("User settings loaded:");
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
+		}
+	
+
+		public void Shutdown() {
+			db.Close();
+		}
+	}
+	
+}
diff --git a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj
new file mode 100644
index 0000000..1ae9589
--- /dev/null
+++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj
@@ -0,0 +1,107 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{08F87229-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Grid.UserServer.Config</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Grid.UserServer.Config</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework" >
+      <HintPath>OpenSim.Framework.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Console" >
+      <HintPath>OpenSim.Framework.Console.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data.dll" >
+      <HintPath>..\..\..\bin\System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DbUserConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj.user b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
new file mode 100644
index 0000000..5c27d57
--- /dev/null
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -0,0 +1,219 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.IO;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework.User;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Console;
+using OpenSim.Servers;
+using OpenSim.Framework.Utilities;
+using OpenSim.GenericConfig;
+
+namespace OpenGridServices.UserServer
+{
+    /// <summary>
+    /// </summary>
+    public class OpenUser_Main :  conscmd_callback
+    {
+        private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";
+        private string StorageDll = "OpenGrid.Framework.Data.MySQL.dll";
+        private UserConfig Cfg;
+        protected IGenericConfig localXMLConfig;
+
+        public UserManager m_userManager;
+
+        public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>();
+
+        LogBase m_console;
+
+        [STAThread]
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("Launching UserServer...");
+
+            OpenUser_Main userserver = new OpenUser_Main();
+
+            userserver.Startup();
+            userserver.Work();
+        }
+
+        private OpenUser_Main()
+        {
+            m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false);
+            OpenSim.Framework.Console.MainLog.Instance = m_console;
+        }
+
+        private void Work()
+        {
+            m_console.Notice("Enter help for a list of commands\n");
+
+            while (true)
+            {
+                m_console.MainLogPrompt();
+            }
+        }
+
+        public void Startup()
+        {
+            this.localXMLConfig = new XmlConfig("UserServerConfig.xml");
+            this.localXMLConfig.LoadData();
+            this.ConfigDB(this.localXMLConfig);
+            this.localXMLConfig.Close();
+
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");
+            Cfg = this.LoadConfigDll(this.ConfigDll);
+            Cfg.InitConfig();
+
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
+            m_userManager = new UserManager();
+            m_userManager._config = Cfg;
+            m_userManager.AddPlugin(StorageDll);
+
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
+            BaseHttpServer httpServer = new BaseHttpServer(8002);
+
+            httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
+
+            httpServer.AddRestHandler("GET", "/user/name/", m_userManager.RestGetUserMethodName);
+            httpServer.AddRestHandler("GET", "/user/uuid/", m_userManager.RestGetUserMethodUUID);
+
+            httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod);
+
+            httpServer.Start();
+            m_console.Status("Userserver 0.3 - Startup complete");
+        }
+
+
+        public void do_create(string what)
+        {
+            switch (what)
+            {
+                case "user":
+                    string tempfirstname;
+                    string templastname;
+                    string tempMD5Passwd;
+                    uint regX = 997;
+                    uint regY = 996;
+
+                    tempfirstname = m_console.CmdPrompt("First name");
+                    templastname = m_console.CmdPrompt("Last name");
+                    tempMD5Passwd = m_console.PasswdPrompt("Password");
+                    regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X"));
+                    regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y"));
+
+                    tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + "");
+
+                    m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY); 
+                    break;
+            }
+        }
+
+        public void RunCmd(string cmd, string[] cmdparams)
+        {
+            switch (cmd)
+            {
+                case "help":
+                    m_console.Notice("create user - create a new user");
+                    m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
+                    break;
+
+                case "create":
+                    do_create(cmdparams[0]);
+                    break;
+
+                case "shutdown":
+                    m_console.Close();
+                    Environment.Exit(0);
+                    break;
+            }
+        }
+
+        private void ConfigDB(IGenericConfig configData)
+        {
+            try
+            {
+                string attri = "";
+                attri = configData.GetAttribute("DataBaseProvider");
+                if (attri == "")
+                {
+                    StorageDll = "OpenGrid.Framework.Data.DB4o.dll";
+                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
+                }
+                else
+                {
+                    StorageDll = attri;
+                }
+                configData.Commit();
+            }
+            catch (Exception e)
+            {
+
+            }
+        }
+
+        private UserConfig LoadConfigDll(string dllName)
+        {
+            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+            UserConfig config = null;
+
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (pluginType.IsPublic)
+                {
+                    if (!pluginType.IsAbstract)
+                    {
+                        Type typeInterface = pluginType.GetInterface("IUserConfig", true);
+
+                        if (typeInterface != null)
+                        {
+                            IUserConfig plug = (IUserConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                            config = plug.GetConfigObject();
+                            break;
+                        }
+
+                        typeInterface = null;
+                    }
+                }
+            }
+            pluginAssembly = null;
+            return config;
+        }
+
+        public void Show(string ShowWhat)
+        {
+        }
+    }
+}
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
new file mode 100644
index 0000000..3c93b78
--- /dev/null
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -0,0 +1,132 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2FC96F92-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Grid.UserServer</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Grid.UserServer</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework" >
+      <HintPath>OpenSim.Framework.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Console" >
+      <HintPath>OpenSim.Framework.Console.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
+      <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Servers" >
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.UserManager" >
+      <HintPath>OpenSim.Framework.UserManager.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj.user b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..5d5ce8d
--- /dev/null
+++ b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OGS-UserServer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OGS-UserServer")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("e266513a-090b-4d38-80f6-8599eef68c8c")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
new file mode 100644
index 0000000..0704de1
--- /dev/null
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -0,0 +1,103 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using OpenGrid.Framework.Data;
+using libsecondlife;
+using System.Reflection;
+
+using System.Xml;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+using OpenGrid.Framework.UserManagement;
+
+using System.Security.Cryptography;
+
+namespace OpenGridServices.UserServer
+{
+    public class UserManager : UserManagerBase
+    {
+        public UserManager()
+        {
+        }
+
+        /// <summary>
+        /// Customises the login response and fills in missing values.
+        /// </summary>
+        /// <param name="response">The existing response</param>
+        /// <param name="theUser">The user profile</param>
+        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
+        {
+            // Load information from the gridserver
+            SimProfile SimInfo = new SimProfile();
+            SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
+
+            // Customise the response
+            // Home Location
+            response.Home = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " +
+                "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
+                "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
+
+            // Destination
+            response.SimAddress = SimInfo.sim_ip;
+            response.SimPort = (Int32)SimInfo.sim_port;
+            response.RegionX = SimInfo.RegionLocY ;
+            response.RegionY = SimInfo.RegionLocX ;
+
+            // Notify the target of an incoming user
+            Console.WriteLine("Notifying " + SimInfo.regionname + " (" + SimInfo.caps_url + ")");
+
+            // Prepare notification
+            Hashtable SimParams = new Hashtable();
+            SimParams["session_id"] = theUser.currentAgent.sessionID.ToString();
+            SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString();
+            SimParams["firstname"] = theUser.username;
+            SimParams["lastname"] = theUser.surname;
+            SimParams["agent_id"] = theUser.UUID.ToString();
+            SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode);
+            SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();
+            SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
+            SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();
+            SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString();
+            ArrayList SendParams = new ArrayList();
+            SendParams.Add(SimParams);
+
+            // Update agent with target sim
+            theUser.currentAgent.currentRegion = SimInfo.UUID;
+            theUser.currentAgent.currentHandle = SimInfo.regionhandle;
+
+            // Send
+            XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
+            XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000);
+        }
+    }
+}
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
new file mode 100644
index 0000000..40701b0
--- /dev/null
+++ b/OpenSim/Region/Application/Application.cs
@@ -0,0 +1,121 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Console;
+
+namespace OpenSim
+{
+    public class Application
+    {   
+        //could move our main function into OpenSimMain and kill this class
+        [STAThread]
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
+            Console.WriteLine("Starting...\n");
+            
+            bool sandBoxMode = false;
+            bool startLoginServer = false;
+            string physicsEngine = "basicphysics";
+            bool allowFlying = false;
+            bool userAccounts = false;
+            bool gridLocalAsset = false;
+            bool useConfigFile = false;
+            bool silent = false;
+            string configFile = "simconfig.xml";
+            
+            for (int i = 0; i < args.Length; i++)
+            {
+                if (args[i] == "-sandbox")
+                {
+                    sandBoxMode = true;
+                    startLoginServer = true;
+                }
+                /*
+                if (args[i] == "-loginserver")
+                {
+                    startLoginServer = true;
+                }*/
+                if (args[i] == "-accounts")
+                {
+                    userAccounts = true;
+                }
+                if (args[i] == "-realphysx")
+                {
+                    physicsEngine = "RealPhysX";
+                    allowFlying = true;
+                }
+                if (args[i] == "-ode")
+                {
+                    physicsEngine = "OpenDynamicsEngine";
+                    allowFlying = true;
+                }
+                if (args[i] == "-localasset")
+                {
+                    gridLocalAsset = true;
+                }
+                if (args[i] == "-configfile")
+                {
+                    useConfigFile = true;
+                }
+                if (args[i] == "-noverbose")
+                {
+                    silent = true;
+                }
+                if (args[i] == "-config")
+                {
+                    try
+                    {
+                        i++;
+                        configFile = args[i];
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine("-config: Please specify a config file. (" + e.ToString() + ")");
+                    }
+                }
+            }
+
+            OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, silent, configFile);
+           // OpenSimRoot.Instance.Application = sim;
+            sim.m_sandbox = sandBoxMode;
+            sim.user_accounts = userAccounts;
+            sim.gridLocalAsset = gridLocalAsset;
+            OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
+
+            sim.StartUp();
+
+            while (true)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.MainLogPrompt();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
new file mode 100644
index 0000000..214f2cf
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -0,0 +1,181 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll" >
+      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
+      <Name>OpenSim.Framework.Communications</Name>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Communications.OGS1\OpenSim.Framework.Communications.OGS1.csproj">
+      <Name>OpenSim.Framework.Communications.OGS1</Name>
+      <Project>{6109024D-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
+      <Name>OpenSim.Framework.GenericConfig.Xml</Name>
+      <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
+      <Name>OpenSim.Framework.UserManagement</Name>
+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
+      <Name>OpenSim.Region.Caches</Name>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj">
+      <Name>OpenSim.Region.ClientStack</Name>
+      <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\LocalCommunications\OpenSim.Region.LocalCommunications.csproj">
+      <Name>OpenSim.Region.LocalCommunications</Name>
+      <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Simulation\OpenSim.Region.Simulation.csproj">
+      <Name>OpenSim.Region.Simulation</Name>
+      <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
+      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
+      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Application.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OpenSimMain.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Application/OpenSim.csproj.user b/OpenSim/Region/Application/OpenSim.csproj.user
new file mode 100644
index 0000000..2ff1c4c
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSim.csproj.user
@@ -0,0 +1,13 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <StartArguments>-loginserver -sandbox -accounts</StartArguments>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
new file mode 100644
index 0000000..7da2263
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -0,0 +1,476 @@
+/*
+* 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.Text;
+using System.IO;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Region;
+using OpenSim.Region.Scenes;
+using OpenSim.Terrain;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework;
+using OpenSim.Assets;
+using OpenSim.Caches;
+using OpenSim.Framework.Console;
+using OpenSim.Physics.Manager;
+using Nwc.XmlRpc;
+using OpenSim.Servers;
+using OpenSim.GenericConfig;
+using OpenGrid.Framework.Communications;
+using OpenSim.LocalCommunications;
+using OpenGrid.Framework.Communications.OGS1;
+
+namespace OpenSim
+{
+
+    public class OpenSimMain : RegionApplicationBase, conscmd_callback
+    {
+      //  private CheckSumServer checkServer;
+        protected CommunicationsManager commsManager;
+
+        private bool m_silent;
+        private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
+
+        public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
+        {
+            this.configFileSetup = useConfigFile;
+            m_sandbox = sandBoxMode;
+            m_loginserver = startLoginServer;
+            m_physicsEngine = physicsEngine;
+            m_config = configFile;
+            m_silent = silent;
+        }
+
+        /// <summary>
+        /// Performs initialisation of the world, such as loading configuration from disk.
+        /// </summary>
+        public override void StartUp()
+        {
+            this.serversData = new NetworkServersInfo();
+
+            this.localConfig = new XmlConfig(m_config);
+            this.localConfig.LoadData();
+
+            if (this.configFileSetup)
+            {
+                this.SetupFromConfigFile(this.localConfig);
+            }
+
+            m_log = new LogBase(m_logFilename, "Region", this, m_silent);
+            OpenSim.Framework.Console.MainLog.Instance = m_log;
+
+            m_log.Verbose( "Main.cs:Startup() - Loading configuration");
+            this.serversData.InitConfig(this.m_sandbox, this.localConfig);
+            this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
+            
+            ScenePresence.LoadTextureFile("avatar-texture.dat");
+
+            ClientView.TerrainManager = new TerrainManager(new SecondLife());
+
+            CommunicationsLocal sandboxCommunications = null;
+            if (m_sandbox)
+            {
+                this.SetupLocalGridServers();
+              //  this.checkServer = new CheckSumServer(12036);
+              //  this.checkServer.ServerListener();
+                sandboxCommunications = new CommunicationsLocal(this.serversData);
+                this.commsManager = sandboxCommunications;
+            }
+            else
+            {
+                this.SetupRemoteGridServers();
+                this.commsManager = new GridCommsManager(this.serversData);
+            }
+
+            startuptime = DateTime.Now;
+
+            this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
+            this.physManager.LoadPlugins();
+
+            this.SetupHttpListener();
+
+            this.SetupWorld();
+
+            m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server");
+
+
+
+            if (m_sandbox)
+            {
+                httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);
+            }
+
+            //Start http server
+            m_log.Verbose( "Main.cs:Startup() - Starting HTTP server");
+            httpServer.Start();
+
+            // Start UDP servers
+            for (int i = 0; i < m_udpServer.Count; i++)
+            {
+                this.m_udpServer[i].ServerListener();
+            }
+
+        }
+
+        # region Setup methods
+        protected override void SetupLocalGridServers()
+        {
+            try
+            {
+                AssetCache = new AssetCache("OpenSim.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+                InventoryCache = new InventoryCache();
+            }
+            catch (Exception e)
+            {
+                m_log.Error( e.Message + "\nSorry, could not setup local cache");
+                Environment.Exit(1);
+            }
+
+        }
+
+        protected override void SetupRemoteGridServers()
+        {
+            try
+            {
+                AssetCache = new AssetCache("OpenSim.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+                InventoryCache = new InventoryCache();
+            }
+            catch (Exception e)
+            {
+                m_log.Error( e.Message + "\nSorry, could not setup remote cache");
+                Environment.Exit(1);
+            }
+        }
+
+        protected override void SetupWorld()
+        {
+            IGenericConfig regionConfig;
+            Scene LocalWorld;
+            UDPServer udpServer;
+            RegionInfo regionDat = new RegionInfo();
+            AuthenticateSessionsBase authenBase;
+
+            string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions");
+            string[] configFiles = Directory.GetFiles(path, "*.xml");
+
+            if (configFiles.Length == 0)
+            {
+                string path2 = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions");
+                string path3 = Path.Combine(path2, "default.xml");
+                Console.WriteLine("Creating default region config file");
+                //TODO create default region
+                IGenericConfig defaultConfig = new XmlConfig(path3);
+                defaultConfig.LoadData();
+                defaultConfig.Commit();
+                defaultConfig.Close();
+                defaultConfig = null;
+                configFiles = Directory.GetFiles(path, "*.xml");
+            }
+
+            for (int i = 0; i < configFiles.Length; i++)
+            {
+                regionDat = new RegionInfo();
+                if (m_sandbox)
+                {
+                    AuthenticateSessionsBase authen = new AuthenticateSessionsBase();  // new AuthenticateSessionsLocal();
+                    this.AuthenticateSessionsHandler.Add(authen);
+                    authenBase = authen;
+                }
+                else
+                {
+                    AuthenticateSessionsBase authen = new AuthenticateSessionsBase(); //new AuthenticateSessionsRemote();
+                    this.AuthenticateSessionsHandler.Add(authen);
+                    authenBase = authen;
+                }
+                Console.WriteLine("Loading region config file");
+                regionConfig = new XmlConfig(configFiles[i]);
+                regionConfig.LoadData();
+                regionDat.InitConfig(this.m_sandbox, regionConfig);
+                regionConfig.Close();
+
+                udpServer = new UDPServer(regionDat.CommsIPListenPort, this.AssetCache, this.InventoryCache, this.m_log, authenBase);
+
+                m_udpServer.Add(udpServer);
+                this.regionData.Add(regionDat);
+
+                /*
+                m_log.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
+                m_log.Verbose( "Initialising world");
+                m_log.componentname = "Region " + regionData.RegionName;
+                */
+
+                LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager, this.AssetCache, httpServer);
+                this.m_localWorld.Add(LocalWorld);
+                //LocalWorld.InventoryCache = InventoryCache;
+                //LocalWorld.AssetCache = AssetCache;
+
+                udpServer.LocalWorld = LocalWorld;
+
+                LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
+                LocalWorld.LoadWorldMap();
+
+                m_log.Verbose( "Main.cs:Startup() - Starting up messaging system");
+                LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
+                LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
+                LocalWorld.LoadPrimsFromStorage();
+                LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+
+
+                LocalWorld.StartTimer();
+            }
+        }
+
+        protected override void SetupHttpListener()
+        {
+            httpServer = new BaseHttpServer(this.serversData.HttpListenerPort); //regionData[0].IPListenPort);
+
+            if (!this.m_sandbox)
+            {
+
+                // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
+
+
+                httpServer.AddRestHandler("GET", "/simstatus/",
+                    delegate(string request, string path, string param)
+                    {
+                        return "OK";
+                    });
+            }
+        }
+
+        protected override void ConnectToRemoteGridServer()
+        {
+
+        }
+
+        #endregion
+
+        private void SetupFromConfigFile(IGenericConfig configData)
+        {
+            // Log filename
+            string attri = "";
+            attri = configData.GetAttribute("LogFilename");
+            if (String.IsNullOrEmpty(attri))
+            {
+            }
+            else
+            {
+                m_logFilename = attri;
+            }
+
+            // SandBoxMode
+            attri = "";
+            attri = configData.GetAttribute("SandBox");
+            if ((attri == "") || ((attri != "false") && (attri != "true")))
+            {
+                this.m_sandbox = false;
+                configData.SetAttribute("SandBox", "false");
+            }
+            else
+            {
+                this.m_sandbox = Convert.ToBoolean(attri);
+            }
+
+            // LoginServer
+            attri = "";
+            attri = configData.GetAttribute("LoginServer");
+            if ((attri == "") || ((attri != "false") && (attri != "true")))
+            {
+                this.m_loginserver = false;
+                configData.SetAttribute("LoginServer", "false");
+            }
+            else
+            {
+                this.m_loginserver = Convert.ToBoolean(attri);
+            }
+
+            // Sandbox User accounts
+            attri = "";
+            attri = configData.GetAttribute("UserAccount");
+            if ((attri == "") || ((attri != "false") && (attri != "true")))
+            {
+                this.user_accounts = false;
+                configData.SetAttribute("UserAccounts", "false");
+            }
+            else if (attri == "true")
+            {
+                this.user_accounts = Convert.ToBoolean(attri);
+            }
+
+            // Grid mode hack to use local asset server
+            attri = "";
+            attri = configData.GetAttribute("LocalAssets");
+            if ((attri == "") || ((attri != "false") && (attri != "true")))
+            {
+                this.gridLocalAsset = false;
+                configData.SetAttribute("LocalAssets", "false");
+            }
+            else if (attri == "true")
+            {
+                this.gridLocalAsset = Convert.ToBoolean(attri);
+            }
+
+
+            attri = "";
+            attri = configData.GetAttribute("PhysicsEngine");
+            switch (attri)
+            {
+                default:
+                    m_log.Warn( "Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
+                    Environment.Exit(1);
+                    break;
+
+                case "":
+                    this.m_physicsEngine = "basicphysics";
+                    configData.SetAttribute("PhysicsEngine", "basicphysics");
+                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+                    break;
+
+                case "basicphysics":
+                    this.m_physicsEngine = "basicphysics";
+                    configData.SetAttribute("PhysicsEngine", "basicphysics");
+                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+                    break;
+
+                case "RealPhysX":
+                    this.m_physicsEngine = "RealPhysX";
+                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+                    break;
+
+                case "OpenDynamicsEngine":
+                    this.m_physicsEngine = "OpenDynamicsEngine";
+                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+                    break;
+            }
+
+            configData.Commit();
+
+        }
+
+        /// <summary>
+        /// Performs any last-minute sanity checking and shuts down the region server
+        /// </summary>
+        public virtual void Shutdown()
+        {
+            m_log.Verbose( "Main.cs:Shutdown() - Closing all threads");
+            m_log.Verbose( "Main.cs:Shutdown() - Killing listener thread");
+            m_log.Verbose( "Main.cs:Shutdown() - Killing clients");
+            // IMPLEMENT THIS
+            m_log.Verbose( "Main.cs:Shutdown() - Closing console and terminating");
+            for (int i = 0; i < m_localWorld.Count; i++)
+            {
+                ((Scene)m_localWorld[i]).Close();
+            }
+            m_log.Close();
+            Environment.Exit(0);
+        }
+
+        #region Console Commands
+        /// <summary>
+        /// Runs commands issued by the server console from the operator
+        /// </summary>
+        /// <param name="command">The first argument of the parameter (the command)</param>
+        /// <param name="cmdparams">Additional arguments passed to the command</param>
+        public void RunCmd(string command, string[] cmdparams)
+        {
+            switch (command)
+            {
+                case "help":
+                    m_log.Error( "show users - show info about connected users");
+                    m_log.Error( "shutdown - disconnect all clients and shutdown");
+                    break;
+
+                case "show":
+                    if (cmdparams.Length > 0)
+                    {
+                        Show(cmdparams[0]);
+                    }
+                    break;
+
+                case "terrain":
+                    string result = "";
+                    for (int i = 0; i < m_localWorld.Count; i++)
+                    {
+                        if (!((Scene)m_localWorld[i]).Terrain.RunTerrainCmd(cmdparams, ref result))
+                        {
+                            m_log.Error(result);
+                        }
+                    }
+                    break;
+
+                case "shutdown":
+                    Shutdown();
+                    break;
+
+                default:
+                    m_log.Error( "Unknown command");
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Outputs to the console information about the region
+        /// </summary>
+        /// <param name="ShowWhat">What information to display (valid arguments are "uptime", "users")</param>
+        public void Show(string ShowWhat)
+        {
+            switch (ShowWhat)
+            {
+                case "uptime":
+                    m_log.Error( "OpenSim has been running since " + startuptime.ToString());
+                    m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
+                    break;
+                case "users":
+                    OpenSim.Region.Scenes.ScenePresence TempAv;
+                    m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
+                    /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
+                     {
+                         if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
+                         {
+                             TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID];
+                             m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
+                         }
+                     }*/
+                    break;
+            }
+        }
+        #endregion
+    }
+
+
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Caches/AssetCache.cs b/OpenSim/Region/Caches/AssetCache.cs
new file mode 100644
index 0000000..d0cc370
--- /dev/null
+++ b/OpenSim/Region/Caches/AssetCache.cs
@@ -0,0 +1,670 @@
+/*
+* 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.Threading;
+using System.Reflection;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Caches
+{
+    public delegate void DownloadComplete(AssetCache.TextureSender sender);
+
+    /// <summary>
+    /// Manages local cache of assets and their sending to viewers.
+    /// </summary>
+    public class AssetCache : IAssetReceiver
+    {
+        public Dictionary<libsecondlife.LLUUID, AssetInfo> Assets;
+        public Dictionary<libsecondlife.LLUUID, TextureImage> Textures;
+
+        public List<AssetRequest> AssetRequests = new List<AssetRequest>();  //assets ready to be sent to viewers
+        public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent
+
+        public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>(); //Assets requested from the asset server
+        public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>(); //Textures requested from the asset server
+
+        public Dictionary<LLUUID, TextureSender> SendingTextures = new Dictionary<LLUUID, TextureSender>();
+        private IAssetServer _assetServer;
+        private Thread _assetCacheThread;
+        private LLUUID[] textureList = new LLUUID[5];
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public AssetCache(IAssetServer assetServer)
+        {
+            Console.WriteLine("Creating Asset cache");
+            _assetServer = assetServer;
+            _assetServer.SetReceiver(this);
+            Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>();
+            Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>();
+            this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
+            this._assetCacheThread.IsBackground = true;
+            this._assetCacheThread.Start();
+
+        }
+
+        public AssetCache(string assetServerDLLName, string assetServerURL, string assetServerKey)
+        {
+            Console.WriteLine("Creating Asset cache");
+            _assetServer = this.LoadAssetDll(assetServerDLLName);
+            _assetServer.SetServerInfo(assetServerURL, assetServerKey);
+            _assetServer.SetReceiver(this);
+            Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>();
+            Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>();
+            this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
+            this._assetCacheThread.IsBackground = true;
+            this._assetCacheThread.Start();
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RunAssetManager()
+        {
+            while (true)
+            {
+                try
+                {
+                    //Console.WriteLine("Asset cache loop");
+                    this.ProcessAssetQueue();
+                    this.ProcessTextureQueue();
+                    Thread.Sleep(500);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.Message);
+                }
+            }
+        }
+
+        public void LoadDefaultTextureSet()
+        {
+            //hack: so we can give each user a set of textures
+            textureList[0] = new LLUUID("00000000-0000-0000-9999-000000000001");
+            textureList[1] = new LLUUID("00000000-0000-0000-9999-000000000002");
+            textureList[2] = new LLUUID("00000000-0000-0000-9999-000000000003");
+            textureList[3] = new LLUUID("00000000-0000-0000-9999-000000000004");
+            textureList[4] = new LLUUID("00000000-0000-0000-9999-000000000005");
+
+            for (int i = 0; i < textureList.Length; i++)
+            {
+                this._assetServer.RequestAsset(textureList[i], true);
+            }
+
+        }
+
+        public AssetBase[] CreateNewInventorySet(LLUUID agentID)
+        {
+            AssetBase[] inventorySet = new AssetBase[this.textureList.Length];
+            for (int i = 0; i < textureList.Length; i++)
+            {
+                if (this.Textures.ContainsKey(textureList[i]))
+                {
+                    inventorySet[i] = this.CloneImage(agentID, this.Textures[textureList[i]]);
+                    TextureImage image = new TextureImage(inventorySet[i]);
+                    this.Textures.Add(image.FullID, image);
+                    this._assetServer.UploadNewAsset(image); //save the asset to the asset server
+                }
+            }
+            return inventorySet;
+        }
+
+        public AssetBase GetAsset(LLUUID assetID)
+        {
+            AssetBase asset = null;
+            if (this.Textures.ContainsKey(assetID))
+            {
+                asset = this.Textures[assetID];
+            }
+            else if (this.Assets.ContainsKey(assetID))
+            {
+                asset = this.Assets[assetID];
+            }
+            return asset;
+        }
+
+        public void AddAsset(AssetBase asset)
+        {
+           // Console.WriteLine("adding asset " + asset.FullID.ToStringHyphenated());
+            if (asset.Type == 0)
+            {
+                //Console.WriteLine("which is a texture");
+                if (!this.Textures.ContainsKey(asset.FullID))
+                { //texture
+                    TextureImage textur = new TextureImage(asset);
+                    this.Textures.Add(textur.FullID, textur);
+                    this._assetServer.UploadNewAsset(asset);
+                }
+            }
+            else
+            {
+                if (!this.Assets.ContainsKey(asset.FullID))
+                {
+                    AssetInfo assetInf = new AssetInfo(asset);
+                    this.Assets.Add(assetInf.FullID, assetInf);
+                    this._assetServer.UploadNewAsset(asset);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void ProcessTextureQueue()
+        {
+            if (this.TextureRequests.Count == 0)
+            {
+                //no requests waiting
+                return;
+            }
+            int num;
+            num = this.TextureRequests.Count;
+
+            AssetRequest req;
+            for (int i = 0; i < num; i++)
+            {
+                req = (AssetRequest)this.TextureRequests[i];
+                if (!this.SendingTextures.ContainsKey(req.ImageInfo.FullID))
+                {
+                    TextureSender sender = new TextureSender(req);
+                    sender.OnComplete += this.TextureSent;
+                    lock (this.SendingTextures)
+                    {
+                        this.SendingTextures.Add(req.ImageInfo.FullID, sender);
+                    }
+                }
+
+            }
+
+            this.TextureRequests.Clear();
+        }
+
+        /// <summary>
+        /// Event handler, called by a TextureSender object to say that texture has been sent
+        /// </summary>
+        /// <param name="sender"></param>
+        public void TextureSent(AssetCache.TextureSender sender)
+        {
+            if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
+            {
+                lock (this.SendingTextures)
+                {
+                    this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
+                }
+            }
+        }
+
+        public void AssetReceived(AssetBase asset, bool IsTexture)
+        {
+            if (asset.FullID != LLUUID.Zero)  // if it is set to zero then the asset wasn't found by the server
+            {
+                //check if it is a texture or not
+                //then add to the correct cache list
+                //then check for waiting requests for this asset/texture (in the Requested lists)
+                //and move those requests into the Requests list.
+                if (IsTexture)
+                {
+                    TextureImage image = new TextureImage(asset);
+                    this.Textures.Add(image.FullID, image);
+                    if (this.RequestedTextures.ContainsKey(image.FullID))
+                    {
+                        AssetRequest req = this.RequestedTextures[image.FullID];
+                        req.ImageInfo = image;
+                        if (image.Data.LongLength > 600)
+                        {
+                            //over 600 bytes so split up file
+                            req.NumPackets = 1 + (int)(image.Data.Length - 600 + 999) / 1000;
+                        }
+                        else
+                        {
+                            req.NumPackets = 1;
+                        }
+                        this.RequestedTextures.Remove(image.FullID);
+                        this.TextureRequests.Add(req);
+                    }
+                }
+                else
+                {
+                    AssetInfo assetInf = new AssetInfo(asset);
+                    this.Assets.Add(assetInf.FullID, assetInf);
+                    if (this.RequestedAssets.ContainsKey(assetInf.FullID))
+                    {
+                        AssetRequest req = this.RequestedAssets[assetInf.FullID];
+                        req.AssetInf = assetInf;
+                        if (assetInf.Data.LongLength > 600)
+                        {
+                            //over 600 bytes so split up file
+                            req.NumPackets = 1 + (int)(assetInf.Data.Length - 600 + 999) / 1000;
+                        }
+                        else
+                        {
+                            req.NumPackets = 1;
+                        }
+                        this.RequestedAssets.Remove(assetInf.FullID);
+                        this.AssetRequests.Add(req);
+                    }
+                }
+            }
+        }
+
+        public void AssetNotFound(AssetBase asset)
+        {
+            //the asset server had no knowledge of requested asset
+
+        }
+
+        #region Assets
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="userInfo"></param>
+        /// <param name="transferRequest"></param>
+        public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest)
+        {
+            LLUUID requestID = new LLUUID(transferRequest.TransferInfo.Params, 0);
+            //check to see if asset is in local cache, if not we need to request it from asset server.
+
+            if (!this.Assets.ContainsKey(requestID))
+            {
+                //not found asset	
+                // so request from asset server
+                if (!this.RequestedAssets.ContainsKey(requestID))
+                {
+                    AssetRequest request = new AssetRequest();
+                    request.RequestUser = userInfo;
+                    request.RequestAssetID = requestID;
+                    request.TransferRequestID = transferRequest.TransferInfo.TransferID;
+                    this.RequestedAssets.Add(requestID, request);
+                    this._assetServer.RequestAsset(requestID, false);
+                }
+                return;
+            }
+            //it is in our cache 
+            AssetInfo asset = this.Assets[requestID];
+
+            //work out how many packets it  should be sent in 
+            // and add to the AssetRequests list
+            AssetRequest req = new AssetRequest();
+            req.RequestUser = userInfo;
+            req.RequestAssetID = requestID;
+            req.TransferRequestID = transferRequest.TransferInfo.TransferID;
+            req.AssetInf = asset;
+
+            if (asset.Data.LongLength > 600)
+            {
+                //over 600 bytes so split up file
+                req.NumPackets = 1 + (int)(asset.Data.Length - 600 + 999) / 1000;
+            }
+            else
+            {
+                req.NumPackets = 1;
+            }
+
+            this.AssetRequests.Add(req);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void ProcessAssetQueue()
+        {
+            if (this.AssetRequests.Count == 0)
+            {
+                //no requests waiting
+                return;
+            }
+            int num;
+
+            if (this.AssetRequests.Count < 5)
+            {
+                //lower than 5 so do all of them
+                num = this.AssetRequests.Count;
+            }
+            else
+            {
+                num = 5;
+            }
+            AssetRequest req;
+            for (int i = 0; i < num; i++)
+            {
+                req = (AssetRequest)this.AssetRequests[i];
+
+                TransferInfoPacket Transfer = new TransferInfoPacket();
+                Transfer.TransferInfo.ChannelType = 2;
+                Transfer.TransferInfo.Status = 0;
+                Transfer.TransferInfo.TargetType = 0;
+                Transfer.TransferInfo.Params = req.RequestAssetID.GetBytes();
+                Transfer.TransferInfo.Size = (int)req.AssetInf.Data.Length;
+                Transfer.TransferInfo.TransferID = req.TransferRequestID;
+                req.RequestUser.OutPacket(Transfer);
+
+                if (req.NumPackets == 1)
+                {
+                    TransferPacketPacket TransferPacket = new TransferPacketPacket();
+                    TransferPacket.TransferData.Packet = 0;
+                    TransferPacket.TransferData.ChannelType = 2;
+                    TransferPacket.TransferData.TransferID = req.TransferRequestID;
+                    TransferPacket.TransferData.Data = req.AssetInf.Data;
+                    TransferPacket.TransferData.Status = 1;
+                    req.RequestUser.OutPacket(TransferPacket);
+                }
+                else
+                {
+                    //more than one packet so split file up , for now it can't be bigger than 2000 bytes
+                    TransferPacketPacket TransferPacket = new TransferPacketPacket();
+                    TransferPacket.TransferData.Packet = 0;
+                    TransferPacket.TransferData.ChannelType = 2;
+                    TransferPacket.TransferData.TransferID = req.TransferRequestID;
+                    byte[] chunk = new byte[1000];
+                    Array.Copy(req.AssetInf.Data, chunk, 1000);
+                    TransferPacket.TransferData.Data = chunk;
+                    TransferPacket.TransferData.Status = 0;
+                    req.RequestUser.OutPacket(TransferPacket);
+
+                    TransferPacket = new TransferPacketPacket();
+                    TransferPacket.TransferData.Packet = 1;
+                    TransferPacket.TransferData.ChannelType = 2;
+                    TransferPacket.TransferData.TransferID = req.TransferRequestID;
+                    byte[] chunk1 = new byte[(req.AssetInf.Data.Length - 1000)];
+                    Array.Copy(req.AssetInf.Data, 1000, chunk1, 0, chunk1.Length);
+                    TransferPacket.TransferData.Data = chunk1;
+                    TransferPacket.TransferData.Status = 1;
+                    req.RequestUser.OutPacket(TransferPacket);
+                }
+
+            }
+
+            //remove requests that have been completed
+            for (int i = 0; i < num; i++)
+            {
+                this.AssetRequests.RemoveAt(0);
+            }
+
+        }
+
+        public AssetInfo CloneAsset(LLUUID newOwner, AssetInfo sourceAsset)
+        {
+            AssetInfo newAsset = new AssetInfo();
+            newAsset.Data = new byte[sourceAsset.Data.Length];
+            Array.Copy(sourceAsset.Data, newAsset.Data, sourceAsset.Data.Length);
+            newAsset.FullID = LLUUID.Random();
+            newAsset.Type = sourceAsset.Type;
+            newAsset.InvType = sourceAsset.InvType;
+            return (newAsset);
+        }
+        #endregion
+
+        #region Textures
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="userInfo"></param>
+        /// <param name="imageID"></param>
+        public void AddTextureRequest(IClientAPI userInfo, LLUUID imageID)
+        {
+            //Console.WriteLine("texture request for " + imageID.ToStringHyphenated());
+            //check to see if texture is in local cache, if not request from asset server
+            if (!this.Textures.ContainsKey(imageID))
+            {
+                if (!this.RequestedTextures.ContainsKey(imageID))
+                {
+                    //not is cache so request from asset server
+                    AssetRequest request = new AssetRequest();
+                    request.RequestUser = userInfo;
+                    request.RequestAssetID = imageID;
+                    request.IsTextureRequest = true;
+                    this.RequestedTextures.Add(imageID, request);
+                    this._assetServer.RequestAsset(imageID, true);
+                }
+                return;
+            }
+
+            //Console.WriteLine("texture already in cache");
+            TextureImage imag = this.Textures[imageID];
+            AssetRequest req = new AssetRequest();
+            req.RequestUser = userInfo;
+            req.RequestAssetID = imageID;
+            req.IsTextureRequest = true;
+            req.ImageInfo = imag;
+
+            if (imag.Data.LongLength > 600)
+            {
+                //over 600 bytes so split up file
+                req.NumPackets = 1 + (int)(imag.Data.Length - 600 + 999) / 1000;
+            }
+            else
+            {
+                req.NumPackets = 1;
+            }
+            this.TextureRequests.Add(req);
+        }
+
+        public TextureImage CloneImage(LLUUID newOwner, TextureImage source)
+        {
+            TextureImage newImage = new TextureImage();
+            newImage.Data = new byte[source.Data.Length];
+            Array.Copy(source.Data, newImage.Data, source.Data.Length);
+            //newImage.filename = source.filename;
+            newImage.FullID = LLUUID.Random();
+            newImage.Name = source.Name;
+            return (newImage);
+        }
+        #endregion
+
+        private IAssetServer LoadAssetDll(string dllName)
+        {
+            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+            IAssetServer server = null;
+
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (pluginType.IsPublic)
+                {
+                    if (!pluginType.IsAbstract)
+                    {
+                        Type typeInterface = pluginType.GetInterface("IAssetPlugin", true);
+
+                        if (typeInterface != null)
+                        {
+                            IAssetPlugin plug = (IAssetPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                            server = plug.GetAssetServer();
+                            break;
+                        }
+
+                        typeInterface = null;
+                    }
+                }
+            }
+            pluginAssembly = null;
+            return server;
+        }
+
+        public class AssetRequest
+        {
+            public IClientAPI RequestUser;
+            public LLUUID RequestAssetID;
+            public AssetInfo AssetInf;
+            public TextureImage ImageInfo;
+            public LLUUID TransferRequestID;
+            public long DataPointer = 0;
+            public int NumPackets = 0;
+            public int PacketCounter = 0;
+            public bool IsTextureRequest;
+            //public bool AssetInCache;
+            //public int TimeRequested; 
+
+            public AssetRequest()
+            {
+
+            }
+        }
+
+        public class AssetInfo : AssetBase
+        {
+            public AssetInfo()
+            {
+
+            }
+
+            public AssetInfo(AssetBase aBase)
+            {
+                Data = aBase.Data;
+                FullID = aBase.FullID;
+                Type = aBase.Type;
+                InvType = aBase.InvType;
+                Name = aBase.Name;
+                Description = aBase.Description;
+            }
+        }
+
+        public class TextureImage : AssetBase
+        {
+            public TextureImage()
+            {
+
+            }
+
+            public TextureImage(AssetBase aBase)
+            {
+                Data = aBase.Data;
+                FullID = aBase.FullID;
+                Type = aBase.Type;
+                InvType = aBase.InvType;
+                Name = aBase.Name;
+                Description = aBase.Description;
+            }
+        }
+
+        public class TextureSender
+        {
+            public AssetRequest request;
+            public event DownloadComplete OnComplete;
+            Thread m_thread;
+            public TextureSender(AssetRequest req)
+            {
+                request = req;
+                //Console.WriteLine("creating worker thread for texture " + req.ImageInfo.FullID.ToStringHyphenated());
+                //Console.WriteLine("texture data length is " + req.ImageInfo.Data.Length);
+                // Console.WriteLine("in " + req.NumPackets + " packets");
+                //ThreadPool.QueueUserWorkItem(new WaitCallback(SendTexture), new object());
+
+                //need some sort of custom threadpool here, as using the .net one, overloads it and stops the handling of incoming packets etc
+                //but don't really want to create a thread for every texture download
+                m_thread = new Thread(new ThreadStart(SendTexture));
+                m_thread.IsBackground = true;
+                m_thread.Start();
+            }
+
+            public void SendTexture()
+            {
+                //Console.WriteLine("starting to send sending texture " + request.ImageInfo.FullID.ToStringHyphenated());
+                while (request.PacketCounter != request.NumPackets)
+                {
+                    SendPacket();
+                    Thread.Sleep(500);
+                }
+
+                //Console.WriteLine("finished sending texture " + request.ImageInfo.FullID.ToStringHyphenated());
+                if (OnComplete != null)
+                {
+                    OnComplete(this);
+                }
+            }
+
+            public void SendPacket()
+            {
+                AssetRequest req = request;
+                // Console.WriteLine("sending " + req.ImageInfo.FullID);
+
+                // if (req.ImageInfo.FullID == new LLUUID("00000000-0000-0000-5005-000000000005"))
+                if (req.PacketCounter == 0)
+                {
+                    //first time for this request so send imagedata packet
+                    if (req.NumPackets == 1)
+                    {
+                        //only one packet so send whole file
+                        ImageDataPacket im = new ImageDataPacket();
+                        im.ImageID.Packets = 1;
+                        im.ImageID.ID = req.ImageInfo.FullID;
+                        im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
+                        im.ImageData.Data = req.ImageInfo.Data;
+                        im.ImageID.Codec = 2;
+                        req.RequestUser.OutPacket(im);
+                        req.PacketCounter++;
+                        //req.ImageInfo.l= time;
+                        //System.Console.WriteLine("sent texture: " + req.ImageInfo.FullID);
+                        //  Console.WriteLine("sending packet 1 for " + req.ImageInfo.FullID.ToStringHyphenated());
+                    }
+                    else
+                    {
+                        //more than one packet so split file up
+                        ImageDataPacket im = new ImageDataPacket();
+                        im.ImageID.Packets = (ushort)req.NumPackets;
+                        im.ImageID.ID = req.ImageInfo.FullID;
+                        im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
+                        im.ImageData.Data = new byte[600];
+                        Array.Copy(req.ImageInfo.Data, 0, im.ImageData.Data, 0, 600);
+                        im.ImageID.Codec = 2;
+                        req.RequestUser.OutPacket(im);
+                        req.PacketCounter++;
+                        //req.ImageInfo.last_used = time;
+                        //System.Console.WriteLine("sent first packet of texture:
+                        // Console.WriteLine("sending packet 1 for " + req.ImageInfo.FullID.ToStringHyphenated());
+                    }
+                }
+                else
+                {
+                    //Console.WriteLine("sending packet" + req.PacketCounter + "for " + req.ImageInfo.FullID.ToStringHyphenated());
+                    //send imagepacket
+                    //more than one packet so split file up
+                    ImagePacketPacket im = new ImagePacketPacket();
+                    im.ImageID.Packet = (ushort)req.PacketCounter;
+                    im.ImageID.ID = req.ImageInfo.FullID;
+                    int size = req.ImageInfo.Data.Length - 600 - 1000 * (req.PacketCounter - 1);
+                    if (size > 1000) size = 1000;
+                    im.ImageData.Data = new byte[size];
+                    Array.Copy(req.ImageInfo.Data, 600 + 1000 * (req.PacketCounter - 1), im.ImageData.Data, 0, size);
+                    req.RequestUser.OutPacket(im);
+                    req.PacketCounter++;
+                    //req.ImageInfo.last_used = time;
+                    //System.Console.WriteLine("sent a packet of texture: "+req.image_info.FullID);
+                }
+
+            }
+        }
+    }
+}
+
diff --git a/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj b/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj
new file mode 100644
index 0000000..4a73d08
--- /dev/null
+++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj
@@ -0,0 +1,97 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{61FCCDB3-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Caches</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Caches</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssetCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj.user b/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Caches/Properties/AssemblyInfo.cs b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..00f5dfe
--- /dev/null
+++ b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.Caches")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.Caches")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2b15ddbf-0341-49a6-85c0-cece268a4518")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Caps/Caps.cs b/OpenSim/Region/Caps/Caps.cs
new file mode 100644
index 0000000..13a351d
--- /dev/null
+++ b/OpenSim/Region/Caps/Caps.cs
@@ -0,0 +1,258 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Xml;
+using OpenSim.Servers;
+using OpenSim.Framework;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Types;
+using OpenSim.Caches;
+using libsecondlife;
+
+namespace OpenSim.Region
+{
+    public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
+
+    public class Caps
+    {
+        private string httpListenerAddress;
+        private uint httpListenPort;
+        private string capsObjectPath = "00001-";
+        private string requestPath = "0000/";
+        private string mapLayerPath = "0001/";
+        private string newInventory = "0002/";
+        private string requestTexture = "0003/";
+        private string eventQueue = "0100/";
+        private BaseHttpServer httpListener;
+        private LLUUID agentID;
+        private AssetCache assetCache;
+        private int eventQueueCount = 1;
+        private Queue<string> CapsEventQueue = new Queue<string>();
+
+        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
+        {
+            assetCache = assetCach;
+            capsObjectPath = capsPath;
+            httpListener = httpServer;
+            httpListenerAddress = httpListen;
+            httpListenPort = httpPort;
+            agentID = agent;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RegisterHandlers()
+        {
+            Console.WriteLine("registering CAPS handlers");
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string CapsRequest(string request, string path, string param)
+        {
+           // Console.WriteLine("Caps Request " + request);
+            string result = ""; 
+            result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
+            return result;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected LLSDCapsDetails GetCapabilities()
+        {
+           /* string capURLS = "";
+            capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>";
+            capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>";
+            //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>";
+            //capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>";
+            return capURLS;*/
+
+            LLSDCapsDetails caps = new LLSDCapsDetails();
+            caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath;
+            caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory;
+            return caps;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string MapLayer(string request, string path, string param)
+        {
+            Encoding _enc = System.Text.Encoding.UTF8;
+            Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
+            LLSDMapRequest mapReq = new LLSDMapRequest();
+            LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
+
+            LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
+            mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
+            string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
+            
+            //Console.WriteLine(" Maplayer response is " + res);
+          
+            return res;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected LLSDMapLayer BuildLLSDMapLayerResponse()
+        {
+            LLSDMapLayer mapLayer = new LLSDMapLayer();
+            mapLayer.Right = 5000;
+            mapLayer.Top = 5000;
+            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+
+            return mapLayer;
+        }
+
+        public string ProcessEventQueue(string request, string path, string param)
+        {
+            //  Console.WriteLine("event queue request " + request);
+            string res = "";
+            int timer = 0;
+
+            /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
+             {
+                 timer++;
+             }*/
+            if (this.CapsEventQueue.Count > 0)
+            {
+                lock (this.CapsEventQueue)
+                {
+                    string item = CapsEventQueue.Dequeue();
+                    res = item;
+                }
+            }
+            else
+            {
+                res = this.CreateEmptyEventResponse();
+            }
+            return res;
+        }
+
+        public string CreateEstablishAgentComms(string caps, string ipAddressPort)
+        {
+            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
+            res += "<key>events</key><array><map>";
+            res += "<key>message</key><string>EstablishAgentCommunication</string>";
+            res += "<key>body</key><map>";
+            res += "<key>sim-ip-and-port</key><string>" + ipAddressPort + "</string>";
+            res += "<key>seed-capability</key><string>" + caps + "</string>";
+            res += "<key>agent-id</key><uuid>" + this.agentID.ToStringHyphenated() + "</uuid>";
+            res += "</map>";
+            res += "</map></array>";
+            res += "</map></llsd>";
+            eventQueueCount++;
+            this.CapsEventQueue.Enqueue(res);
+            return res;
+        }
+
+        public string CreateEmptyEventResponse()
+        {
+            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
+            res += "<key>events</key><array><map>";
+            res += "</map></array>";
+            res += "</map></llsd>";
+            eventQueueCount++;
+            return res;
+        }
+
+        public string NewAgentInventory(string request, string path, string param)
+        {
+            //Console.WriteLine("received upload request:"+ request);
+            string res = "";
+            LLUUID newAsset = LLUUID.Random();
+            LLUUID newInvItem = LLUUID.Random();
+            string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
+            AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
+            httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
+            string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
+            //Console.WriteLine("uploader url is " + uploaderURL);
+            res += "<llsd><map>";
+            res += "<key>uploader</key><string>" + uploaderURL + "</string>";
+            //res += "<key>success</key><boolean>true</boolean>";
+            res += "<key>state</key><string>upload</string>";
+            res += "</map></llsd>";
+            uploader.OnUpLoad += this.UploadHandler;
+            return res;
+        }
+
+        public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
+        {
+            // Console.WriteLine("upload handler called");
+            AssetBase asset;
+            asset = new AssetBase();
+            asset.FullID = assetID;
+            asset.Type = 0;
+            asset.InvType = 0;
+            asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
+            asset.Data = data;
+            this.assetCache.AddAsset(asset);
+        }
+
+        public class AssetUploader
+        {
+            public event UpLoadedTexture OnUpLoad;
+
+            private string uploaderPath = "";
+            private LLUUID newAssetID;
+            private LLUUID inventoryItemID;
+            private BaseHttpServer httpListener;
+            public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
+            {
+                newAssetID = assetID;
+                inventoryItemID = inventoryItem;
+                uploaderPath = path;
+                httpListener = httpServer;
+
+            }
+
+            public string uploaderCaps(string request, string path, string param)
+            {
+                Encoding _enc = System.Text.Encoding.UTF8;
+                byte[] data = _enc.GetBytes(request);
+                //Console.WriteLine("recieved upload " + Util.FieldToString(data));
+                LLUUID inv = this.inventoryItemID;
+                string res = "";
+                res += "<llsd><map>";
+                res += "<key>new_asset</key><string>" + newAssetID.ToStringHyphenated() + "</string>";
+                res += "<key>new_inventory_item</key><uuid>" + inv.ToStringHyphenated() + "</uuid>";
+                res += "<key>state</key><string>complete</string>";
+                res += "</map></llsd>";
+
+               // Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
+                httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
+                if (OnUpLoad != null)
+                {
+                    OnUpLoad(newAssetID, inv, data);
+                }
+
+                /*FileStream fs = File.Create("upload.jp2");
+                BinaryWriter bw = new BinaryWriter(fs);
+                bw.Write(data);
+                bw.Close();
+                fs.Close();*/
+                return res;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Caps/LLSDHelpers.cs b/OpenSim/Region/Caps/LLSDHelpers.cs
new file mode 100644
index 0000000..051520c
--- /dev/null
+++ b/OpenSim/Region/Caps/LLSDHelpers.cs
@@ -0,0 +1,246 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Xml;
+using libsecondlife;
+
+namespace OpenSim.Framework
+{
+    public class LLSDHelpers
+    {
+        public static string SerialiseLLSDReply(object obj)
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter writer = new XmlTextWriter(sw);
+            writer.Formatting = Formatting.None;
+            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+            LLSDHelpers.SerializeLLSDType(writer, obj);
+            writer.WriteEndElement();
+            writer.Close();
+            return sw.ToString();
+        }
+
+        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
+        {
+            Type myType = obj.GetType();
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            if (llsdattributes.Length > 0)
+            {
+                switch (llsdattributes[0].ObjectType)
+                {
+                    case "MAP":
+                        writer.WriteStartElement(String.Empty, "map", String.Empty);
+                        System.Reflection.FieldInfo[] fields = myType.GetFields();
+                        for (int i = 0; i < fields.Length; i++)
+                        {
+                            object fieldValue = fields[i].GetValue(obj);
+                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
+                            if (fieldAttributes.Length > 0)
+                            {
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteString(fields[i].Name);
+                                writer.WriteEndElement();
+                                SerializeLLSDType(writer, fieldValue);
+                            }
+                            else
+                            {
+                                //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteString(fields[i].Name);
+                                writer.WriteEndElement();
+                                LLSD.LLSDWriteOne(writer, fieldValue);
+                            }
+                        }
+                        writer.WriteEndElement();
+                        break;
+                    case "ARRAY":
+                        // LLSDArray arrayObject = obj as LLSDArray;
+                        // ArrayList a = arrayObject.Array;
+                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
+                        writer.WriteStartElement(String.Empty, "array", String.Empty);
+                        foreach (object item in a)
+                        {
+                            SerializeLLSDType(writer, item);
+                        }
+                        writer.WriteEndElement();
+                        break;
+                }
+            }
+            else
+            {
+                LLSD.LLSDWriteOne(writer, obj);
+            }
+        }
+
+        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
+        {
+            Type myType = obj.GetType();
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            if (llsdattributes.Length > 0)
+            {
+                switch (llsdattributes[0].ObjectType)
+                {
+                    case "MAP":
+                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
+                        while (enumerator.MoveNext())
+                        {
+                            System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
+                            if (field != null)
+                            {
+                                if (enumerator.Value is Hashtable)
+                                {
+                                    object fieldValue = field.GetValue(obj);
+                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
+                                }
+                                else if (enumerator.Value is ArrayList)
+                                {
+                                    object fieldValue = field.GetValue(obj);
+                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
+                                    //TODO
+                                    // the LLSD map/array types in the array need to be deserialised
+                                    // but first we need to know the right class to deserialise them into. 
+                                }
+                                else
+                                {
+                                    field.SetValue(obj, enumerator.Value);
+                                }
+                            }
+                        }
+                        break;
+                }
+            }
+            return obj;
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDMapLayerResponse
+    {
+        public LLSDMapRequest AgentData = new LLSDMapRequest();
+        public LLSDArray LayerData = new LLSDArray();
+
+        public LLSDMapLayerResponse()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDCapsDetails
+    {
+        public string MapLayer = "";
+        public string NewFileAgentInventory = "";
+        //public string EventQueueGet = "";
+
+        public LLSDCapsDetails()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDMapLayer
+    {
+        public int Left = 0;
+        public int Right = 0;
+        public int Top = 0;
+        public int Bottom = 0;
+        public LLUUID ImageID = LLUUID.Zero;
+
+        public LLSDMapLayer()
+        {
+           
+        }
+    }
+
+    [LLSDType("ARRAY")]
+    public class LLSDArray
+    {
+        public ArrayList Array = new ArrayList();
+
+        public LLSDArray()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDMapRequest
+    {
+        public int Flags = 0;
+
+        public LLSDMapRequest()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDUploadReply
+    {
+        public string new_asset = "";
+        public LLUUID new_inventory_item = LLUUID.Zero;
+        public string state = "";
+
+        public LLSDUploadReply()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDCapEvent
+    {
+        public int id = 0;
+        public LLSDArray events = new LLSDArray();
+
+        public LLSDCapEvent()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDEmpty
+    {
+        public LLSDEmpty()
+        {
+
+        }
+    }
+
+    [LLSDType("MAP")]
+    public class LLSDTest
+    {
+        public int Test1 = 20;
+        public int Test2 = 10;
+
+        public LLSDTest()
+        {
+
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Class)]
+    public class LLSDType : Attribute
+    {
+        private string myType;
+
+        public LLSDType(string type)
+        {
+            myType = type;
+
+        }
+
+        public string ObjectType
+        {
+            get
+            {
+                return myType;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
new file mode 100644
index 0000000..5d5021c
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -0,0 +1,337 @@
+/*
+* 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 libsecondlife;
+using OpenSim;
+using libsecondlife.Packets;
+//using OpenSim.GridServers;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Interfaces;
+
+namespace OpenSim.Assets
+{
+    /// <summary>
+    /// Description of InventoryManager.
+    /// </summary>
+    public class InventoryCache
+    {
+        private Dictionary<LLUUID, AgentInventory> _agentsInventory;
+        private List<UserServerRequest> _serverRequests; //list of requests made to user server.
+        private System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+        private const uint FULL_MASK_PERMISSIONS = 2147483647;
+
+        public InventoryCache()
+        {
+            _agentsInventory = new Dictionary<LLUUID, AgentInventory>();
+            _serverRequests = new List<UserServerRequest>();
+        }
+
+        public void AddNewAgentsInventory(AgentInventory agentInventory)
+        {
+            if (!this._agentsInventory.ContainsKey(agentInventory.AgentID))
+            {
+                this._agentsInventory.Add(agentInventory.AgentID, agentInventory);
+            }
+        }
+
+        public AgentInventory FetchAgentsInventory(LLUUID agentID, IUserServer userserver)
+        {
+            AgentInventory res = null;
+            if (!this._agentsInventory.ContainsKey(agentID))
+            {
+                res = userserver.RequestAgentsInventory(agentID);
+                this._agentsInventory.Add(agentID,res);
+            }
+            return res;
+        }
+
+        public AgentInventory GetAgentsInventory(LLUUID agentID)
+        {
+            if (this._agentsInventory.ContainsKey(agentID))
+            {
+                return this._agentsInventory[agentID];
+            }
+
+            return null;
+        }
+
+        public void ClientLeaving(LLUUID clientID, IUserServer userserver)
+        { 
+            if (this._agentsInventory.ContainsKey(clientID))
+            {
+                if (userserver != null)
+                {
+                    userserver.UpdateAgentsInventory(clientID, this._agentsInventory[clientID]);
+                }
+                this._agentsInventory.Remove(clientID);
+            }
+        }
+
+        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID)
+        {
+            return this.CreateNewInventoryFolder(remoteClient, folderID, 0);
+        }
+
+        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type)
+        {
+            bool res = false;
+            if (folderID != LLUUID.Zero)  //don't create a folder with a zero id
+            {
+                if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+                {
+                    res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type);
+                }
+            }
+            return res;
+        }
+
+        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)
+        {
+            bool res = false;
+            if (folderID != LLUUID.Zero)  //don't create a folder with a zero id
+            {
+                if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+                {
+                    res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type, folderName, parent);
+                }
+            }
+            return res;
+        }
+
+        public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)
+        {
+            LLUUID newItem = null;
+            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+            {
+                newItem = this._agentsInventory[remoteClient.AgentID].AddToInventory(folderID, asset);
+                if (newItem != null)
+                {
+                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[newItem];
+                    this.SendItemUpdateCreate(remoteClient, Item);
+                }
+            }
+
+            return newItem;
+        }
+        public bool DeleteInventoryItem(ClientView remoteClient, LLUUID itemID)
+        {
+            bool res = false;
+            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+            {
+                res = this._agentsInventory[remoteClient.AgentID].DeleteFromInventory(itemID);
+                if (res)
+                {
+                    RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket();
+                    remove.AgentData.AgentID = remoteClient.AgentID;
+                    remove.AgentData.SessionID = remoteClient.SessionID;
+                    remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1];
+                    remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock();
+                    remove.InventoryData[0].ItemID = itemID;
+                    remoteClient.OutPacket(remove);
+                }
+            }
+
+            return res;
+        }
+
+        public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)
+        {
+            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+            {
+                bool res = _agentsInventory[remoteClient.AgentID].UpdateItemAsset(itemID, asset);
+                if (res)
+                {
+                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
+                    this.SendItemUpdateCreate(remoteClient, Item);
+                }
+                return res;
+            }
+
+            return false;
+        }
+
+        public bool UpdateInventoryItemDetails(ClientView remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
+        {
+            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+            {
+                bool res = _agentsInventory[remoteClient.AgentID].UpdateItemDetails(itemID, packet);
+                if (res)
+                {
+                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
+                    this.SendItemUpdateCreate(remoteClient, Item);
+                }
+                return res;
+            }
+
+            return false;
+        }
+
+        public void FetchInventoryDescendents(ClientView userInfo, FetchInventoryDescendentsPacket FetchDescend)
+        {
+            if (this._agentsInventory.ContainsKey(userInfo.AgentID))
+            {
+                AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
+                if (FetchDescend.InventoryData.FetchItems)
+                {
+                    if (agentInventory.InventoryFolders.ContainsKey(FetchDescend.InventoryData.FolderID))
+                    {
+                        InventoryFolder Folder = agentInventory.InventoryFolders[FetchDescend.InventoryData.FolderID];
+                        InventoryDescendentsPacket Descend = new InventoryDescendentsPacket();
+                        Descend.AgentData.AgentID = userInfo.AgentID;
+                        Descend.AgentData.OwnerID = Folder.OwnerID;
+                        Descend.AgentData.FolderID = FetchDescend.InventoryData.FolderID;
+                        Descend.AgentData.Descendents = Folder.Items.Count;
+                        Descend.AgentData.Version = Folder.Items.Count;
+
+
+                        Descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[Folder.Items.Count];
+                        for (int i = 0; i < Folder.Items.Count; i++)
+                        {
+
+                            InventoryItem Item = Folder.Items[i];
+                            Descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
+                            Descend.ItemData[i].ItemID = Item.ItemID;
+                            Descend.ItemData[i].AssetID = Item.AssetID;
+                            Descend.ItemData[i].CreatorID = Item.CreatorID;
+                            Descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].CreationDate = 1000;
+                            Descend.ItemData[i].Description = _enc.GetBytes(Item.Description + "\0");
+                            Descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].Flags = 1;
+                            Descend.ItemData[i].FolderID = Item.FolderID;
+                            Descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+                            Descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].InvType = Item.InvType;
+                            Descend.ItemData[i].Name = _enc.GetBytes(Item.Name + "\0");
+                            Descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].OwnerID = Item.OwnerID;
+                            Descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].SalePrice = 100;
+                            Descend.ItemData[i].SaleType = 0;
+                            Descend.ItemData[i].Type = Item.Type;
+                            Descend.ItemData[i].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+                        }
+                        
+                        userInfo.OutPacket(Descend);
+
+                    }
+                }
+                else
+                {
+                    Console.WriteLine("fetch subfolders");
+                }
+            }
+        }
+
+        public void FetchInventory(ClientView userInfo, FetchInventoryPacket FetchItems)
+        {
+            if (this._agentsInventory.ContainsKey(userInfo.AgentID))
+            {
+                AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
+
+                for (int i = 0; i < FetchItems.InventoryData.Length; i++)
+                {
+                    if (agentInventory.InventoryItems.ContainsKey(FetchItems.InventoryData[i].ItemID))
+                    {
+                        InventoryItem Item = agentInventory.InventoryItems[FetchItems.InventoryData[i].ItemID];
+                        FetchInventoryReplyPacket InventoryReply = new FetchInventoryReplyPacket();
+                        InventoryReply.AgentData.AgentID = userInfo.AgentID;
+                        InventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];
+                        InventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
+                        InventoryReply.InventoryData[0].ItemID = Item.ItemID;
+                        InventoryReply.InventoryData[0].AssetID = Item.AssetID;
+                        InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
+                        InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+                        InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
+                        InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].Flags = 0;
+                        InventoryReply.InventoryData[0].FolderID = Item.FolderID;
+                        InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+                        InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].InvType = Item.InvType;
+                        InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
+                        InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
+                        InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].SalePrice = 100;
+                        InventoryReply.InventoryData[0].SaleType = 0;
+                        InventoryReply.InventoryData[0].Type = Item.Type;
+                        InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+                        userInfo.OutPacket(InventoryReply);
+                    }
+                }
+            }
+        }
+
+        private void SendItemUpdateCreate(ClientView remoteClient, InventoryItem Item)
+        {
+
+            UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();
+            InventoryReply.AgentData.AgentID = remoteClient.AgentID;
+            InventoryReply.AgentData.SimApproved = true;
+            InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
+            InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
+            InventoryReply.InventoryData[0].ItemID = Item.ItemID;
+            InventoryReply.InventoryData[0].AssetID = Item.AssetID;
+            InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
+            InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].CreationDate = 1000;
+            InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
+            InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].Flags = 0;
+            InventoryReply.InventoryData[0].FolderID = Item.FolderID;
+            InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+            InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].InvType = Item.InvType;
+            InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
+            InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
+            InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].SalePrice = 100;
+            InventoryReply.InventoryData[0].SaleType = 0;
+            InventoryReply.InventoryData[0].Type = Item.Type;
+            InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+
+            remoteClient.OutPacket(InventoryReply);
+        }
+    }
+
+
+
+    public class UserServerRequest
+    {
+        public UserServerRequest()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
new file mode 100644
index 0000000..7552195
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Net;
+using System.Net.Sockets;
+using libsecondlife;
+
+
+namespace OpenSim
+{
+
+    public interface ClientStackNetworkHandler
+    {
+        void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode);// EndPoint packetSender);
+        void RemoveClientCircuit(uint circuitcode);
+        void RegisterPacketServer(PacketServer server);
+    }
+
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
new file mode 100644
index 0000000..902f3c7
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -0,0 +1,975 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
+
+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim
+{
+    partial class ClientView
+    {
+        public event ChatFromViewer OnChatFromViewer;
+        public event RezObject OnRezObject;
+        public event GenericCall4 OnDeRezObject;
+        public event ModifyTerrain OnModifyTerrain;
+        public event GenericCall OnRegionHandShakeReply;
+        public event GenericCall OnRequestWearables;
+        public event SetAppearance OnSetAppearance;
+        public event GenericCall2 OnCompleteMovementToRegion;
+        public event UpdateAgent OnAgentUpdate;
+        public event StartAnim OnStartAnim;
+        public event GenericCall OnRequestAvatarsData;
+        public event LinkObjects OnLinkObjects;
+        public event UpdateVector OnGrapObject;
+        public event ObjectSelect OnDeGrapObject;
+        public event MoveObject OnGrapUpdate;
+        public event GenericCall4 OnAddPrim;
+        public event UpdateShape OnUpdatePrimShape;
+        public event ObjectSelect OnObjectSelect;
+        public event UpdatePrimFlags OnUpdatePrimFlags;
+        public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event UpdateVector OnUpdatePrimPosition;
+        public event UpdatePrimRotation OnUpdatePrimRotation;
+        public event UpdateVector OnUpdatePrimScale;
+        public event StatusChange OnChildAgentStatus;
+        public event GenericCall2 OnStopMovement;
+        public event NewAvatar OnNewAvatar;
+        public event GenericCall6 OnRemoveAvatar;
+        public event RequestMapBlocks OnRequestMapBlocks;
+        public event TeleportLocationRequest OnTeleportLocationRequest;
+
+        public event ParcelPropertiesRequest OnParcelPropertiesRequest;
+        public event ParcelDivideRequest OnParcelDivideRequest;
+        public event ParcelJoinRequest OnParcelJoinRequest;
+        public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
+
+        public event EstateOwnerMessageRequest OnEstateOwnerMessage;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public LLVector3 StartPos
+        {
+            get
+            {
+                return startpos;
+            }
+            set
+            {
+                startpos = value;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public LLUUID AgentId
+        {
+            get
+            {
+                return this.AgentID;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string FirstName
+        {
+            get
+            {
+                return this.firstName;
+            }
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string LastName
+        {
+            get
+            {
+                return this.lastName;
+            }
+        }
+
+        #region World/Avatar to Client
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        public void SendRegionHandshake(RegionInfo regionInfo)
+        {
+            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+            RegionHandshakePacket handshake = new RegionHandshakePacket();
+
+            handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;
+            handshake.RegionInfo.IsEstateManager = false;
+            handshake.RegionInfo.TerrainHeightRange00 = regionInfo.estateSettings.terrainHeightRange0;
+            handshake.RegionInfo.TerrainHeightRange01 = regionInfo.estateSettings.terrainHeightRange1;
+            handshake.RegionInfo.TerrainHeightRange10 = regionInfo.estateSettings.terrainHeightRange2;
+            handshake.RegionInfo.TerrainHeightRange11 = regionInfo.estateSettings.terrainHeightRange3;
+            handshake.RegionInfo.TerrainStartHeight00 = regionInfo.estateSettings.terrainStartHeight0;
+            handshake.RegionInfo.TerrainStartHeight01 = regionInfo.estateSettings.terrainStartHeight1;
+            handshake.RegionInfo.TerrainStartHeight10 = regionInfo.estateSettings.terrainStartHeight2;
+            handshake.RegionInfo.TerrainStartHeight11 = regionInfo.estateSettings.terrainStartHeight3;
+            handshake.RegionInfo.SimAccess = (byte)regionInfo.estateSettings.simAccess;
+            handshake.RegionInfo.WaterHeight = regionInfo.estateSettings.waterHeight;
+
+
+            handshake.RegionInfo.RegionFlags = (uint)regionInfo.estateSettings.regionFlags;
+
+            handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.RegionName + "\0");
+            handshake.RegionInfo.SimOwner = regionInfo.MasterAvatarAssignedUUID;
+            handshake.RegionInfo.TerrainBase0 = regionInfo.estateSettings.terrainBase0;
+            handshake.RegionInfo.TerrainBase1 = regionInfo.estateSettings.terrainBase1;
+            handshake.RegionInfo.TerrainBase2 = regionInfo.estateSettings.terrainBase2;
+            handshake.RegionInfo.TerrainBase3 = regionInfo.estateSettings.terrainBase3;
+            handshake.RegionInfo.TerrainDetail0 = regionInfo.estateSettings.terrainDetail0;
+            handshake.RegionInfo.TerrainDetail1 = regionInfo.estateSettings.terrainDetail1;
+            handshake.RegionInfo.TerrainDetail2 = regionInfo.estateSettings.terrainDetail2;
+            handshake.RegionInfo.TerrainDetail3 = regionInfo.estateSettings.terrainDetail3;
+            handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
+
+            this.OutPacket(handshake);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regInfo"></param>
+        public void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look)
+        {
+            AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
+            mov.AgentData.SessionID = this.SessionID;
+            mov.AgentData.AgentID = this.AgentID;
+            mov.Data.RegionHandle = regInfo.RegionHandle;
+            mov.Data.Timestamp = 1172750370; // TODO - dynamicalise this
+
+            if ((pos.X  == 0) && (pos.Y  == 0) && (pos.Z  == 0))
+            {
+                mov.Data.Position = this.startpos;
+            }
+            else
+            {
+                mov.Data.Position = pos;
+            }
+            mov.Data.LookAt = look;
+
+            OutPacket(mov);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="type"></param>
+        /// <param name="fromPos"></param>
+        /// <param name="fromName"></param>
+        /// <param name="fromAgentID"></param>
+        public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+        {
+            SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="type"></param>
+        /// <param name="fromPos"></param>
+        /// <param name="fromName"></param>
+        /// <param name="fromAgentID"></param>
+        public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+        {
+            System.Text.Encoding enc = System.Text.Encoding.ASCII;
+            libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
+            reply.ChatData.Audible = 1;
+            reply.ChatData.Message = message;
+            reply.ChatData.ChatType = type;
+            reply.ChatData.SourceType = 1;
+            reply.ChatData.Position = fromPos;
+            reply.ChatData.FromName = enc.GetBytes(fromName + "\0");
+            reply.ChatData.OwnerID = fromAgentID;
+            reply.ChatData.SourceID = fromAgentID;
+
+            this.OutPacket(reply);
+        }
+
+
+        /// <summary>
+        ///  Send the region heightmap to the client
+        /// </summary>
+        /// <param name="map">heightmap</param>
+        public virtual void SendLayerData(float[] map)
+        {
+            try
+            {
+                int[] patches = new int[4];
+
+                for (int y = 0; y < 16; y++)
+                {
+                    for (int x = 0; x < 16; x = x + 4)
+                    {
+                        patches[0] = x + 0 + y * 16;
+                        patches[1] = x + 1 + y * 16;
+                        patches[2] = x + 2 + y * 16;
+                        patches[3] = x + 3 + y * 16;
+
+                        Packet layerpack = TerrainManager.CreateLandPacket(map, patches);
+                        OutPacket(layerpack);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Sends a specified patch to a client
+        /// </summary>
+        /// <param name="px">Patch coordinate (x) 0..16</param>
+        /// <param name="py">Patch coordinate (y) 0..16</param>
+        /// <param name="map">heightmap</param>
+        public void SendLayerData(int px, int py, float[] map)
+        {
+            try
+            {
+                int[] patches = new int[1];
+                int patchx, patchy;
+                patchx = px / 16;
+                patchy = py / 16;
+
+                patches[0] = patchx + 0 + patchy * 16;
+
+                Packet layerpack = TerrainManager.CreateLandPacket(map, patches);
+                OutPacket(layerpack);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="neighbourHandle"></param>
+        /// <param name="neighbourIP"></param>
+        /// <param name="neighbourPort"></param>
+        public void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort)
+        {
+            EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
+            enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
+            enablesimpacket.SimulatorInfo.Handle = neighbourHandle;
+
+            byte[] byteIP = neighbourIP.GetAddressBytes();
+            enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
+            enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
+            enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
+            enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
+            enablesimpacket.SimulatorInfo.Port = neighbourPort;
+            OutPacket(enablesimpacket);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public AgentCircuitData RequestClientInfo()
+        {
+            AgentCircuitData agentData = new AgentCircuitData();
+            agentData.AgentID = this.AgentId;
+            agentData.SessionID = this.SessionID;
+            agentData.SecureSessionID = this.SecureSessionID;
+            agentData.circuitcode = this.CircuitCode;
+            agentData.child = false;
+            agentData.firstname = this.firstName;
+            agentData.lastname = this.lastName;
+
+            return agentData;
+        }
+
+        public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort)
+        {
+            LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10);
+
+            CrossedRegionPacket newSimPack = new CrossedRegionPacket();
+            newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock();
+            newSimPack.AgentData.AgentID = this.AgentID;
+            newSimPack.AgentData.SessionID = this.SessionID;
+            newSimPack.Info = new CrossedRegionPacket.InfoBlock();
+            newSimPack.Info.Position = pos;
+            newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f);	// copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
+            newSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();
+            newSimPack.RegionData.RegionHandle = newRegionHandle;
+            byte[] byteIP = newRegionIP.GetAddressBytes();
+            newSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
+            newSimPack.RegionData.SimIP += (uint)byteIP[2] << 16;
+            newSimPack.RegionData.SimIP += (uint)byteIP[1] << 8;
+            newSimPack.RegionData.SimIP += (uint)byteIP[0];
+            newSimPack.RegionData.SimPort = newRegionPort;
+            newSimPack.RegionData.SeedCapability = new byte[0];
+
+            this.OutPacket(newSimPack);
+            //this.DowngradeClient();
+        }
+
+        public void SendMapBlock(List<MapBlockData> mapBlocks)
+        {
+            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+
+            MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
+            mapReply.AgentData.AgentID = this.AgentID;
+            mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks.Count];
+            mapReply.AgentData.Flags = 0;
+
+            for (int i = 0; i < mapBlocks.Count; i++)
+            {
+                mapReply.Data[i] = new MapBlockReplyPacket.DataBlock();
+                mapReply.Data[i].MapImageID = mapBlocks[i].MapImageId;
+                mapReply.Data[i].X = mapBlocks[i].X;
+                mapReply.Data[i].Y = mapBlocks[i].Y;
+                mapReply.Data[i].WaterHeight = mapBlocks[i].WaterHeight;
+                mapReply.Data[i].Name = _enc.GetBytes(mapBlocks[i].Name);
+                mapReply.Data[i].RegionFlags = mapBlocks[i].RegionFlags;
+                mapReply.Data[i].Access = mapBlocks[i].Access;
+                mapReply.Data[i].Agents = mapBlocks[i].Agents; 
+            }
+            this.OutPacket(mapReply);
+        }
+
+        public void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags)
+        {
+            TeleportLocalPacket tpLocal = new TeleportLocalPacket();
+            tpLocal.Info.AgentID = this.AgentID;
+            tpLocal.Info.TeleportFlags = flags;
+            tpLocal.Info.LocationID = 2;
+            tpLocal.Info.LookAt = lookAt;
+            tpLocal.Info.Position = position;
+            OutPacket(tpLocal);
+        }
+
+        public void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags)
+        {
+            TeleportFinishPacket teleport = new TeleportFinishPacket();
+            teleport.Info.AgentID = this.AgentID;
+            teleport.Info.RegionHandle = regionHandle;
+            teleport.Info.SimAccess = simAccess;
+            teleport.Info.SeedCapability = new byte[0];
+
+            System.Net.IPAddress oIP = System.Net.IPAddress.Parse(ipAddress);
+            byte[] byteIP = oIP.GetAddressBytes();
+            uint ip = (uint)byteIP[3] << 24;
+            ip += (uint)byteIP[2] << 16;
+            ip += (uint)byteIP[1] << 8;
+            ip += (uint)byteIP[0];
+
+            teleport.Info.SimIP = ip;
+            teleport.Info.SimPort = ipPort;
+            teleport.Info.LocationID = 4;
+            teleport.Info.TeleportFlags = 1 << 4; 
+            OutPacket(teleport);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendTeleportCancel()
+        {
+            TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+            tpCancel.Info.SessionID = this.SessionID;
+            tpCancel.Info.AgentID = this.AgentID;
+
+            OutPacket(tpCancel);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendTeleportLocationStart()
+        {
+            TeleportStartPacket tpStart = new TeleportStartPacket();
+            tpStart.Info.TeleportFlags = 16; // Teleport via location
+            OutPacket(tpStart);
+        }
+
+        public void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance)
+        {
+            MoneyBalanceReplyPacket money = new MoneyBalanceReplyPacket();
+            money.MoneyData.AgentID = this.AgentID;
+            money.MoneyData.TransactionID = transaction;
+            money.MoneyData.TransactionSuccess = success;
+            money.MoneyData.Description = description;
+            money.MoneyData.MoneyBalance = balance;
+            OutPacket(money);
+        }
+
+        #region Appearance/ Wearables Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="wearables"></param>
+        public void SendWearables(AvatarWearable[] wearables)
+        {
+            AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
+            aw.AgentData.AgentID = this.AgentID;
+            aw.AgentData.SerialNum = 0;
+            aw.AgentData.SessionID = this.SessionID;
+
+            aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
+            AgentWearablesUpdatePacket.WearableDataBlock awb;
+            for (int i = 0; i < wearables.Length; i++)
+            {
+                awb = new AgentWearablesUpdatePacket.WearableDataBlock();
+                awb.WearableType = (byte)i;
+                awb.AssetID = wearables[i].AssetID;
+                awb.ItemID = wearables[i].ItemID;
+                aw.WearableData[i] = awb;
+            }
+
+            this.OutPacket(aw);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="visualParams"></param>
+        /// <param name="textureEntry"></param>
+        public void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry)
+        {
+            AvatarAppearancePacket avp = new AvatarAppearancePacket();
+            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
+            avp.ObjectData.TextureEntry = textureEntry;
+
+            AvatarAppearancePacket.VisualParamBlock avblock = null;
+            for (int i = 0; i < visualParams.Length; i++)
+            {
+                avblock = new AvatarAppearancePacket.VisualParamBlock();
+                avblock.ParamValue = visualParams[i];
+                avp.VisualParam[i] = avblock;
+            }
+
+            avp.Sender.IsTrial = false;
+            avp.Sender.ID = agentID;
+            OutPacket(avp);
+        }
+
+        #endregion
+
+        #region Avatar Packet/data sending Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <param name="firstName"></param>
+        /// <param name="lastName"></param>
+        /// <param name="avatarID"></param>
+        /// <param name="avatarLocalID"></param>
+        /// <param name="Pos"></param>
+        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry)
+        {
+            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+            //send a objectupdate packet with information about the clients avatar
+
+            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
+            objupdate.RegionData.RegionHandle = regionHandle;
+            objupdate.RegionData.TimeDilation = 64096;
+            objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
+            objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry);
+            //give this avatar object a local id and assign the user a name
+
+            objupdate.ObjectData[0].ID = avatarLocalID;
+            objupdate.ObjectData[0].FullID = avatarID;
+            objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + " \0");
+            libsecondlife.LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);
+            byte[] pb = pos2.GetBytes();
+            Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
+
+            OutPacket(objupdate);
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="timeDilation"></param>
+        /// <param name="localID"></param>
+        /// <param name="position"></param>
+        /// <param name="velocity"></param>
+        public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity)
+        {
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = this.CreateAvatarImprovedBlock(localID, position, velocity);
+            ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
+            terse.RegionData.RegionHandle = regionHandle;
+            terse.RegionData.TimeDilation = timeDilation;
+            terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
+            terse.ObjectData[0] = terseBlock;
+
+            this.OutPacket(terse);
+        }
+
+        #endregion
+
+        #region Primitive Packet/data Sending Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="rotation"></param>
+        /// <param name="attachPoint"></param>
+        public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
+        {
+            ObjectAttachPacket attach = new ObjectAttachPacket();
+            attach.AgentData.AgentID = this.AgentID;
+            attach.AgentData.SessionID = this.SessionID;
+            attach.AgentData.AttachmentPoint = attachPoint;
+            attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
+            attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
+            attach.ObjectData[0].ObjectLocalID = localID;
+            attach.ObjectData[0].Rotation = rotation;
+
+            this.OutPacket(attach);
+        }
+
+        /// <summary>
+        /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive 
+        /// or big changes to a existing primitive.
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="timeDilation"></param>
+        /// <param name="localID"></param>
+        /// <param name="primData"></param>
+        /// <param name="pos"></param>
+        /// <param name="rotation"></param>
+        /// <param name="textureID"></param>
+        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags)
+        {
+            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+            outPacket.RegionData.RegionHandle = regionHandle;
+            outPacket.RegionData.TimeDilation = timeDilation;
+            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID, flags);
+            outPacket.ObjectData[0].ID = localID;
+            outPacket.ObjectData[0].FullID = primData.FullID;
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+            byte[] rot = rotation.GetBytes();
+            Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 48, rot.Length);
+            OutPacket(outPacket);
+        }
+
+        /// <summary>
+        /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive 
+        /// or big changes to a existing primitive.
+        /// Uses default rotation
+        /// </summary>
+        /// <param name="primData"></param>
+        /// <param name="pos"></param>
+        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID , uint flags)
+        {
+            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+            outPacket.RegionData.RegionHandle = regionHandle;
+            outPacket.RegionData.TimeDilation = timeDilation;
+            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID, flags);
+            outPacket.ObjectData[0].ID = localID;
+            outPacket.ObjectData[0].FullID = primData.FullID;
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+
+            OutPacket(outPacket);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="timeDilation"></param>
+        /// <param name="localID"></param>
+        /// <param name="position"></param>
+        /// <param name="rotation"></param>
+        public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation)
+        {
+            ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
+            terse.RegionData.RegionHandle = regionHandle;
+            terse.RegionData.TimeDilation = timeDilation;
+            terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
+            terse.ObjectData[0] = this.CreatePrimImprovedBlock(localID, position, rotation);
+
+            this.OutPacket(terse);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Helper Methods
+
+        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateAvatarImprovedBlock(uint localID, LLVector3 pos, LLVector3 velocity)
+        {
+            byte[] bytes = new byte[60];
+            int i = 0;
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
+
+            dat.TextureEntry = new byte[0];// AvatarTemplate.TextureEntry;
+
+            uint ID = localID;
+
+            bytes[i++] = (byte)(ID % 256);
+            bytes[i++] = (byte)((ID >> 8) % 256);
+            bytes[i++] = (byte)((ID >> 16) % 256);
+            bytes[i++] = (byte)((ID >> 24) % 256);
+            bytes[i++] = 0;
+            bytes[i++] = 1;
+            i += 14;
+            bytes[i++] = 128;
+            bytes[i++] = 63;
+
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, bytes, i, pb.Length);
+            i += 12;
+            ushort InternVelocityX;
+            ushort InternVelocityY;
+            ushort InternVelocityZ;
+            Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0);
+
+            internDirec = new Axiom.MathLib.Vector3(velocity.X, velocity.Y, velocity.Z);
+
+            internDirec = internDirec / 128.0f;
+            internDirec.x += 1;
+            internDirec.y += 1;
+            internDirec.z += 1;
+
+            InternVelocityX = (ushort)(32768 * internDirec.x);
+            InternVelocityY = (ushort)(32768 * internDirec.y);
+            InternVelocityZ = (ushort)(32768 * internDirec.z);
+
+            ushort ac = 32767;
+            bytes[i++] = (byte)(InternVelocityX % 256);
+            bytes[i++] = (byte)((InternVelocityX >> 8) % 256);
+            bytes[i++] = (byte)(InternVelocityY % 256);
+            bytes[i++] = (byte)((InternVelocityY >> 8) % 256);
+            bytes[i++] = (byte)(InternVelocityZ % 256);
+            bytes[i++] = (byte)((InternVelocityZ >> 8) % 256);
+
+            //accel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            //rot
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            //rotation vel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            dat.Data = bytes;
+            return (dat);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="position"></param>
+        /// <param name="rotation"></param>
+        /// <returns></returns>
+        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreatePrimImprovedBlock(uint localID, LLVector3 position, LLQuaternion rotation)
+        {
+            uint ID = localID;
+            byte[] bytes = new byte[60];
+
+            int i = 0;
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
+            dat.TextureEntry = new byte[0];
+            bytes[i++] = (byte)(ID % 256);
+            bytes[i++] = (byte)((ID >> 8) % 256);
+            bytes[i++] = (byte)((ID >> 16) % 256);
+            bytes[i++] = (byte)((ID >> 24) % 256);
+            bytes[i++] = 0;
+            bytes[i++] = 0;
+
+            byte[] pb = position.GetBytes();
+            Array.Copy(pb, 0, bytes, i, pb.Length);
+            i += 12;
+            ushort ac = 32767;
+
+            //vel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            //accel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            ushort rw, rx, ry, rz;
+            rw = (ushort)(32768 * (rotation.W + 1));
+            rx = (ushort)(32768 * (rotation.X + 1));
+            ry = (ushort)(32768 * (rotation.Y + 1));
+            rz = (ushort)(32768 * (rotation.Z + 1));
+
+            //rot
+            bytes[i++] = (byte)(rx % 256);
+            bytes[i++] = (byte)((rx >> 8) % 256);
+            bytes[i++] = (byte)(ry % 256);
+            bytes[i++] = (byte)((ry >> 8) % 256);
+            bytes[i++] = (byte)(rz % 256);
+            bytes[i++] = (byte)((rz >> 8) % 256);
+            bytes[i++] = (byte)(rw % 256);
+            bytes[i++] = (byte)((rw >> 8) % 256);
+
+            //rotation vel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            dat.Data = bytes;
+            return dat;
+        }
+
+
+        /// <summary>
+        /// Create the ObjectDataBlock for a ObjectUpdatePacket  (for a Primitive)
+        /// </summary>
+        /// <param name="primData"></param>
+        /// <returns></returns>
+        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimData primData, LLUUID textureID, uint flags)
+        {
+            ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
+            this.SetDefaultPrimPacketValues(objupdate);
+            objupdate.UpdateFlags = flags;
+            this.SetPrimPacketShapeData(objupdate, primData, textureID);
+
+            return objupdate;
+        }
+
+        /// <summary>
+        /// Copy the data from a PrimData object to a ObjectUpdatePacket
+        /// </summary>
+        /// <param name="objectData"></param>
+        /// <param name="primData"></param>
+        protected void SetPrimPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData, PrimData primData, LLUUID textureID)
+        {
+            LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);
+            objectData.TextureEntry = ntex.ToBytes();
+            objectData.OwnerID = primData.OwnerID;
+            objectData.PCode = primData.PCode;
+            objectData.PathBegin = primData.PathBegin;
+            objectData.PathEnd = primData.PathEnd;
+            objectData.PathScaleX = primData.PathScaleX;
+            objectData.PathScaleY = primData.PathScaleY;
+            objectData.PathShearX = primData.PathShearX;
+            objectData.PathShearY = primData.PathShearY;
+            objectData.PathSkew = primData.PathSkew;
+            objectData.ProfileBegin = primData.ProfileBegin;
+            objectData.ProfileEnd = primData.ProfileEnd;
+            objectData.Scale = primData.Scale;
+            objectData.PathCurve = primData.PathCurve;
+            objectData.ProfileCurve = primData.ProfileCurve;
+            objectData.ParentID = primData.ParentID;
+            objectData.ProfileHollow = primData.ProfileHollow;
+            objectData.PathRadiusOffset = primData.PathRadiusOffset;
+            objectData.PathRevolutions = primData.PathRevolutions;
+            objectData.PathTaperX = primData.PathTaperX;
+            objectData.PathTaperY = primData.PathTaperY;
+            objectData.PathTwist = primData.PathTwist;
+            objectData.PathTwistBegin = primData.PathTwistBegin;
+        }
+
+        /// <summary>
+        /// Set some default values in a ObjectUpdatePacket
+        /// </summary>
+        /// <param name="objdata"></param>
+        protected void SetDefaultPrimPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
+        {
+            objdata.PSBlock = new byte[0];
+            objdata.ExtraParams = new byte[1];
+            objdata.MediaURL = new byte[0];
+            objdata.NameValue = new byte[0];
+            objdata.Text = new byte[0];
+            objdata.TextColor = new byte[4];
+            objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
+            objdata.JointPivot = new LLVector3(0, 0, 0);
+            objdata.Material = 3;
+            objdata.TextureAnim = new byte[0];
+            objdata.Sound = LLUUID.Zero;
+            objdata.State = 0;
+            objdata.Data = new byte[0];
+
+            objdata.ObjectData = new byte[60];
+            objdata.ObjectData[46] = 128;
+            objdata.ObjectData[47] = 63;
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
+        {
+            libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); //  new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
+
+            SetDefaultAvatarPacketValues(ref objdata);
+            objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
+            objdata.PathCurve = 16;
+            objdata.ProfileCurve = 1;
+            objdata.PathScaleX = 100;
+            objdata.PathScaleY = 100;
+            objdata.ParentID = 0;
+            objdata.OwnerID = LLUUID.Zero;
+            objdata.Scale = new LLVector3(1, 1, 1);
+            objdata.PCode = 47;
+            if (textureEntry != null)
+            {
+                objdata.TextureEntry = textureEntry;
+            }
+            System.Text.Encoding enc = System.Text.Encoding.ASCII;
+            libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
+            pos.X = 100f;
+            objdata.ID = 8880000;
+            objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
+            libsecondlife.LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
+            //objdata.FullID=user.AgentID;
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
+
+            return objdata;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="objdata"></param>
+        protected void SetDefaultAvatarPacketValues(ref ObjectUpdatePacket.ObjectDataBlock objdata)
+        {
+            objdata.PSBlock = new byte[0];
+            objdata.ExtraParams = new byte[1];
+            objdata.MediaURL = new byte[0];
+            objdata.NameValue = new byte[0];
+            objdata.Text = new byte[0];
+            objdata.TextColor = new byte[4];
+            objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
+            objdata.JointPivot = new LLVector3(0, 0, 0);
+            objdata.Material = 4;
+            objdata.TextureAnim = new byte[0];
+            objdata.Sound = LLUUID.Zero;
+            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
+            objdata.TextureEntry = ntex.ToBytes();
+            objdata.State = 0;
+            objdata.Data = new byte[0];
+
+            objdata.ObjectData = new byte[76];
+            objdata.ObjectData[15] = 128;
+            objdata.ObjectData[16] = 63;
+            objdata.ObjectData[56] = 128;
+            objdata.ObjectData[61] = 102;
+            objdata.ObjectData[62] = 40;
+            objdata.ObjectData[63] = 61;
+            objdata.ObjectData[64] = 189;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <returns></returns>
+        protected PrimData CreatePrimFromObjectAdd(ObjectAddPacket addPacket)
+        {
+            PrimData PData = new PrimData();
+            PData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            PData.PCode = addPacket.ObjectData.PCode;
+            PData.PathBegin = addPacket.ObjectData.PathBegin;
+            PData.PathEnd = addPacket.ObjectData.PathEnd;
+            PData.PathScaleX = addPacket.ObjectData.PathScaleX;
+            PData.PathScaleY = addPacket.ObjectData.PathScaleY;
+            PData.PathShearX = addPacket.ObjectData.PathShearX;
+            PData.PathShearY = addPacket.ObjectData.PathShearY;
+            PData.PathSkew = addPacket.ObjectData.PathSkew;
+            PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
+            PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
+            PData.Scale = addPacket.ObjectData.Scale;
+            PData.PathCurve = addPacket.ObjectData.PathCurve;
+            PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
+            PData.ParentID = 0;
+            PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
+            PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
+            PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
+            PData.PathTaperX = addPacket.ObjectData.PathTaperX;
+            PData.PathTaperY = addPacket.ObjectData.PathTaperY;
+            PData.PathTwist = addPacket.ObjectData.PathTwist;
+            PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
+
+            return PData;
+        }
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
new file mode 100644
index 0000000..914c38a
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -0,0 +1,358 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Assets;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Utilities;
+using OpenSim.Caches;
+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim
+{
+    partial class ClientView
+    {
+        public class AgentAssetUpload
+        {
+            private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>();
+            private ClientView ourClient;
+            private AssetCache m_assetCache;
+            private InventoryCache m_inventoryCache;
+
+            public AgentAssetUpload(ClientView client, AssetCache assetCache, InventoryCache inventoryCache)
+            {
+                this.ourClient = client;
+                m_assetCache = assetCache;
+                m_inventoryCache = inventoryCache;
+            }
+
+            public void AddUpload(LLUUID transactionID, AssetBase asset)
+            {
+                AssetTransaction upload = new AssetTransaction();
+                lock (this.transactions)
+                {
+                    upload.Asset = asset;
+                    upload.TransactionID = transactionID;
+                    this.transactions.Add(transactionID, upload);
+                }
+                if (upload.Asset.Data.Length > 2)
+                {
+                    //is complete
+                    upload.UploadComplete = true;
+                    AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+                    response.AssetBlock.Type = asset.Type;
+                    response.AssetBlock.Success = true;
+                    response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID);
+                    this.ourClient.OutPacket(response);
+                    m_assetCache.AddAsset(asset);
+                }
+                else
+                {
+                    upload.UploadComplete = false;
+                    upload.XferID = Util.GetNextXferID();
+                    RequestXferPacket xfer = new RequestXferPacket();
+                    xfer.XferID.ID = upload.XferID;
+                    xfer.XferID.VFileType = upload.Asset.Type;
+                    xfer.XferID.VFileID = transactionID.Combine(this.ourClient.SecureSessionID);
+                    xfer.XferID.FilePath = 0;
+                    xfer.XferID.Filename = new byte[0];
+                    this.ourClient.OutPacket(xfer);
+                }
+
+            }
+
+            public AssetBase GetUpload(LLUUID transactionID)
+            {
+                if (this.transactions.ContainsKey(transactionID))
+                {
+                    return this.transactions[transactionID].Asset;
+                }
+
+                return null;
+            }
+
+            public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
+            {
+                // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
+                AssetBase asset = null;
+                if (pack.AssetBlock.Type == 0)
+                {
+
+                    //first packet for transaction
+                    asset = new AssetBase();
+                    asset.FullID = assetID;
+                    asset.Type = pack.AssetBlock.Type;
+                    asset.InvType = asset.Type;
+                    asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
+                    asset.Data = pack.AssetBlock.AssetData;
+
+
+                }
+                else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5 | pack.AssetBlock.Type == 7)
+                {
+
+                    asset = new AssetBase();
+                    asset.FullID = assetID;
+                    //  Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated());
+                    asset.Type = pack.AssetBlock.Type;
+                    asset.InvType = asset.Type;
+                    asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000");
+                    asset.Data = pack.AssetBlock.AssetData;
+
+
+                }
+
+                if (asset != null)
+                {
+                    this.AddUpload(pack.AssetBlock.TransactionID, asset);
+                }
+                else
+                {
+
+                    //currently we don't support this asset type 
+                    //so lets just tell the client that the upload is complete
+                    AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+                    response.AssetBlock.Type = pack.AssetBlock.Type;
+                    response.AssetBlock.Success = true;
+                    response.AssetBlock.UUID = pack.AssetBlock.TransactionID.Combine(this.ourClient.SecureSessionID);
+                    this.ourClient.OutPacket(response);
+                }
+
+            }
+
+            #region Xfer packet system for larger uploads
+
+            public void HandleXferPacket(SendXferPacketPacket xferPacket)
+            {
+                lock (this.transactions)
+                {
+                    foreach (AssetTransaction trans in this.transactions.Values)
+                    {
+                        if (trans.XferID == xferPacket.XferID.ID)
+                        {
+                            if (trans.Asset.Data.Length > 1)
+                            {
+                                byte[] newArray = new byte[trans.Asset.Data.Length + xferPacket.DataPacket.Data.Length];
+                                Array.Copy(trans.Asset.Data, 0, newArray, 0, trans.Asset.Data.Length);
+                                Array.Copy(xferPacket.DataPacket.Data, 0, newArray, trans.Asset.Data.Length, xferPacket.DataPacket.Data.Length);
+                                trans.Asset.Data = newArray;
+                            }
+                            else
+                            {
+                                byte[] newArray = new byte[xferPacket.DataPacket.Data.Length - 4];
+                                Array.Copy(xferPacket.DataPacket.Data, 4, newArray, 0, xferPacket.DataPacket.Data.Length - 4);
+                                trans.Asset.Data = newArray;
+                            }
+
+                            if ((xferPacket.XferID.Packet & 2147483648) != 0)
+                            {
+                                //end of transfer
+                                trans.UploadComplete = true;
+                                AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+                                response.AssetBlock.Type = trans.Asset.Type;
+                                response.AssetBlock.Success = true;
+                                response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID);
+                                this.ourClient.OutPacket(response);
+
+                                m_assetCache.AddAsset(trans.Asset);
+                                //check if we should add it to inventory 
+                                if (trans.AddToInventory)
+                                {
+                                    // m_assetCache.AddAsset(trans.Asset);
+                                    m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);
+                                }
+
+
+                            }
+                            break;
+                        }
+
+                    }
+                }
+
+                ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();
+                confirmXfer.XferID.ID = xferPacket.XferID.ID;
+                confirmXfer.XferID.Packet = xferPacket.XferID.Packet;
+                this.ourClient.OutPacket(confirmXfer);
+            }
+
+            #endregion
+
+            public AssetBase AddUploadToAssetCache(LLUUID transactionID)
+            {
+                AssetBase asset = null;
+                if (this.transactions.ContainsKey(transactionID))
+                {
+                    AssetTransaction trans = this.transactions[transactionID];
+                    if (trans.UploadComplete)
+                    {
+                        m_assetCache.AddAsset(trans.Asset);
+                        asset = trans.Asset;
+                    }
+                }
+
+                return asset;
+            }
+
+            public void CreateInventoryItem(CreateInventoryItemPacket packet)
+            {
+                if (this.transactions.ContainsKey(packet.InventoryBlock.TransactionID))
+                {
+                    AssetTransaction trans = this.transactions[packet.InventoryBlock.TransactionID];
+                    trans.Asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
+                    trans.Asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
+                    trans.Asset.Type = packet.InventoryBlock.Type;
+                    trans.Asset.InvType = packet.InventoryBlock.InvType;
+                    if (trans.UploadComplete)
+                    {
+                        //already complete so we can add it to the inventory
+                        //m_assetCache.AddAsset(trans.Asset);
+                        m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset);
+                    }
+                    else
+                    {
+                        trans.AddToInventory = true;
+                        trans.InventFolder = packet.InventoryBlock.FolderID;
+                    }
+                }
+            }
+
+            private class AssetTransaction
+            {
+                public uint XferID;
+                public AssetBase Asset;
+                public bool AddToInventory;
+                public LLUUID InventFolder = LLUUID.Zero;
+                public bool UploadComplete = false;
+                public LLUUID TransactionID = LLUUID.Zero;
+
+                public AssetTransaction()
+                {
+
+                }
+            }
+
+            //new class , not currently used.
+            public class AssetXferUploader
+            {
+                private IClientAPI ourClient;
+
+                public bool UploadComplete = false;
+
+                public bool AddToInventory;
+                public LLUUID InventFolder = LLUUID.Zero;
+               
+                public uint XferID;
+                public AssetBase Asset;
+                public LLUUID TransactionID = LLUUID.Zero;
+
+
+                public AssetXferUploader(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data)
+                {
+                    ourClient = remoteClient;
+                    Asset = new AssetBase();
+                    Asset.FullID = assetID;
+                    Asset.InvType = type;
+                    Asset.Type = type;
+                    Asset.Data = data;
+                    Asset.Name = "blank";
+                    Asset.Description = "empty";
+                    TransactionID = transaction;
+
+                    if (Asset.Data.Length > 2)
+                    {
+                        //data block should only have data in it, if there is no more data to be uploaded
+                        this.SendCompleteMessage();
+                    }
+                    else
+                    {
+                        this.ReqestStartXfer();
+                    }
+                }
+
+                protected void SendCompleteMessage()
+                {
+                    UploadComplete = true;
+                    AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+                    response.AssetBlock.Type = Asset.Type;
+                    response.AssetBlock.Success = true;
+                    response.AssetBlock.UUID = Asset.FullID;
+                    this.ourClient.OutPacket(response);
+
+                    //TODO trigger event
+                }
+
+                protected void ReqestStartXfer()
+                {
+                    UploadComplete = false;
+                    XferID = Util.GetNextXferID();
+                    RequestXferPacket xfer = new RequestXferPacket();
+                    xfer.XferID.ID = XferID;
+                    xfer.XferID.VFileType = Asset.Type;
+                    xfer.XferID.VFileID = Asset.FullID;
+                    xfer.XferID.FilePath = 0;
+                    xfer.XferID.Filename = new byte[0];
+                    this.ourClient.OutPacket(xfer);
+                }
+
+                public void HandleXferPacket(uint xferID, uint packetID, byte[] data)
+                {
+                    if (XferID == xferID)
+                    {
+                        if (Asset.Data.Length > 1)
+                        {
+                            byte[] newArray = new byte[Asset.Data.Length + data.Length];
+                            Array.Copy(Asset.Data, 0, newArray, 0, Asset.Data.Length);
+                            Array.Copy(data, 0, newArray, Asset.Data.Length, data.Length);
+                            Asset.Data = newArray;
+                        }
+                        else
+                        {
+                            byte[] newArray = new byte[data.Length - 4];
+                            Array.Copy(data, 4, newArray, 0, data.Length - 4);
+                            Asset.Data = newArray;
+                        }
+
+                        ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();
+                        confirmXfer.XferID.ID = xferID;
+                        confirmXfer.XferID.Packet = packetID;
+                        this.ourClient.OutPacket(confirmXfer);
+
+                        if ((packetID & 2147483648) != 0)
+                        {
+                            this.SendCompleteMessage();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
new file mode 100644
index 0000000..32aed02
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -0,0 +1,198 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using Nwc.XmlRpc;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
+using System.Threading;
+using System.Timers;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+using OpenSim.Assets;
+
+namespace OpenSim
+{
+    public partial class ClientView
+    {
+        protected virtual void RegisterLocalPacketHandlers()
+        {
+            this.AddLocalPacketHandler(PacketType.LogoutRequest, this.Logout);
+            this.AddLocalPacketHandler(PacketType.AgentCachedTexture, this.AgentTextureCached);
+            this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate);
+        }
+
+        protected virtual bool Logout(ClientView simClient, Packet packet)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
+            //send reply to let the client logout
+            LogoutReplyPacket logReply = new LogoutReplyPacket();
+            logReply.AgentData.AgentID = this.AgentID;
+            logReply.AgentData.SessionID = this.SessionID;
+            logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
+            logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
+            logReply.InventoryData[0].ItemID = LLUUID.Zero;
+            OutPacket(logReply);
+            //tell all clients to kill our object
+            KillObjectPacket kill = new KillObjectPacket();
+            kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
+            kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
+            // kill.ObjectData[0].ID = this.ClientAvatar.localid;
+            foreach (ClientView client in m_clientThreads.Values)
+            {
+                client.OutPacket(kill);
+            }
+
+            this.m_inventoryCache.ClientLeaving(this.AgentID, null);
+
+
+           // m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
+            /*lock (m_world.Entities)
+            {
+                m_world.Entities.Remove(this.AgentID);
+            }*/
+            // m_world.RemoveViewerAgent(this);
+            //need to do other cleaning up here too
+            m_clientThreads.Remove(this.CircuitCode);
+            m_networkServer.RemoveClientCircuit(this.CircuitCode);
+            this.ClientThread.Abort();
+            return true;
+        }
+
+        protected bool AgentTextureCached(ClientView simclient, Packet packet)
+        {
+            // Console.WriteLine(packet.ToString());
+            AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;
+            AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();
+            cachedresp.AgentData.AgentID = this.AgentID;
+            cachedresp.AgentData.SessionID = this.SessionID;
+            cachedresp.AgentData.SerialNum = this.cachedtextureserial;
+            this.cachedtextureserial++;
+            cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length];
+            for (int i = 0; i < chechedtex.WearableData.Length; i++)
+            {
+                cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex;
+                cachedresp.WearableData[i].TextureID = LLUUID.Zero;
+                cachedresp.WearableData[i].HostName = new byte[0];
+            }
+            this.OutPacket(cachedresp);
+            return true;
+        }
+
+        protected bool MultipleObjUpdate(ClientView simClient, Packet packet)
+        {
+            MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
+            for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
+            {
+                if (multipleupdate.ObjectData[i].Type == 9) //change position
+                {
+                    if (OnUpdatePrimPosition != null)
+                    {
+                        libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+                        OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
+                    }
+                    //should update stored position of the prim
+                }
+                else if (multipleupdate.ObjectData[i].Type == 10)//rotation
+                {
+                    if (OnUpdatePrimRotation != null)
+                    {
+                        libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
+                        OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+                    }
+                }
+                else if (multipleupdate.ObjectData[i].Type == 13)//scale
+                {
+                    if (OnUpdatePrimScale != null)
+                    {
+                        libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+                        OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
+                    }
+                }
+            }
+            return true;
+        }
+
+        public void RequestMapLayer()
+        {
+            //should be getting the map layer from the grid server
+            //send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)
+            MapLayerReplyPacket mapReply = new MapLayerReplyPacket();
+            mapReply.AgentData.AgentID = this.AgentID;
+            mapReply.AgentData.Flags = 0;
+            mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
+            mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
+            mapReply.LayerData[0].Bottom = 0;
+            mapReply.LayerData[0].Left = 0;
+            mapReply.LayerData[0].Top = 30000;
+            mapReply.LayerData[0].Right = 30000;
+            mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+            this.OutPacket(mapReply);
+        }
+
+        public void RequestMapBlocks(int minX, int minY, int maxX, int maxY)
+        {
+            /*
+            IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);
+            MapBlockReplyPacket mbReply = new MapBlockReplyPacket();
+            mbReply.AgentData.AgentID = this.AgentID;
+            int len;
+            if (simMapProfiles == null)
+                len = 0;
+            else
+                len = simMapProfiles.Count;
+
+            mbReply.Data = new MapBlockReplyPacket.DataBlock[len];
+            int iii;
+            for (iii = 0; iii < len; iii++)
+            {
+                Hashtable mp = (Hashtable)simMapProfiles[iii];
+                mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();
+                mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]);
+                mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);
+                mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);
+                mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]);
+                mbReply.Data[iii].RegionFlags = System.Convert.ToUInt32(mp["region-flags"]);
+                mbReply.Data[iii].WaterHeight = System.Convert.ToByte(mp["water-height"]);
+                mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]);
+                mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);
+            }
+            this.OutPacket(mbReply);
+             */
+        }
+
+       
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
new file mode 100644
index 0000000..191ef21
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -0,0 +1,550 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using Nwc.XmlRpc;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
+using System.Threading;
+using System.Timers;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+using OpenSim.Assets;
+
+namespace OpenSim
+{
+    public partial class ClientView
+    {
+        protected override void ProcessInPacket(Packet Pack)
+        {
+            ack_pack(Pack);
+            if (debug)
+            {
+                if (Pack.Type != PacketType.AgentUpdate)
+                {
+                    Console.WriteLine(Pack.Type.ToString());
+                }
+            }
+
+            if (this.ProcessPacketMethod(Pack))
+            {
+                //there is a handler registered that handled this packet type 
+                return;
+            }
+            else
+            {
+                System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+
+                switch (Pack.Type)
+                {
+                    case PacketType.ViewerEffect:
+                        ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
+                        foreach (ClientView client in m_clientThreads.Values)
+                        {
+                            if (client.AgentID != this.AgentID)
+                            {
+                                viewer.AgentData.AgentID = client.AgentID;
+                                viewer.AgentData.SessionID = client.SessionID;
+                                client.OutPacket(viewer);
+                            }
+                        }
+                        break;
+
+                    #region  World/Avatar
+                    case PacketType.ChatFromViewer:
+                        ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
+                        if (Util.FieldToString(inchatpack.ChatData.Message) == "")
+                        {
+                            //empty message so don't bother with it
+                            break;
+                        }
+                        string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
+                        byte[] message = inchatpack.ChatData.Message;
+                        byte type = inchatpack.ChatData.Type;
+                        LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;
+                        LLUUID fromAgentID = AgentID;
+                        if (OnChatFromViewer != null)
+                        {
+                            this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+                    case PacketType.RezObject:
+                        RezObjectPacket rezPacket = (RezObjectPacket)Pack;
+                        AgentInventory inven = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
+                        if (inven != null)
+                        {
+                            if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))
+                            {
+                                AssetBase asset = this.m_assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);
+                                if (asset != null)
+                                {
+                                    if (OnRezObject != null)
+                                    {
+                                        this.OnRezObject(asset, rezPacket.RezData.RayEnd);
+                                        this.m_inventoryCache.DeleteInventoryItem(this, rezPacket.InventoryData.ItemID);
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                    case PacketType.DeRezObject:
+                        if (OnDeRezObject != null)
+                        {
+                            OnDeRezObject(Pack, this);
+                        }
+                        break;
+                    case PacketType.ModifyLand:
+                        ModifyLandPacket modify = (ModifyLandPacket)Pack;
+                        if (modify.ParcelData.Length > 0)
+                        {
+                            if (OnModifyTerrain != null)
+                            {
+                                OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, modify.ModifyBlock.BrushSize, 
+                                    modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
+                            }
+                        }
+                        break;
+                    case PacketType.RegionHandshakeReply:
+                        if (OnRegionHandShakeReply != null)
+                        {
+                            OnRegionHandShakeReply(this);
+                        }
+                        break;
+                    case PacketType.AgentWearablesRequest:
+                        if (OnRequestWearables != null)
+                        {
+                            OnRequestWearables(this);
+                        }
+                        if (OnRequestAvatarsData != null)
+                        {
+                            OnRequestAvatarsData(this);
+                        }
+                        break;
+                    case PacketType.AgentSetAppearance:
+                        AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
+                        if (OnSetAppearance != null)
+                        {
+                            OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
+                        }
+                        break;
+                    case PacketType.CompleteAgentMovement:
+                        if (OnCompleteMovementToRegion != null)
+                        {
+                            OnCompleteMovementToRegion();
+                        }
+                        break;
+                    case PacketType.AgentUpdate:
+                        if (OnAgentUpdate != null)
+                        {
+                            AgentUpdatePacket agenUpdate = (AgentUpdatePacket) Pack;
+                            OnAgentUpdate(this, agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotation );
+                        }
+                        break;
+                    case PacketType.AgentAnimation:
+                        if (!m_child)
+                        {
+                            AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
+                            for (int i = 0; i < AgentAni.AnimationList.Length; i++)
+                            {
+                                if (AgentAni.AnimationList[i].StartAnim)
+                                {
+                                    if (OnStartAnim != null)
+                                    {
+                                        OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
+                                    }
+                                }
+                            }
+                        }
+                        break;
+
+                    #endregion
+
+                    #region Objects/Prims
+                    case PacketType.ObjectLink:
+                        // OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());
+                        ObjectLinkPacket link = (ObjectLinkPacket)Pack;
+                        uint parentprimid = 0;
+                        List<uint> childrenprims = new List<uint>();
+                        if (link.ObjectData.Length > 1)
+                        {
+                            parentprimid = link.ObjectData[0].ObjectLocalID;
+
+                            for (int i = 1; i < link.ObjectData.Length; i++)
+                            {
+                                childrenprims.Add(link.ObjectData[i].ObjectLocalID);
+                            }
+                        }
+                        if (OnLinkObjects != null)
+                        {
+                            OnLinkObjects(parentprimid, childrenprims);
+                        }
+                        break;
+                    case PacketType.ObjectAdd:
+                        // m_world.AddNewPrim((ObjectAddPacket)Pack, this);
+                        if (OnAddPrim != null)
+                        {
+                            OnAddPrim(Pack, this);
+                        }
+                        break;
+                    case PacketType.ObjectShape:
+                        ObjectShapePacket shape = (ObjectShapePacket)Pack;
+                        for (int i = 0; i < shape.ObjectData.Length; i++)
+                        {
+                            if (OnUpdatePrimShape != null)
+                            {
+                                OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]);
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectSelect:
+                        ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
+                        for (int i = 0; i < incomingselect.ObjectData.Length; i++)
+                        {
+                            if (OnObjectSelect != null)
+                            {
+                                OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectFlagUpdate:
+                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
+                        if (OnUpdatePrimFlags != null)
+                        {
+                            OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);
+                        }
+                        break;
+                    case PacketType.ObjectImage:
+                        ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
+                        for (int i = 0; i < imagePack.ObjectData.Length; i++)
+                        {
+                            if (OnUpdatePrimTexture != null)
+                            {
+                                OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectGrab:
+                        ObjectGrabPacket grap = (ObjectGrabPacket)Pack;
+                        if (OnGrapObject != null)
+                        {
+                            OnGrapObject(grap.ObjectData.LocalID, grap.ObjectData.GrabOffset, this);
+                        }
+                        break;
+                    case PacketType.ObjectGrabUpdate:
+                        ObjectGrabUpdatePacket grapUpdate = (ObjectGrabUpdatePacket)Pack;
+                        if (OnGrapUpdate != null)
+                        {
+                            OnGrapUpdate(grapUpdate.ObjectData.ObjectID, grapUpdate.ObjectData.GrabOffsetInitial, grapUpdate.ObjectData.GrabPosition, this);
+                        }
+                        break;
+                    case PacketType.ObjectDeGrab:
+                        ObjectDeGrabPacket deGrap = (ObjectDeGrabPacket)Pack;
+                        if (OnDeGrapObject != null)
+                        {
+                            OnDeGrapObject(deGrap.ObjectData.LocalID, this);
+                        }
+                        break;
+                    #endregion
+
+                    #region Inventory/Asset/Other related packets
+                    case PacketType.RequestImage:
+                        RequestImagePacket imageRequest = (RequestImagePacket)Pack;
+                        for (int i = 0; i < imageRequest.RequestImage.Length; i++)
+                        {
+                            m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image);
+                        }
+                        break;
+                    case PacketType.TransferRequest:
+                        //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
+                        TransferRequestPacket transfer = (TransferRequestPacket)Pack;
+                        m_assetCache.AddAssetRequest(this, transfer);
+                        break;
+                    case PacketType.AssetUploadRequest:
+                        AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
+                        this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
+                        break;
+                    case PacketType.RequestXfer:
+                        //Console.WriteLine(Pack.ToString());
+                        break;
+                    case PacketType.SendXferPacket:
+                        this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
+                        break;
+                    case PacketType.CreateInventoryFolder:
+                        CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
+                        m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
+                        //Console.WriteLine(Pack.ToString());
+                        break;
+                    case PacketType.CreateInventoryItem:
+                        //Console.WriteLine(Pack.ToString());
+                        CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
+                        if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)
+                        {
+                            this.UploadAssets.CreateInventoryItem(createItem);
+                        }
+                        else
+                        {
+                            // Console.Write(Pack.ToString());
+                            this.CreateInventoryItem(createItem);
+                        }
+                        break;
+                    case PacketType.FetchInventory:
+                        //Console.WriteLine("fetch item packet");
+                        FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;
+                        m_inventoryCache.FetchInventory(this, FetchInventory);
+                        break;
+                    case PacketType.FetchInventoryDescendents:
+                        FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
+                        m_inventoryCache.FetchInventoryDescendents(this, Fetch);
+                        break;
+                    case PacketType.UpdateInventoryItem:
+                        UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
+                        //Console.WriteLine(Pack.ToString());
+                        for (int i = 0; i < update.InventoryData.Length; i++)
+                        {
+                            if (update.InventoryData[i].TransactionID != LLUUID.Zero)
+                            {
+                                AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
+                                if (asset != null)
+                                {
+                                    // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");
+                                    m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
+                                }
+                                else
+                                {
+                                    asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
+                                    if (asset != null)
+                                    {
+                                        //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");
+                                        m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
+                                    }
+                                    else
+                                    {
+                                        //Console.WriteLine("trying to update inventory item, but asset is null");
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;
+                            }
+                        }
+                        break;
+                    case PacketType.RequestTaskInventory:
+                        // Console.WriteLine(Pack.ToString());
+                        RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
+                        ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
+                        bool foundent = false;
+                        /* foreach (Entity ent in m_world.Entities.Values)
+                         {
+                             if (ent.localid == requesttask.InventoryData.LocalID)
+                             {
+                                 replytask.InventoryData.TaskID = ent.uuid;
+                                 replytask.InventoryData.Serial = 0;
+                                 replytask.InventoryData.Filename = new byte[0];
+                                 foundent = true;
+                             }
+                         }
+                         if (foundent)
+                         {
+                             this.OutPacket(replytask);
+                         }*/
+                        break;
+                    case PacketType.UpdateTaskInventory:
+                        // Console.WriteLine(Pack.ToString());
+                        UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
+                        AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
+                        /*if (myinventory != null)
+                        {
+                            if (updatetask.UpdateData.Key == 0)
+                            {
+                                if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)
+                                {
+                                    if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)
+                                    {
+                                        LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;
+                                        AssetBase assBase = this.m_assetCache.GetAsset(noteaid);
+                                        if (assBase != null)
+                                        {
+                                            foreach (Entity ent in m_world.Entities.Values)
+                                            {
+                                                if (ent.localid == updatetask.UpdateData.LocalID)
+                                                {
+                                                    if (ent is OpenSim.world.Primitive)
+                                                    {
+                                                        this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }*/
+                        break;
+                    case PacketType.MapLayerRequest:
+                        this.RequestMapLayer();
+                        break;
+                    case PacketType.MapBlockRequest:
+                        MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack;
+                        if (OnRequestMapBlocks != null)
+                        {
+                            OnRequestMapBlocks(this, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);
+                        }
+                        break;
+                    case PacketType.TeleportLandmarkRequest:
+                        TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack;
+
+                        TeleportStartPacket tpStart = new TeleportStartPacket();
+                        tpStart.Info.TeleportFlags = 8; // tp via lm
+                        this.OutPacket(tpStart);
+
+                        TeleportProgressPacket tpProgress = new TeleportProgressPacket();
+                        tpProgress.Info.Message = (new System.Text.ASCIIEncoding()).GetBytes("sending_landmark");
+                        tpProgress.Info.TeleportFlags = 8;
+                        tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
+                        this.OutPacket(tpProgress);
+
+                        // Fetch landmark
+                        LLUUID lmid = tpReq.Info.LandmarkID;
+                        AssetBase lma = this.m_assetCache.GetAsset(lmid);
+                        if (lma != null)
+                        {
+                            AssetLandmark lm = new AssetLandmark(lma);
+
+                            if (lm.RegionID == m_regionData.SimUUID)
+                            {
+                                TeleportLocalPacket tpLocal = new TeleportLocalPacket();
+
+                                tpLocal.Info.AgentID = tpReq.Info.AgentID;
+                                tpLocal.Info.TeleportFlags = 8;  // Teleport via landmark
+                                tpLocal.Info.LocationID = 2;
+                                tpLocal.Info.Position = lm.Position;
+                                OutPacket(tpLocal);
+                            }
+                            else
+                            {
+                                TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+                                tpCancel.Info.AgentID = tpReq.Info.AgentID;
+                                tpCancel.Info.SessionID = tpReq.Info.SessionID;
+                                OutPacket(tpCancel);
+                            }
+                        }
+                        else
+                        {
+                            Console.WriteLine("Cancelling Teleport - fetch asset not yet implemented");
+
+                            TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+                            tpCancel.Info.AgentID = tpReq.Info.AgentID;
+                            tpCancel.Info.SessionID = tpReq.Info.SessionID;
+                            OutPacket(tpCancel);
+                        }
+                        break;
+                    case PacketType.TeleportLocationRequest:
+                        TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;
+                        // Console.WriteLine(tpLocReq.ToString());
+
+                        if (OnTeleportLocationRequest != null)
+                        {
+                            OnTeleportLocationRequest(this, tpLocReq.Info.RegionHandle, tpLocReq.Info.Position, tpLocReq.Info.LookAt, 16);
+                        }
+                        else
+                        {
+                            //no event handler so cancel request
+                            TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+                            tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;
+                            tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;
+                            OutPacket(tpCancel);
+                        }
+                        break;
+                    #endregion
+
+                    case PacketType.MoneyBalanceRequest:
+                        this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
+                        break;
+
+                    #region Parcel related packets
+                    case PacketType.ParcelPropertiesRequest:
+                        ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
+                        if (OnParcelPropertiesRequest != null)
+                        {
+                            OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North), propertiesRequest.ParcelData.SequenceID, propertiesRequest.ParcelData.SnapSelection, this);
+                        }
+                        break;
+                    case PacketType.ParcelDivide:
+                        ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack;
+                        if (OnParcelDivideRequest != null)
+                        {
+                            OnParcelDivideRequest((int)Math.Round(parcelDivide.ParcelData.West), (int)Math.Round(parcelDivide.ParcelData.South), (int)Math.Round(parcelDivide.ParcelData.East), (int)Math.Round(parcelDivide.ParcelData.North), this);
+                        }
+                        break;
+                    case PacketType.ParcelJoin:
+                        ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack;
+                        if (OnParcelJoinRequest != null)
+                        {
+                            OnParcelJoinRequest((int)Math.Round(parcelJoin.ParcelData.West), (int)Math.Round(parcelJoin.ParcelData.South), (int)Math.Round(parcelJoin.ParcelData.East), (int)Math.Round(parcelJoin.ParcelData.North), this);
+                        }
+                        break;
+                    case PacketType.ParcelPropertiesUpdate:
+                        ParcelPropertiesUpdatePacket updatePacket = (ParcelPropertiesUpdatePacket)Pack;
+                        if (OnParcelPropertiesUpdateRequest != null)
+                        {
+                            OnParcelPropertiesUpdateRequest(updatePacket, this);
+                        }
+                        break;
+                    #endregion
+
+                    #region Estate Packets
+                    case PacketType.EstateOwnerMessage:
+                        EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
+                        if (OnEstateOwnerMessage != null)
+                        {
+                            OnEstateOwnerMessage(messagePacket, this);
+                        }
+                        break;
+                    #endregion
+
+                    #region unimplemented handlers
+                    case PacketType.AgentIsNowWearing:
+                        // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
+                        //Console.WriteLine(Pack.ToString());
+                        break;
+                    case PacketType.ObjectScale:
+                        //OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());
+                        break;
+                    #endregion
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
new file mode 100644
index 0000000..312da9d
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -0,0 +1,273 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using Nwc.XmlRpc;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
+using System.Threading;
+using System.Timers;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+using OpenSim.Assets;
+using OpenSim.Caches;
+
+namespace OpenSim
+{
+    public delegate bool PacketMethod(ClientView simClient, Packet packet);
+
+    /// <summary>
+    /// Handles new client connections
+    /// Constructor takes a single Packet and authenticates everything
+    /// </summary>
+    public partial class ClientView : ClientViewBase, IClientAPI
+    {
+        public static TerrainManager TerrainManager;
+
+        protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
+        protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance 
+
+        public LLUUID AgentID;
+        public LLUUID SessionID;
+        public LLUUID SecureSessionID = LLUUID.Zero;
+        public string firstName;
+        public string lastName;
+        public bool m_child = false;
+        private UseCircuitCodePacket cirpack;
+        public Thread ClientThread;
+        public LLVector3 startpos;
+
+        private AgentAssetUpload UploadAssets;
+        private LLUUID newAssetFolder = LLUUID.Zero;
+        private bool debug = false;
+        protected IWorld m_world;
+        private Dictionary<uint, ClientView> m_clientThreads;
+        private AssetCache m_assetCache;
+        private InventoryCache m_inventoryCache;
+        private int cachedtextureserial = 0;
+        private RegionInfo m_regionData;
+        protected AuthenticateSessionsBase m_authenticateSessionsHandler;
+
+        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
+        {
+            m_world = world;
+            m_clientThreads = clientThreads;
+            m_assetCache = assetCache;
+
+            m_networkServer = packServer;
+            m_inventoryCache = inventoryCache;
+            m_authenticateSessionsHandler = authenSessions;
+
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
+            cirpack = initialcirpack;
+            userEP = remoteEP;
+
+            this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
+
+            PacketQueue = new BlockingQueue<QueItem>();
+
+            this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
+            AckTimer = new System.Timers.Timer(500);
+            AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
+            AckTimer.Start();
+
+            this.RegisterLocalPacketHandlers();
+
+            ClientThread = new Thread(new ThreadStart(AuthUser));
+            ClientThread.IsBackground = true;
+            ClientThread.Start();
+        }
+
+        # region Client Methods
+
+        public void KillClient()
+        {
+            KillObjectPacket kill = new KillObjectPacket();
+            kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
+            kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
+            //kill.ObjectData[0].ID = this.ClientAvatar.localid;
+            foreach (ClientView client in m_clientThreads.Values)
+            {
+                client.OutPacket(kill);
+            }
+
+            this.m_inventoryCache.ClientLeaving(this.AgentID, null);
+            m_world.RemoveClient(this.AgentId);
+
+            m_clientThreads.Remove(this.CircuitCode);
+            m_networkServer.RemoveClientCircuit(this.CircuitCode);
+            this.ClientThread.Abort();
+        }
+        #endregion
+
+        # region Packet Handling
+        public static bool AddPacketHandler(PacketType packetType, PacketMethod handler)
+        {
+            bool result = false;
+            lock (PacketHandlers)
+            {
+                if (!PacketHandlers.ContainsKey(packetType))
+                {
+                    PacketHandlers.Add(packetType, handler);
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler)
+        {
+            bool result = false;
+            lock (m_packetHandlers)
+            {
+                if (!m_packetHandlers.ContainsKey(packetType))
+                {
+                    m_packetHandlers.Add(packetType, handler);
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        protected virtual bool ProcessPacketMethod(Packet packet)
+        {
+            bool result = false;
+            bool found = false;
+            PacketMethod method;
+            if (m_packetHandlers.TryGetValue(packet.Type, out method))
+            {
+                //there is a local handler for this packet type
+                result = method(this, packet);
+            }
+            else
+            {
+                //there is not a local handler so see if there is a Global handler
+                lock (PacketHandlers)
+                {
+                    found = PacketHandlers.TryGetValue(packet.Type, out method);
+                }
+                if (found)
+                {
+                    result = method(this, packet);
+                }
+            }
+            return result;
+        }
+
+        protected virtual void ClientLoop()
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");
+            while (true)
+            {
+                QueItem nextPacket = PacketQueue.Dequeue();
+                if (nextPacket.Incoming)
+                {
+                    //is a incoming packet
+                    ProcessInPacket(nextPacket.Packet);
+                }
+                else
+                {
+                    //is a out going packet
+                    ProcessOutPacket(nextPacket.Packet);
+                }
+            }
+        }
+        # endregion
+
+        # region Setup
+
+        protected virtual void InitNewClient()
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
+            this.m_world.AddNewClient(this, this.AgentID, false);
+        }
+
+        protected virtual void AuthUser()
+        {
+            // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
+            AuthenticateResponse sessionInfo = this.m_authenticateSessionsHandler.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
+            if (!sessionInfo.Authorised)
+            {
+                //session/circuit not authorised
+                OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
+                ClientThread.Abort();
+            }
+            else
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
+                //session is authorised
+                this.AgentID = cirpack.CircuitCode.ID;
+                this.SessionID = cirpack.CircuitCode.SessionID;
+                this.CircuitCode = cirpack.CircuitCode.Code;
+                this.firstName = sessionInfo.LoginInfo.First;
+                this.lastName = sessionInfo.LoginInfo.Last;
+
+                if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)
+                {
+                    this.SecureSessionID = sessionInfo.LoginInfo.SecureSession;
+                }
+                InitNewClient();
+
+                ClientLoop();
+            }
+        }
+        # endregion
+
+
+        protected override void KillThread()
+        {
+            this.ClientThread.Abort();
+        }
+
+        #region Inventory Creation
+        private void SetupInventory(AuthenticateResponse sessionInfo)
+        {
+
+        }
+        private AgentInventory CreateInventory(LLUUID baseFolder)
+        {
+            AgentInventory inventory = null;
+
+            return inventory;
+        }
+
+        private void CreateInventoryItem(CreateInventoryItemPacket packet)
+        {
+
+        }
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
new file mode 100644
index 0000000..8b503f0
--- /dev/null
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -0,0 +1,327 @@
+
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
+using System.Threading;
+using System.Timers;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Interfaces;
+
+namespace OpenSim
+{
+    public class ClientViewBase 
+    {
+        protected BlockingQueue<QueItem> PacketQueue;
+        protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
+        protected Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>();
+
+        protected System.Timers.Timer AckTimer;
+        protected uint Sequence = 0;
+        protected object SequenceLock = new object();
+        protected const int MAX_APPENDED_ACKS = 10;
+        protected const int RESEND_TIMEOUT = 4000;
+        protected const int MAX_SEQUENCE = 0xFFFFFF;
+
+        public uint CircuitCode;
+        public EndPoint userEP;
+
+        protected PacketServer m_networkServer;
+
+        public ClientViewBase()
+        {
+
+        }
+
+        protected virtual void ProcessInPacket(Packet Pack)
+        {
+
+        }
+
+        protected virtual void ProcessOutPacket(Packet Pack)
+        {
+            // Keep track of when this packet was sent out
+            Pack.TickCount = Environment.TickCount;
+
+            if (!Pack.Header.Resent)
+            {
+                // Set the sequence number
+                lock (SequenceLock)
+                {
+                    if (Sequence >= MAX_SEQUENCE)
+                        Sequence = 1;
+                    else
+                        Sequence++;
+                    Pack.Header.Sequence = Sequence;
+                }
+
+                if (Pack.Header.Reliable)  //DIRTY HACK
+                {
+                    lock (NeedAck)
+                    {
+                        if (!NeedAck.ContainsKey(Pack.Header.Sequence))
+                        {
+                            try
+                            {
+                                NeedAck.Add(Pack.Header.Sequence, Pack);
+                            }
+                            catch (Exception e) // HACKY
+                            {
+                                e.ToString();
+                                // Ignore
+                                // Seems to throw a exception here occasionally
+                                // of 'duplicate key' despite being locked.
+                                // !?!?!?
+                            }
+                        }
+                        else
+                        {
+                            //  Client.Log("Attempted to add a duplicate sequence number (" +
+                            //     packet.Header.Sequence + ") to the NeedAck dictionary for packet type " +
+                            //      packet.Type.ToString(), Helpers.LogLevel.Warning);
+                        }
+                    }
+
+                    // Don't append ACKs to resent packets, in case that's what was causing the
+                    // delivery to fail
+                    if (!Pack.Header.Resent)
+                    {
+                        // Append any ACKs that need to be sent out to this packet
+                        lock (PendingAcks)
+                        {
+                            if (PendingAcks.Count > 0 && PendingAcks.Count < MAX_APPENDED_ACKS &&
+                                Pack.Type != PacketType.PacketAck &&
+                                Pack.Type != PacketType.LogoutRequest)
+                            {
+                                Pack.Header.AckList = new uint[PendingAcks.Count];
+                                int i = 0;
+
+                                foreach (uint ack in PendingAcks.Values)
+                                {
+                                    Pack.Header.AckList[i] = ack;
+                                    i++;
+                                }
+
+                                PendingAcks.Clear();
+                                Pack.Header.AppendedAcks = true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            byte[] ZeroOutBuffer = new byte[4096];
+            byte[] sendbuffer;
+            sendbuffer = Pack.ToBytes();
+
+            try
+            {
+                if (Pack.Header.Zerocoded)
+                {
+                    int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
+                    m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP);
+                }
+                else
+                {
+                    m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP);
+                }
+            }
+            catch (Exception)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
+                this.KillThread();
+            }
+
+        }
+
+        public virtual void InPacket(Packet NewPack)
+        {
+            // Handle appended ACKs
+            if (NewPack.Header.AppendedAcks)
+            {
+                lock (NeedAck)
+                {
+                    foreach (uint ack in NewPack.Header.AckList)
+                    {
+                        NeedAck.Remove(ack);
+                    }
+                }
+            }
+
+            // Handle PacketAck packets
+            if (NewPack.Type == PacketType.PacketAck)
+            {
+                PacketAckPacket ackPacket = (PacketAckPacket)NewPack;
+
+                lock (NeedAck)
+                {
+                    foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
+                    {
+                        NeedAck.Remove(block.ID);
+                    }
+                }
+            }
+            else if ((NewPack.Type == PacketType.StartPingCheck))
+            {
+                //reply to pingcheck
+                libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack;
+                libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket();
+                endPing.PingID.PingID = startPing.PingID.PingID;
+                OutPacket(endPing);
+            }
+            else
+            {
+                QueItem item = new QueItem();
+                item.Packet = NewPack;
+                item.Incoming = true;
+                this.PacketQueue.Enqueue(item);
+            }
+
+        }
+
+        public virtual void OutPacket(Packet NewPack)
+        {
+            QueItem item = new QueItem();
+            item.Packet = NewPack;
+            item.Incoming = false;
+            this.PacketQueue.Enqueue(item);
+        }
+
+        # region Low Level Packet Methods
+
+        protected void ack_pack(Packet Pack)
+        {
+            if (Pack.Header.Reliable)
+            {
+                libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket();
+                ack_it.Packets = new PacketAckPacket.PacketsBlock[1];
+                ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();
+                ack_it.Packets[0].ID = Pack.Header.Sequence;
+                ack_it.Header.Reliable = false;
+
+                OutPacket(ack_it);
+
+            }
+            /*
+            if (Pack.Header.Reliable)
+            {
+                lock (PendingAcks)
+                {
+                    uint sequence = (uint)Pack.Header.Sequence;
+                    if (!PendingAcks.ContainsKey(sequence)) { PendingAcks[sequence] = sequence; }
+                }
+            }*/
+        }
+
+        protected void ResendUnacked()
+        {
+            int now = Environment.TickCount;
+
+            lock (NeedAck)
+            {
+                foreach (Packet packet in NeedAck.Values)
+                {
+                    if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
+                    {
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +
+                         (now - packet.TickCount) + "ms have passed");
+
+                        packet.Header.Resent = true;
+                        OutPacket(packet);
+                    }
+                }
+            }
+        }
+
+        protected void SendAcks()
+        {
+            lock (PendingAcks)
+            {
+                if (PendingAcks.Count > 0)
+                {
+                    if (PendingAcks.Count > 250)
+                    {
+                        // FIXME: Handle the odd case where we have too many pending ACKs queued up
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose( "Too many ACKs queued up!");
+                        return;
+                    }
+
+                    //OpenSim.Framework.Console.MainLog.Instance.WriteLine("Sending PacketAck");
+
+
+                    int i = 0;
+                    PacketAckPacket acks = new PacketAckPacket();
+                    acks.Packets = new PacketAckPacket.PacketsBlock[PendingAcks.Count];
+
+                    foreach (uint ack in PendingAcks.Values)
+                    {
+                        acks.Packets[i] = new PacketAckPacket.PacketsBlock();
+                        acks.Packets[i].ID = ack;
+                        i++;
+                    }
+
+                    acks.Header.Reliable = false;
+                    OutPacket(acks);
+
+                    PendingAcks.Clear();
+                }
+            }
+        }
+
+        protected void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)
+        {
+            SendAcks();
+            ResendUnacked();
+        }
+        #endregion
+
+        protected virtual void KillThread()
+        {
+
+        }
+
+        #region Nested Classes
+
+        public class QueItem
+        {
+            public QueItem()
+            {
+            }
+
+            public Packet Packet;
+            public bool Incoming;
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
new file mode 100644
index 0000000..0b19359
--- /dev/null
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -0,0 +1,173 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DC3698B2-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.ClientStack</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.ClientStack</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll" >
+      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.FrameworkGenericConfig.Xml" >
+      <HintPath>OpenSim.FrameworkGenericConfig.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
+      <Name>OpenSim.Region.Caches</Name>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
+      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
+      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ClientStackNetworkHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.AgentAssetUpload.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.API.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientView.ProcessPackets.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClientViewBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="PacketServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RegionApplicationBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UDPServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="VersionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Assets\InventoryCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
new file mode 100644
index 0000000..229570c
--- /dev/null
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -0,0 +1,183 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework;
+using System.Net;
+using System.Net.Sockets;
+using OpenSim.Assets;
+using OpenSim.Caches;
+
+namespace OpenSim
+{
+    public class PacketServer
+    {
+        private ClientStackNetworkHandler _networkHandler;
+        private IWorld _localWorld;
+        public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>();
+        public Dictionary<uint, IClientAPI> ClientAPIs = new Dictionary<uint, IClientAPI>();
+        protected uint serverPort;
+
+        public PacketServer(ClientStackNetworkHandler networkHandler, uint port)
+        {
+            _networkHandler = networkHandler;
+            this.serverPort = port;
+            _networkHandler.RegisterPacketServer(this);
+        }
+
+        public IWorld LocalWorld
+        {
+            set
+            {
+                this._localWorld = value;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="circuitCode"></param>
+        /// <param name="packet"></param>
+        public virtual void ClientInPacket(uint circuitCode, Packet packet)
+        {
+            if (this.ClientThreads.ContainsKey(circuitCode))
+            {
+                ClientThreads[circuitCode].InPacket(packet);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="circuitCode"></param>
+        /// <returns></returns>
+        public virtual bool AddNewCircuitCodeClient(uint circuitCode)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="packet"></param>
+        public virtual void SendPacketToAllClients(Packet packet)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="packet"></param>
+        /// <param name="simClient"></param>
+        public virtual void SendPacketToAllExcept(Packet packet, ClientView simClient)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="packetType"></param>
+        /// <param name="handler"></param>
+        public virtual void AddClientPacketHandler(PacketType packetType, PacketMethod handler)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual void RegisterClientPacketHandlers()
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteEP"></param>
+        /// <param name="initialcirpack"></param>
+        /// <param name="clientThreads"></param>
+        /// <param name="world"></param>
+        /// <param name="assetCache"></param>
+        /// <param name="packServer"></param>
+        /// <param name="inventoryCache"></param>
+        /// <param name="authenSessions"></param>
+        /// <returns></returns>
+        protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
+        {
+            return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions );
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="epSender"></param>
+        /// <param name="useCircuit"></param>
+        /// <param name="assetCache"></param>
+        /// <param name="inventoryCache"></param>
+        /// <param name="authenticateSessionsClass"></param>
+        /// <returns></returns>
+        public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass)
+        {
+            ClientView newuser =
+                CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache,
+                                authenticateSessionsClass);
+            
+            this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
+            this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);
+
+            return true;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="buffer"></param>
+        /// <param name="size"></param>
+        /// <param name="flags"></param>
+        /// <param name="circuitcode"></param>
+        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
+        {
+            this._networkHandler.SendPacketTo(buffer, size, flags, circuitcode);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="circuitcode"></param>
+        public virtual void RemoveClientCircuit(uint circuitcode)
+        {
+            this._networkHandler.RemoveClientCircuit(circuitcode);
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
new file mode 100644
index 0000000..b421fbd
--- /dev/null
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -0,0 +1,129 @@
+/*
+* 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.Text;
+using System.IO;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Terrain;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework;
+using OpenSim.Assets;
+using OpenSim.Caches;
+using OpenSim.Framework.Console;
+using OpenSim.Physics.Manager;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.GenericConfig;
+
+namespace OpenSim
+{
+    public class RegionApplicationBase
+    {
+        protected IGenericConfig localConfig;
+        protected PhysicsManager physManager;
+        protected AssetCache AssetCache;
+        protected InventoryCache InventoryCache;
+        protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
+        protected DateTime startuptime;
+        protected NetworkServersInfo serversData;
+
+        public string m_physicsEngine;
+        public bool m_sandbox = false;
+        public bool m_loginserver;
+        public bool user_accounts = false;
+        public bool gridLocalAsset = false;
+        protected bool configFileSetup = false;
+        public string m_config;
+
+        protected List<UDPServer> m_udpServer = new List<UDPServer>();
+        protected List<RegionInfo> regionData = new List<RegionInfo>();
+        protected List<IWorld> m_localWorld = new List<IWorld>();
+        protected BaseHttpServer httpServer;
+        protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>();
+
+        protected LogBase m_log;
+
+        public RegionApplicationBase()
+        {
+
+        }
+
+        public RegionApplicationBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
+        {
+            this.configFileSetup = useConfigFile;
+            m_sandbox = sandBoxMode;
+            m_loginserver = startLoginServer;
+            m_physicsEngine = physicsEngine;
+            m_config = configFile;
+        }
+
+        /*protected World m_localWorld;
+        public World LocalWorld
+        {
+            get { return m_localWorld; }
+        }*/
+
+        /// <summary>
+        /// Performs initialisation of the world, such as loading configuration from disk.
+        /// </summary>
+        public virtual void StartUp()
+        {
+        }
+
+        protected virtual void SetupLocalGridServers()
+        {
+        }
+
+        protected virtual void SetupRemoteGridServers()
+        {
+
+        }
+
+        protected virtual void SetupWorld()
+        {
+        }
+
+        protected virtual void SetupHttpListener()
+        {
+        }
+
+        protected virtual void ConnectToRemoteGridServer()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
new file mode 100644
index 0000000..f2a02d9
--- /dev/null
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -0,0 +1,208 @@
+/*
+* 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.Text;
+using System.IO;
+using System.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Terrain;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Assets;
+using OpenSim.Caches;
+using OpenSim.Framework.Console;
+using OpenSim.Framework;
+using Nwc.XmlRpc;
+using OpenSim.Servers;
+using OpenSim.GenericConfig;
+
+namespace OpenSim
+{
+
+    public class UDPServer : ClientStackNetworkHandler
+    {
+        protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
+        public Socket Server;
+        protected IPEndPoint ServerIncoming;
+        protected byte[] RecvBuffer = new byte[4096];
+        protected byte[] ZeroBuffer = new byte[8192];
+        protected IPEndPoint ipeSender;
+        protected EndPoint epSender;
+        protected AsyncCallback ReceivedData;
+        protected PacketServer _packetServer;
+
+        protected int listenPort;
+        protected IWorld m_localWorld;
+        protected AssetCache m_assetCache;
+        protected InventoryCache m_inventoryCache;
+        protected LogBase m_log;
+        protected AuthenticateSessionsBase m_authenticateSessionsClass;
+
+        public PacketServer PacketServer
+        {
+            get
+            {
+                return _packetServer;
+            }
+            set
+            {
+                _packetServer = value;
+            }
+        }
+
+        public IWorld LocalWorld
+        {
+            set
+            {
+                this.m_localWorld = value;
+                this._packetServer.LocalWorld = this.m_localWorld;
+            }
+        }
+
+        public UDPServer()
+        {
+        }
+
+        public UDPServer(int port, AssetCache assetCache, InventoryCache inventoryCache, LogBase console, AuthenticateSessionsBase authenticateClass)
+        {
+            listenPort = port;
+            this.m_assetCache = assetCache;
+            this.m_inventoryCache = inventoryCache;
+            this.m_log = console;
+            this.m_authenticateSessionsClass = authenticateClass;
+            this.CreatePacketServer();
+
+        }
+
+        protected virtual void CreatePacketServer()
+        {
+            PacketServer packetServer = new PacketServer(this, (uint) listenPort);
+        }
+
+        protected virtual void OnReceivedData(IAsyncResult result)
+        {
+            ipeSender = new IPEndPoint(IPAddress.Any, 0);
+            epSender = (EndPoint)ipeSender;
+            Packet packet = null;
+            int numBytes = Server.EndReceiveFrom(result, ref epSender);
+            int packetEnd = numBytes - 1;
+
+            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
+
+            // do we already have a circuit for this endpoint
+            if (this.clientCircuits.ContainsKey(epSender))
+            {
+                //if so then send packet to the packetserver
+                this._packetServer.ClientInPacket(this.clientCircuits[epSender], packet);
+            }
+            else if (packet.Type == PacketType.UseCircuitCode)
+            {
+                // new client
+                this.AddNewClient(packet);
+            }
+            else
+            { // invalid client
+                m_log.Warn("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
+            }
+
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+        }
+
+        protected virtual void AddNewClient(Packet packet)
+        {
+            UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
+            this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
+
+            this.PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_inventoryCache, m_authenticateSessionsClass); 
+        }
+
+        public void ServerListener()
+        {
+            m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
+
+            ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
+            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            Server.Bind(ServerIncoming);
+ 
+            m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
+
+            ipeSender = new IPEndPoint(IPAddress.Any, 0);
+            epSender = (EndPoint)ipeSender;
+            ReceivedData = new AsyncCallback(this.OnReceivedData);
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+
+            m_log.Verbose("UDPServer.cs:ServerListener() - Listening...");
+
+        }
+
+        public virtual void RegisterPacketServer(PacketServer server)
+        {
+            this._packetServer = server;
+        }
+
+        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)//EndPoint packetSender)
+        {
+            // find the endpoint for this circuit
+            EndPoint sendto = null;
+            foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)
+            {
+                if (p.Value == circuitcode)
+                {
+                    sendto = p.Key;
+                    break;
+                }
+            }
+            if (sendto != null)
+            {
+                //we found the endpoint so send the packet to it
+                this.Server.SendTo(buffer, size, flags, sendto);
+            }
+        }
+
+        public virtual void RemoveClientCircuit(uint circuitcode)
+        {
+            foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)
+            {
+                if (p.Value == circuitcode)
+                {
+                    this.clientCircuits.Remove(p.Key);
+                    break;
+                }
+            }
+        }
+
+      
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/VersionInfo.cs b/OpenSim/Region/ClientStack/VersionInfo.cs
new file mode 100644
index 0000000..5d1354e
--- /dev/null
+++ b/OpenSim/Region/ClientStack/VersionInfo.cs
@@ -0,0 +1,38 @@
+/*
+* 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;
+
+namespace OpenSim
+{
+    /// <summary>
+    /// </summary>
+    public class VersionInfo
+    {
+        public static string Version = "0.3, SVN build ";
+    }
+}
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
new file mode 100644
index 0000000..01e0c59
--- /dev/null
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Console;
+using libsecondlife;
+using OpenSim.Region;
+using Avatar=OpenSim.Region.Scenes.ScenePresence;
+using OpenSim.Region.Scenes;
+using OpenSim.Framework;
+using OpenSim.Caches;
+using OpenGrid.Framework.Communications;
+using OpenSim.Servers;
+
+namespace SimpleApp
+{
+    public class MyWorld : Scene
+    {
+        private RegionInfo m_regionInfo;
+        private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;
+
+        public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
+            : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
+        {
+            m_regionInfo = regionInfo;
+            m_avatars = new List<Avatar>();
+        }
+
+        public override void SendLayerData(IClientAPI remoteClient)
+        {
+            float[] map = new float[65536];
+
+            for (int i = 0; i < 65536; i++)
+            {
+                int x = i % 256;
+                int y = i / 256;
+
+                map[i] = (float)(x + y / 2);
+            }
+
+            remoteClient.SendLayerData(map);
+        }
+
+        #region IWorld Members
+
+        override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child)
+
+        {
+            LLVector3 pos = new LLVector3(128, 128, 128);
+            
+            client.OnRegionHandShakeReply += SendLayerData;
+            client.OnChatFromViewer +=
+                delegate(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+                    {
+                        // Echo it (so you know what you typed)
+                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero );
+                    };
+            
+            client.OnRequestWearables += SendWearables;
+
+            client.OnCompleteMovementToRegion += delegate()
+                {
+                    client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero );
+                };
+
+            client.OnCompleteMovementToRegion += delegate()
+                 {
+                     client.SendAvatarData(m_regionInfo.RegionHandle, client.FirstName,
+                                           client.LastName, client.AgentId, 0,
+                                           pos, null);
+                                                         
+                     client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero );
+                 };
+
+            client.SendRegionHandshake(m_regionInfo);
+
+            OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
+            
+        }
+
+        private void SendWearables( IClientAPI client )
+        {
+            client.SendWearables( AvatarWearable.DefaultWearables );
+        }
+
+
+       override public void RemoveClient(LLUUID agentID)
+        {
+
+        }
+
+        public RegionInfo RegionInfo
+        {
+            get { return m_regionInfo; }
+        }
+
+        public object SyncRoot
+        {
+            get { return this; }
+        }
+
+        private uint m_nextLocalId = 1;
+
+        public uint NextLocalId
+        {
+            get { return m_nextLocalId++; }
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
new file mode 100644
index 0000000..e1465d1
--- /dev/null
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim;
+using OpenSim.GridInterfaces.Local;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Console;
+using OpenSim.Assets;
+using libsecondlife;
+using OpenSim.Servers;
+using OpenSim.Framework;
+using OpenSim.Caches;
+using OpenGrid.Framework.Communications;
+using OpenSim.LocalCommunications;
+
+namespace SimpleApp
+{
+    class Program : IAssetReceiver, conscmd_callback
+    {
+        private LogBase m_log;
+        AuthenticateSessionsBase m_circuitManager;
+        
+        private void Run()
+        {
+            m_log = new LogBase(null, "SimpleApp", this, false);
+            MainLog.Instance = m_log;
+
+          //  CheckSumServer checksumServer = new CheckSumServer(12036);
+           // checksumServer.ServerListener();
+
+            string simAddr = "127.0.0.1";
+            int simPort = 9000;
+            /*
+            LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );
+            loginServer.Startup();
+            loginServer.SetSessionHandler( AddNewSessionHandler );*/
+
+            m_circuitManager = new AuthenticateSessionsBase();
+
+            InventoryCache inventoryCache = new InventoryCache();
+
+            LocalAssetServer assetServer = new LocalAssetServer();
+            assetServer.SetServerInfo("http://127.0.0.1:8003/", "");
+            assetServer.SetReceiver(this);
+
+            AssetCache assetCache = new AssetCache(assetServer);
+            
+            UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_log, m_circuitManager );
+            PacketServer packetServer = new PacketServer( udpServer, (uint) simPort );
+            udpServer.ServerListener();
+            
+            ClientView.TerrainManager = new TerrainManager(new SecondLife());
+
+            CommunicationsManager communicationsManager = new CommunicationsLocal(null);
+            
+            RegionInfo regionInfo = new RegionInfo( );
+            BaseHttpServer httpServer = new BaseHttpServer(simPort);
+            udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer );
+
+            // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);            
+            // PhysicsScene physicsScene = new NullPhysicsScene();
+            // world.PhysicsScene = physicsScene;
+            // udpServer.LocalWorld = world;
+
+          //  httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );
+            httpServer.Start();
+            
+            m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
+            m_log.ReadLine();
+        }
+
+        private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
+        {
+            m_log.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);
+
+            AgentCircuitData agent = new AgentCircuitData();
+            agent.AgentID = loginData.Agent;
+            agent.firstname = loginData.First;
+            agent.lastname = loginData.Last;
+            agent.SessionID = loginData.Session;
+            agent.SecureSessionID = loginData.SecureSession;
+            agent.circuitcode = loginData.CircuitCode;
+            agent.BaseFolder = loginData.BaseFolder;
+            agent.InventoryFolder = loginData.InventoryFolder;
+            agent.startpos = new LLVector3(128, 128, 70);
+
+            m_circuitManager.AddNewCircuit(agent.circuitcode, agent);
+
+            return true;
+        }
+        
+        #region IAssetReceiver Members
+
+        public void AssetReceived( AssetBase asset, bool IsTexture)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        public void AssetNotFound( AssetBase asset)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        #endregion
+
+        #region conscmd_callback Members
+
+        public void RunCmd(string cmd, string[] cmdparams)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        public void Show(string ShowWhat)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        #endregion
+
+        static void Main(string[] args)
+        {
+            Program app = new Program();
+
+            app.Run();
+        }
+    }
+}
diff --git a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0f9bf0f
--- /dev/null
+++ b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SimpleApp")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Playahead AB")]
+[assembly: AssemblyProduct("SimpleApp")]
+[assembly: AssemblyCopyright("Copyright © Playahead AB 2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a5cfa45f-5acf-4b2e-9c50-1dd1fd7608ee")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
new file mode 100644
index 0000000..5129be2
--- /dev/null
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -0,0 +1,154 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{24B12448-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>SimpleApp</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>SimpleApp</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Servers" >
+      <HintPath>OpenSim.Servers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data.dll" >
+      <HintPath>..\..\..\..\bin\System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
+      <Name>OpenSim.Framework.Communications</Name>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
+      <Name>OpenSim.Region.Caches</Name>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">
+      <Name>OpenSim.Region.ClientStack</Name>
+      <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
+      <Name>OpenSim.Region.GridInterfaces.Local</Name>
+      <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\LocalCommunications\OpenSim.Region.LocalCommunications.csproj">
+      <Name>OpenSim.Region.LocalCommunications</Name>
+      <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Simulation.csproj">
+      <Name>OpenSim.Region.Simulation</Name>
+      <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MyWorld.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Program.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj.user b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
new file mode 100644
index 0000000..52ecd6b
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("LocalGridServers")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("LocalGridServers")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
new file mode 100644
index 0000000..87eff49
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -0,0 +1,312 @@
+/*
+* 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.Threading;
+using System.IO;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Console;
+using libsecondlife;
+using Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+
+namespace OpenSim.GridInterfaces.Local
+{
+    public class LocalAssetPlugin : IAssetPlugin
+    {
+        public LocalAssetPlugin()
+        {
+
+        }
+
+        public IAssetServer GetAssetServer()
+        {
+            return (new LocalAssetServer());
+        }
+    }
+
+    public class LocalAssetServer : IAssetServer
+    {
+        private IAssetReceiver _receiver;
+        private BlockingQueue<ARequest> _assetRequests;
+        private IObjectContainer db;
+        private Thread _localAssetServerThread;
+
+        public LocalAssetServer()
+        {
+            bool yapfile;
+            this._assetRequests = new BlockingQueue<ARequest>();
+            yapfile = System.IO.File.Exists("assets.yap");
+
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Local Asset Server class created");
+            try
+            {
+                db = Db4oFactory.OpenFile("assets.yap");
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "Db4 Asset database  creation");
+            }
+            catch (Exception e)
+            {
+                db.Close();
+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+            }
+            if (!yapfile)
+            {
+                this.SetUpAssetDatabase();
+            }
+            this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));
+            this._localAssetServerThread.IsBackground = true;
+            this._localAssetServerThread.Start();
+
+        }
+
+        public void SetReceiver(IAssetReceiver receiver)
+        {
+            this._receiver = receiver;
+        }
+
+        public void RequestAsset(LLUUID assetID, bool isTexture)
+        {
+            ARequest req = new ARequest();
+            req.AssetID = assetID;
+            req.IsTexture = isTexture;
+            this._assetRequests.Enqueue(req);
+        }
+
+        public void UpdateAsset(AssetBase asset)
+        {
+
+        }
+
+        public void UploadNewAsset(AssetBase asset)
+        {
+            AssetStorage store = new AssetStorage();
+            store.Data = asset.Data;
+            store.Name = asset.Name;
+            store.UUID = asset.FullID;
+            db.Set(store);
+            db.Commit();
+        }
+
+        public void SetServerInfo(string ServerUrl, string ServerKey)
+        {
+
+        }
+        public void Close()
+        {
+            if (db != null)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "Closing local asset server database");
+                db.Close();
+            }
+        }
+
+        private void RunRequests()
+        {
+            while (true)
+            {
+                byte[] idata = null;
+                bool found = false;
+                AssetStorage foundAsset = null;
+                ARequest req = this._assetRequests.Dequeue();
+                IObjectSet result = db.Query(new AssetUUIDQuery(req.AssetID));
+                if (result.Count > 0)
+                {
+                    foundAsset = (AssetStorage)result.Next();
+                    found = true;
+                }
+
+                AssetBase asset = new AssetBase();
+                if (found)
+                {
+                    asset.FullID = foundAsset.UUID;
+                    asset.Type = foundAsset.Type;
+                    asset.InvType = foundAsset.Type;
+                    asset.Name = foundAsset.Name;
+                    idata = foundAsset.Data;
+                }
+                else
+                {
+                    asset.FullID = LLUUID.Zero;
+                }
+                asset.Data = idata;
+                _receiver.AssetReceived(asset, req.IsTexture);
+            }
+
+        }
+
+        private void SetUpAssetDatabase()
+        {
+            try
+            {
+
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "Setting up asset database");
+
+                AssetBase Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
+                Image.Name = "Bricks";
+                this.LoadAsset(Image, true, "bricks.jp2");
+                AssetStorage store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
+                Image.Name = "Plywood";
+                this.LoadAsset(Image, true, "plywood.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
+                Image.Name = "Rocks";
+                this.LoadAsset(Image, true, "rocks.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
+                Image.Name = "Granite";
+                this.LoadAsset(Image, true, "granite.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
+                Image.Name = "Hardwood";
+                this.LoadAsset(Image, true, "hardwood.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
+                Image.Name = "Prim Base Texture";
+                this.LoadAsset(Image, true, "plywood.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006");
+                Image.Name = "Map Base Texture";
+                this.LoadAsset(Image, true, "map_base.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007");
+                Image.Name = "Map Texture";
+                this.LoadAsset(Image, true, "map1.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
+                Image.Name = "Shape";
+                this.LoadAsset(Image, false, "base_shape.dat");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+            }
+
+        }
+
+        private void LoadAsset(AssetBase info, bool image, string filename)
+        {
+            //should request Asset from storage manager
+            //but for now read from file
+
+            string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
+            string fileName = Path.Combine(dataPath, filename);
+            FileInfo fInfo = new FileInfo(fileName);
+            long numBytes = fInfo.Length;
+            FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
+            byte[] idata = new byte[numBytes];
+            BinaryReader br = new BinaryReader(fStream);
+            idata = br.ReadBytes((int)numBytes);
+            br.Close();
+            fStream.Close();
+            info.Data = idata;
+            //info.loaded=true;
+        }
+    }
+        public class AssetUUIDQuery : Predicate
+        {
+            private LLUUID _findID;
+
+            public AssetUUIDQuery(LLUUID find)
+            {
+                _findID = find;
+            }
+            public bool Match(AssetStorage asset)
+            {
+                return (asset.UUID == _findID);
+            }
+        }
+    
+}
diff --git a/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj
new file mode 100644
index 0000000..484a205
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj
@@ -0,0 +1,107 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{241A8CDD-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.GridInterfaces.Local</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.GridInterfaces.Local</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LocalAssetServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj.user b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
new file mode 100644
index 0000000..51596d0
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("RemoteGridServers")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("RemoteGridServers")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj
new file mode 100644
index 0000000..793fde2
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj
@@ -0,0 +1,107 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{98C7B681-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.GridInterfaces.Remote</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.GridInterfaces.Remote</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RemoteAssetServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj.user b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
new file mode 100644
index 0000000..ca01c68
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
@@ -0,0 +1,135 @@
+/*
+* 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.Threading;
+using System.Net;
+using System.Net.Sockets;
+using System.IO;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.GridInterfaces.Remote
+{
+    public class RemoteAssetServer : IAssetServer
+    {
+        private IAssetReceiver _receiver;
+        private BlockingQueue<ARequest> _assetRequests;
+        private Thread _remoteAssetServerThread;
+        private string AssetServerUrl;
+        private string AssetSendKey;
+
+        public RemoteAssetServer()
+        {
+            this._assetRequests = new BlockingQueue<ARequest>();
+            this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
+            this._remoteAssetServerThread.IsBackground = true;
+            this._remoteAssetServerThread.Start();
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Remote Asset Server class created");
+        }
+
+        public void SetReceiver(IAssetReceiver receiver)
+        {
+            this._receiver = receiver;
+        }
+
+        public void RequestAsset(LLUUID assetID, bool isTexture)
+        {
+            ARequest req = new ARequest();
+            req.AssetID = assetID;
+            req.IsTexture = isTexture;
+            this._assetRequests.Enqueue(req);
+        }
+
+        public void UpdateAsset(AssetBase asset)
+        {
+
+        }
+
+        public void UploadNewAsset(AssetBase asset)
+        {
+            Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
+            string ret = Windows1252Encoding.GetString(asset.Data);
+            byte[] buffer = Windows1252Encoding.GetBytes(ret);
+            WebClient client = new WebClient();
+            client.UploadData(this.AssetServerUrl + "assets/" + asset.FullID, buffer);
+
+        }
+
+        public void SetServerInfo(string ServerUrl, string ServerKey)
+        {
+            this.AssetServerUrl = ServerUrl;
+            this.AssetSendKey = ServerKey;
+        }
+
+        private void RunRequests()
+        {
+            while (true)
+            {
+                //we need to add support for the asset server not knowing about a requested asset
+		// 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM
+                ARequest req = this._assetRequests.Dequeue();
+                LLUUID assetID = req.AssetID;
+              //  OpenSim.Framework.Console.MainLog.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
+                WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);
+                WebResponse AssetResponse = AssetLoad.GetResponse();
+                byte[] idata = new byte[(int)AssetResponse.ContentLength];
+                BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream());
+                idata = br.ReadBytes((int)AssetResponse.ContentLength);
+                br.Close();
+                
+                AssetBase asset = new AssetBase();
+                asset.FullID = assetID;
+                asset.Data = idata;
+                _receiver.AssetReceived(asset, req.IsTexture);
+            }
+        }
+
+        public void Close()
+        {
+
+        }
+    }
+
+    public class RemoteAssetPlugin : IAssetPlugin
+    {
+        public RemoteAssetPlugin()
+        {
+
+        }
+
+        public IAssetServer GetAssetServer()
+        {
+            return (new RemoteAssetServer());
+        }
+    }
+
+}
diff --git a/OpenSim/Region/LocalCommunications/CommunicationsLocal.cs b/OpenSim/Region/LocalCommunications/CommunicationsLocal.cs
new file mode 100644
index 0000000..743b9b4
--- /dev/null
+++ b/OpenSim/Region/LocalCommunications/CommunicationsLocal.cs
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenGrid.Framework.Communications;
+
+
+namespace OpenSim.LocalCommunications
+{
+    public class CommunicationsLocal : CommunicationsManager
+    {
+        public LocalBackEndServices SandBoxServices = new LocalBackEndServices();
+        public LocalUserServices UserServices;
+
+        public CommunicationsLocal(NetworkServersInfo serversInfo)
+            : base(serversInfo)
+        {
+            UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
+            UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll");
+            UserServer = UserServices;
+            GridServer = SandBoxServices;
+            InterRegion = SandBoxServices;
+        }
+
+        internal void InformRegionOfLogin(ulong regionHandle, Login login)
+        {
+            this.SandBoxServices.AddNewSession(regionHandle, login);
+        }
+    }
+}
diff --git a/OpenSim/Region/LocalCommunications/LocalBackEndServices.cs b/OpenSim/Region/LocalCommunications/LocalBackEndServices.cs
new file mode 100644
index 0000000..ce48c6e
--- /dev/null
+++ b/OpenSim/Region/LocalCommunications/LocalBackEndServices.cs
@@ -0,0 +1,209 @@
+/*
+* 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 OpenGrid.Framework.Communications;
+using libsecondlife;
+using OpenSim.Framework.Types;
+using OpenSim.Framework;
+
+namespace OpenSim.LocalCommunications
+{
+
+    public class LocalBackEndServices : IGridServices, IInterRegionCommunications
+    {
+        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
+        protected Dictionary<ulong, RegionCommsListener> regionHosts = new Dictionary<ulong, RegionCommsListener>();
+
+        public LocalBackEndServices()
+        {
+
+        }
+
+        /// <summary>
+        /// Register a region method with the BackEnd Services.
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <returns></returns>
+        public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo)
+        {
+            //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
+            if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
+            {
+                //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
+                this.regions.Add(regionInfo.RegionHandle, regionInfo);
+                RegionCommsListener regionHost = new RegionCommsListener();
+                this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
+
+                return regionHost;
+            }
+
+            //already in our list of regions so for now lets return null
+            return null;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <returns></returns>
+        public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
+        {
+            // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
+            List<RegionInfo> neighbours = new List<RegionInfo>();
+
+            foreach (RegionInfo reg in this.regions.Values)
+            {
+                // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
+                if (reg.RegionHandle != regionInfo.RegionHandle)
+                {
+                    //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
+                    if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))
+                    {
+                        if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))
+                        {
+                            neighbours.Add(reg);
+                        }
+                    }
+                }
+            }
+            return neighbours;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <returns></returns>
+        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
+        {
+            if (this.regions.ContainsKey(regionHandle))
+            {
+                return this.regions[regionHandle];
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="minX"></param>
+        /// <param name="minY"></param>
+        /// <param name="maxX"></param>
+        /// <param name="maxY"></param>
+        /// <returns></returns>
+        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
+        {
+            List<MapBlockData> mapBlocks = new List<MapBlockData>();
+            foreach(RegionInfo regInfo in this.regions.Values)
+            {
+                if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
+                {
+                    MapBlockData map = new MapBlockData();
+                    map.Name = regInfo.RegionName;
+                    map.X = (ushort)regInfo.RegionLocX;
+                    map.Y = (ushort)regInfo.RegionLocY;
+                    map.WaterHeight =(byte) regInfo.estateSettings.waterHeight;
+                    map.MapImageId = regInfo.estateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");
+                    map.Agents = 1;
+                    map.RegionFlags = 72458694;
+                    map.Access = 13;
+                    mapBlocks.Add(map);
+                }
+            }
+            return mapBlocks;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="agentData"></param>
+        /// <returns></returns>
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
+        {
+            //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
+            if (this.regionHosts.ContainsKey(regionHandle))
+            {
+                // Console.WriteLine("CommsManager- Informing a region to expect child agent");
+                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="agentID"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (this.regionHosts.ContainsKey(regionHandle))
+            {
+                // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing");
+                this.regionHosts[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="loginData"></param>
+        /// <returns></returns>
+        public bool AddNewSession(ulong regionHandle, Login loginData)
+        {
+            //Console.WriteLine(" comms manager been told to expect new user");
+            AgentCircuitData agent = new AgentCircuitData();
+            agent.AgentID = loginData.Agent;
+            agent.firstname = loginData.First;
+            agent.lastname = loginData.Last;
+            agent.SessionID = loginData.Session;
+            agent.SecureSessionID = loginData.SecureSession;
+            agent.circuitcode = loginData.CircuitCode;
+            agent.BaseFolder = loginData.BaseFolder;
+            agent.InventoryFolder = loginData.InventoryFolder;
+            agent.startpos = new LLVector3(128, 128, 70);
+            agent.CapsPath = loginData.CapsPath;
+
+            if (this.regionHosts.ContainsKey(regionHandle))
+            {
+                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);
+                return true;
+            }
+
+            // region not found
+            return false;
+        }
+    }
+}
+
diff --git a/OpenSim/Region/LocalCommunications/LocalUserServices.cs b/OpenSim/Region/LocalCommunications/LocalUserServices.cs
new file mode 100644
index 0000000..a7f7aa4
--- /dev/null
+++ b/OpenSim/Region/LocalCommunications/LocalUserServices.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenGrid.Framework.Communications;
+//using OpenSim.Framework.User;
+using OpenGrid.Framework.UserManagement;
+using OpenGrid.Framework.Data;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+using libsecondlife;
+
+namespace OpenSim.LocalCommunications
+{
+    public class LocalUserServices : UserManagerBase, IUserServices
+    {
+        private CommunicationsLocal m_Parent;
+
+        private uint defaultHomeX ;
+        private uint defaultHomeY;
+        public LocalUserServices(CommunicationsLocal parent, uint defHomeX, uint defHomeY)
+        {
+            m_Parent = parent;
+            defaultHomeX = defHomeX;
+            defaultHomeY = defHomeY;
+        }
+
+        public UserProfileData GetUserProfile(string firstName, string lastName)
+        {
+            return GetUserProfile(firstName + " " + lastName);
+        }
+
+        public UserProfileData GetUserProfile(string name)
+        {
+            return this.getUserProfile(name);
+        }
+        public UserProfileData GetUserProfile(LLUUID avatarID)
+        {
+            return this.getUserProfile(avatarID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public override string GetMessage()
+        {
+            return "Welcome to OpenSim";
+        }
+
+        public override UserProfileData GetTheUser(string firstname, string lastname)
+        {
+            UserProfileData profile = getUserProfile(firstname, lastname);
+            if (profile != null)
+            {
+               
+                return profile;
+            }
+
+            //no current user account so make one
+            Console.WriteLine("No User account found so creating a new one ");
+            this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
+            
+            profile = getUserProfile(firstname, lastname);
+
+            return profile;
+        }
+
+        public override bool AuthenticateUser(ref UserProfileData profile, string password)
+        {
+            //for now we will accept any password in sandbox mode
+            Console.WriteLine("authorising user");
+            return true;
+        }
+
+        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
+        {
+            ulong currentRegion = theUser.currentAgent.currentHandle;
+            RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
+
+
+            if (reg != null)
+            {
+                response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +
+                 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
+                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
+                string capsPath = Util.GetRandomCapsPath();
+                response.SimAddress = reg.CommsIPListenAddr;
+                response.SimPort = (Int32)reg.CommsIPListenPort;
+                response.RegionX = reg.RegionLocX ;
+                response.RegionY = reg.RegionLocY ;
+                response.SeedCapability = "http://" + reg.CommsIPListenAddr + ":" + "9000" + "/CAPS/" + capsPath + "0000/";
+                theUser.currentAgent.currentRegion = reg.SimUUID;
+                theUser.currentAgent.currentHandle = reg.RegionHandle;
+
+                Login _login = new Login();
+                //copy data to login object
+                _login.First = response.Firstname;
+                _login.Last = response.Lastname;
+                _login.Agent = response.AgentID;
+                _login.Session = response.SessionID;
+                _login.SecureSession = response.SecureSessionID;
+                _login.CircuitCode = (uint)response.CircuitCode;
+                _login.CapsPath = capsPath;
+
+                m_Parent.InformRegionOfLogin(currentRegion, _login);
+            }
+            else
+            {
+                Console.WriteLine("not found region " + currentRegion);
+            }
+
+        }
+
+    }
+}
diff --git a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj b/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj
new file mode 100644
index 0000000..6b2b78c
--- /dev/null
+++ b/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj
@@ -0,0 +1,121 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EB3A1BA8-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.LocalCommunications</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.LocalCommunications</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
+      <Name>OpenSim.Framework.Communications</Name>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
+      <Name>OpenSim.Framework.UserManagement</Name>
+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CommunicationsLocal.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LocalBackEndServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LocalUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user b/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs b/OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..8e6e711
--- /dev/null
+++ b/OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.LocalCommunications")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.LocalCommunications")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
new file mode 100644
index 0000000..177c49d
--- /dev/null
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("PhysXplugin")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PhysXplugin")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
new file mode 100644
index 0000000..dcb8f3b
--- /dev/null
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -0,0 +1,294 @@
+/*
+* 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 OpenSim.Physics.Manager;
+
+namespace OpenSim.Region.Physics.BasicPhysicsPlugin
+{
+	/// <summary>
+	/// Will be the PhysX plugin but for now will be a very basic physics engine
+	/// </summary>
+	public class BasicPhysicsPlugin : IPhysicsPlugin
+	{
+		private BasicScene _mScene;
+		
+		public BasicPhysicsPlugin()
+		{
+			
+		}
+		
+		public bool Init()
+		{
+			return true;
+		}
+		
+		public PhysicsScene GetScene()
+		{
+		    return new BasicScene();
+		}
+		
+		public string GetName()
+		{
+			return("basicphysics");
+		}
+		
+		public void Dispose()
+		{
+			
+		}
+	}
+	
+	public class BasicScene :PhysicsScene
+	{
+		private List<BasicActor> _actors = new List<BasicActor>();
+		private float[] _heightMap;
+		
+		public BasicScene()
+		{
+			
+		}
+		
+		public override PhysicsActor AddAvatar(PhysicsVector position)
+		{
+			BasicActor act = new BasicActor();
+			act.Position = position;
+			_actors.Add(act);
+			return act;
+		}
+
+        public override void RemoveAvatar(PhysicsActor actor)
+        {
+            BasicActor act = (BasicActor)actor;
+            if(_actors.Contains(act))
+            {
+                _actors.Remove(act);
+            }
+
+        }
+
+		public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
+		{
+			return null;
+		}
+		
+		public override void Simulate(float timeStep)
+		{
+			foreach (BasicActor actor in _actors)
+			{
+				actor.Position.X = actor.Position.X + (actor.Velocity.X * timeStep);
+				actor.Position.Y = actor.Position.Y + (actor.Velocity.Y * timeStep);
+				actor.Position.Z = actor.Position.Z + (actor.Velocity.Z * timeStep);
+				/*if(actor.Flying)
+				{
+					actor.Position.Z = actor.Position.Z + (actor.Velocity.Z * timeStep);
+				}
+				else
+				{
+					actor.Position.Z = actor.Position.Z + ((-9.8f + actor.Velocity.Z) * timeStep);
+				}
+				if(actor.Position.Z < (_heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X]+1))
+				{*/
+                if ((actor.Position.Y > 0 && actor.Position.Y < 256) && (actor.Position.X > 0 && actor.Position.X < 256))
+                {
+                    actor.Position.Z = _heightMap[(int)actor.Position.Y * 256 + (int)actor.Position.X] + 1;
+                }
+                else
+                {
+                    if (actor.Position.Y < 0)
+                    {
+                        actor.Position.Y = 0;
+                    }
+                    else if (actor.Position.Y > 256)
+                    {
+                        actor.Position.Y = 256;
+                    }
+
+                    if (actor.Position.X < 0)
+                    {
+                        actor.Position.X = 0;
+                    }
+                    if (actor.Position.X > 256)
+                    {
+                        actor.Position.X = 256;
+                    }
+                }
+				//}
+
+
+
+				// This code needs sorting out - border crossings etc
+/*				if(actor.Position.X<0)
+				{
+					ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
+					actor.Position.X = 0;
+					actor.Velocity.X = 0;
+				}
+				if(actor.Position.Y < 0)
+				{
+					ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
+					actor.Position.Y = 0;
+					actor.Velocity.Y = 0;
+				}
+				if(actor.Position.X > 255)
+				{
+					ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
+					actor.Position.X = 255;
+					actor.Velocity.X = 0;
+				}
+				if(actor.Position.Y > 255) 
+				{
+					ControllingClient.CrossSimBorder(new LLVector3(this.Position.X,this.Position.Y,this.Position.Z));
+					actor.Position.Y = 255;
+					actor.Velocity.X = 0;
+				}*/
+			}
+		}
+		
+		public override void GetResults()
+		{
+		
+		}
+		
+		public override bool IsThreaded
+		{
+			get
+			{
+				return(false); // for now we won't be multithreaded
+			}
+		}
+		
+		public override void SetTerrain(float[] heightMap)
+		{
+			this._heightMap = heightMap;
+		}
+
+        public override void DeleteTerrain()
+        {
+
+        }
+	}
+	
+	public  class BasicActor : PhysicsActor
+	{
+		private PhysicsVector _position;
+		private PhysicsVector _velocity;
+		private PhysicsVector _acceleration;
+		private bool flying;
+		public BasicActor()
+		{
+			_velocity = new PhysicsVector();
+			_position = new PhysicsVector();
+			_acceleration = new PhysicsVector();
+		}
+		
+		public override bool Flying
+		{
+			get
+			{
+				return false;
+			}
+			set
+			{
+				flying= value;
+			}
+		}
+		
+		public override PhysicsVector Position
+		{
+			get
+			{
+				return _position;
+			}
+			set
+			{
+				_position = value;
+			}
+		}
+		
+		public override PhysicsVector Velocity
+		{
+			get
+			{
+				return _velocity;
+			}
+			set
+			{
+				_velocity = value;
+			}
+		}
+		
+		public override Axiom.MathLib.Quaternion Orientation
+		{
+			get
+			{
+				return Axiom.MathLib.Quaternion.Identity;
+			}
+			set
+			{
+				
+			}
+		}
+		
+		public override PhysicsVector Acceleration
+		{
+			get
+			{
+				return _acceleration;
+			}
+			
+		}
+		
+		public override bool Kinematic
+		{
+			get
+			{
+				return true;
+			}
+			set
+			{
+				
+			}
+		}
+		public void SetAcceleration (PhysicsVector accel)
+		{
+			this._acceleration = accel;
+		}
+		
+		public override void AddForce(PhysicsVector force)
+		{
+			
+		}
+		
+		public override void SetMomentum(PhysicsVector momentum)
+		{
+			
+		}
+	}
+
+}
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
new file mode 100644
index 0000000..7dad533
--- /dev/null
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj
@@ -0,0 +1,93 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{15B4FEF3-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Physics.BasicPhysicsPlugin</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Physics.BasicPhysicsPlugin</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll" >
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BasicPhysicsPlugin.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
new file mode 100644
index 0000000..132f64a
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("PhysicsManager")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PhysicsManager")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
new file mode 100644
index 0000000..f340400
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj
@@ -0,0 +1,112 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F4FF31EB-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Physics.Manager</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Physics.Manager</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll" >
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="PhysicsActor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="PhysicsManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="PhysicsScene.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="PhysicsVector.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj.user b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
new file mode 100644
index 0000000..6366fb8
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -0,0 +1,161 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Physics.Manager
+{
+    public abstract class PhysicsActor
+    {
+        public static PhysicsActor Null
+        {
+            get
+            {
+                return new NullPhysicsActor();
+            }
+        }
+
+        public abstract PhysicsVector Position
+        {
+            get;
+            set;
+        }
+
+        public abstract PhysicsVector Velocity
+        {
+            get;
+            set;
+        }
+
+        public abstract PhysicsVector Acceleration
+        {
+            get;
+        }
+
+        public abstract Axiom.MathLib.Quaternion Orientation
+        {
+            get;
+            set;
+        }
+
+        public abstract bool Flying
+        {
+            get;
+            set;
+        }
+
+        public abstract bool Kinematic
+        {
+            get;
+            set;
+        }
+
+        public abstract void AddForce(PhysicsVector force);
+
+        public abstract void SetMomentum(PhysicsVector momentum);
+    }
+
+    public class NullPhysicsActor : PhysicsActor
+    {
+        public override PhysicsVector Position
+        {
+            get
+            {
+                return PhysicsVector.Zero;
+            }
+            set
+            {
+                return;
+            }
+        }
+
+        public override PhysicsVector Velocity
+        {
+            get
+            {
+                return PhysicsVector.Zero;
+            }
+            set
+            {
+                return;
+            }
+        }
+
+        public override Axiom.MathLib.Quaternion Orientation
+        {
+            get
+            {
+                return Axiom.MathLib.Quaternion.Identity;
+            }
+            set
+            {
+
+            }
+        }
+
+        public override PhysicsVector Acceleration
+        {
+            get { return PhysicsVector.Zero; }
+        }
+
+        public override bool Flying
+        {
+            get
+            {
+                return false;
+            }
+            set
+            {
+                return;
+            }
+        }
+
+        public override bool Kinematic
+        {
+            get
+            {
+                return true;
+            }
+            set
+            {
+                return;
+            }
+        }
+
+        public override void AddForce(PhysicsVector force)
+        {
+            return;
+        }
+
+        public override void SetMomentum(PhysicsVector momentum)
+        {
+            return;
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
new file mode 100644
index 0000000..efccb36
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
@@ -0,0 +1,117 @@
+/*
+* 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.Collections;
+using System.IO;
+using System.Reflection;
+using Axiom.MathLib;
+using OpenSim.Framework.Console;
+
+namespace OpenSim.Physics.Manager
+{
+	/// <summary>
+	/// Description of MyClass.
+	/// </summary>
+	public class PhysicsManager
+	{
+		private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>();
+		
+		public PhysicsManager()
+		{
+			
+		}
+		
+		public PhysicsScene GetPhysicsScene(string engineName)
+		{
+            if (String.IsNullOrEmpty(engineName))
+            {
+                return new NullPhysicsScene();
+            }
+
+			if(_plugins.ContainsKey(engineName))
+			{
+				OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
+				return _plugins[engineName].GetScene();
+			}
+			else
+            {
+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
+                throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
+			}
+		}
+		
+		public void LoadPlugins()
+		{
+			string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics");
+       		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("IPhysicsPlugin", true);
+						
+						if (typeInterface != null)
+						{
+							IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+							plug.Init();
+							this._plugins.Add(plug.GetName(),plug);
+							
+						}	
+						
+						typeInterface = null; 			
+					}				
+				}			
+			}
+			
+			pluginAssembly = null; 
+		}
+	}
+
+	public interface IPhysicsPlugin
+	{
+		bool Init();
+		PhysicsScene GetScene();
+		string GetName();
+		void Dispose();
+	}
+}
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
new file mode 100644
index 0000000..0901c2f
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -0,0 +1,113 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Console;
+
+namespace OpenSim.Physics.Manager
+{
+    public abstract class PhysicsScene
+    {
+        public static PhysicsScene Null
+        {
+            get
+            {
+                return new NullPhysicsScene();
+            }
+        }
+
+        public abstract PhysicsActor AddAvatar(PhysicsVector position);
+
+        public abstract void RemoveAvatar(PhysicsActor actor);
+
+        public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);
+
+        public abstract void Simulate(float timeStep);
+
+        public abstract void GetResults();
+
+        public abstract void SetTerrain(float[] heightMap);
+        
+        public abstract void DeleteTerrain();
+
+        public abstract bool IsThreaded
+        {
+            get;
+        }
+    }
+
+    public class NullPhysicsScene : PhysicsScene
+    {
+        private static int m_workIndicator;
+
+        public override PhysicsActor AddAvatar(PhysicsVector position)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
+            return PhysicsActor.Null;
+        }
+
+        public override void RemoveAvatar(PhysicsActor actor)
+        {
+
+        }
+
+        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size);
+            return PhysicsActor.Null;
+        }
+
+        public override void Simulate(float timeStep)
+        {
+            m_workIndicator = (m_workIndicator + 1) % 10;
+
+            //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
+        }
+
+        public override void GetResults()
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : GetResults()");
+        }
+
+        public override void SetTerrain(float[] heightMap)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
+        }
+
+        public override void DeleteTerrain()
+        {
+
+        }
+
+        public override bool IsThreaded
+        {
+            get { return false; }
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
new file mode 100644
index 0000000..888dbb5
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Physics.Manager
+{
+    public class PhysicsVector
+    {
+        public float X;
+        public float Y;
+        public float Z;
+
+        public PhysicsVector()
+        {
+
+        }
+
+        public PhysicsVector(float x, float y, float z)
+        {
+            X = x;
+            Y = y;
+            Z = z;
+        }
+
+        public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f);
+    }
+}
diff --git a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
new file mode 100644
index 0000000..b49c8da
--- /dev/null
+++ b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("RealPhysXplugin")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("RealPhysXplugin")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
new file mode 100644
index 0000000..8aca851
--- /dev/null
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -0,0 +1,456 @@
+/*
+* 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 OpenSim.Physics.Manager;
+using Ode.NET;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    /// <summary>
+    /// ODE plugin 
+    /// </summary>
+    public class OdePlugin : IPhysicsPlugin
+    {
+        private OdeScene _mScene;
+
+        public OdePlugin()
+        {
+
+        }
+
+        public bool Init()
+        {
+            return true;
+        }
+
+        public PhysicsScene GetScene()
+        {
+            if (_mScene == null)
+            {
+                _mScene = new OdeScene();
+            }
+            return (_mScene);
+        }
+
+        public string GetName()
+        {
+            return ("OpenDynamicsEngine");
+        }
+
+        public void Dispose()
+        {
+
+        }
+    }
+
+    public class OdeScene : PhysicsScene
+    {
+        static public IntPtr world;
+        static public IntPtr space;
+        static private IntPtr contactgroup;
+        static private IntPtr LandGeom;
+        //static private IntPtr Land;
+        private double[] _heightmap;
+        static private d.NearCallback nearCallback = near;
+        private List<OdeCharacter> _characters = new List<OdeCharacter>();
+        private static d.ContactGeom[] contacts = new d.ContactGeom[30];
+        private static d.Contact contact;
+
+        public OdeScene()
+        {
+            contact.surface.mode = d.ContactFlags.Bounce | d.ContactFlags.SoftCFM;
+            contact.surface.mu = d.Infinity;
+            contact.surface.mu2 = 0.0f;
+            contact.surface.bounce = 0.1f;
+            contact.surface.bounce_vel = 0.1f;
+            contact.surface.soft_cfm = 0.01f;
+
+            world = d.WorldCreate();
+            space = d.HashSpaceCreate(IntPtr.Zero);
+            contactgroup = d.JointGroupCreate(0);
+            d.WorldSetGravity(world, 0.0f, 0.0f, -0.5f);
+            //d.WorldSetCFM(world, 1e-5f);
+            d.WorldSetAutoDisableFlag(world, false);
+            d.WorldSetContactSurfaceLayer(world, 0.001f);
+           // d.CreatePlane(space, 0, 0, 1, 0);
+            this._heightmap = new double[65536];
+        }
+
+        // This function blatantly ripped off from BoxStack.cs
+        static private void near(IntPtr space, IntPtr g1, IntPtr g2)
+        {
+            IntPtr b1 = d.GeomGetBody(g1);
+            IntPtr b2 = d.GeomGetBody(g2);
+            if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
+                return;
+
+            int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);
+            for (int i = 0; i < count; ++i)
+            {
+                contact.geom = contacts[i];
+                IntPtr joint = d.JointCreateContact(world, contactgroup, ref contact);
+                d.JointAttach(joint, b1, b2);
+            }
+
+        }
+
+        public override PhysicsActor AddAvatar(PhysicsVector position)
+        {
+            PhysicsVector pos = new PhysicsVector();
+            pos.X = position.X;
+            pos.Y = position.Y;
+            pos.Z = position.Z + 20;
+            OdeCharacter newAv = new OdeCharacter(this, pos);
+            this._characters.Add(newAv);
+            return newAv;
+        }
+
+        public override void RemoveAvatar(PhysicsActor actor)
+        {
+
+        }
+
+        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
+        {
+            PhysicsVector pos = new PhysicsVector();
+            pos.X = position.X;
+            pos.Y = position.Y;
+            pos.Z = position.Z;
+            PhysicsVector siz = new PhysicsVector();
+            siz.X = size.X;
+            siz.Y = size.Y;
+            siz.Z = size.Z;
+            return new OdePrim();
+        }
+
+        public override void Simulate(float timeStep)
+        {
+            foreach (OdeCharacter actor in _characters)
+            {
+                actor.Move(timeStep * 5f);
+            }
+            d.SpaceCollide(space, IntPtr.Zero, nearCallback);
+            d.WorldQuickStep(world, timeStep * 5f);
+            d.JointGroupEmpty(contactgroup);
+            foreach (OdeCharacter actor in _characters)
+            {
+                actor.UpdatePosition();
+            }
+
+        }
+
+        public override void GetResults()
+        {
+
+        }
+
+        public override bool IsThreaded
+        {
+            get
+            {
+                return (false); // for now we won't be multithreaded
+            }
+        }
+
+        public override void SetTerrain(float[] heightMap)
+        {
+            for (int i = 0; i < 65536; i++)
+            {
+                // this._heightmap[i] = (double)heightMap[i];
+                // dbm (danx0r) -- heightmap x,y must be swapped for Ode (should fix ODE, but for now...)
+                int x = i & 0xff;
+                int y = i >> 8;
+                this._heightmap[i] = (double)heightMap[x * 256 + y];
+            }
+            IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
+            d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 0);
+            d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256);
+            LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
+            d.Matrix3 R = new d.Matrix3();
+            
+            Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0));
+            Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0));
+           //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));
+            
+            q1 = q1 * q2;
+            //q1 = q1 * q3;
+            Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3();
+            float angle = 0;
+            q1.ToAngleAxis(ref angle, ref v3);
+
+            d.RFromAxisAndAngle(out R, v3.x, v3.y, v3.z, angle);
+            d.GeomSetRotation(LandGeom, ref R); 
+            d.GeomSetPosition(LandGeom, 128, 128, 0); 
+        }
+
+        public override void DeleteTerrain()
+        {
+
+        }
+    }
+
+    public class OdeCharacter : PhysicsActor
+    {
+        private PhysicsVector _position;
+        private PhysicsVector _velocity;
+        private PhysicsVector _acceleration;
+        private bool flying;
+        //private float gravityAccel;
+        private IntPtr BoundingCapsule;
+        IntPtr capsule_geom;
+        d.Mass capsule_mass;
+
+        public OdeCharacter(OdeScene parent_scene, PhysicsVector pos)
+        {
+            _velocity = new PhysicsVector();
+            _position = pos;
+            _acceleration = new PhysicsVector();
+            d.MassSetCapsule(out capsule_mass, 5.0f, 3, 0.5f, 2f);
+            capsule_geom = d.CreateCapsule(OdeScene.space, 0.5f, 2f);
+            this.BoundingCapsule = d.BodyCreate(OdeScene.world);
+            d.BodySetMass(BoundingCapsule, ref capsule_mass);
+            d.BodySetPosition(BoundingCapsule, pos.X, pos.Y, pos.Z);
+            d.GeomSetBody(capsule_geom, BoundingCapsule);
+        }
+
+        public override bool Flying
+        {
+            get
+            {
+                return flying;
+            }
+            set
+            {
+                flying = value;
+            }
+        }
+
+        public override PhysicsVector Position
+        {
+            get
+            {
+                return _position;
+            }
+            set
+            {
+                _position = value;
+            }
+        }
+
+        public override PhysicsVector Velocity
+        {
+            get
+            {
+                return _velocity;
+            }
+            set
+            {
+                _velocity = value;
+            }
+        }
+
+        public override bool Kinematic
+        {
+            get
+            {
+                return false;
+            }
+            set
+            {
+
+            }
+        }
+
+        public override Axiom.MathLib.Quaternion Orientation
+        {
+            get
+            {
+                return Axiom.MathLib.Quaternion.Identity;
+            }
+            set
+            {
+
+            }
+        }
+
+        public override PhysicsVector Acceleration
+        {
+            get
+            {
+                return _acceleration;
+            }
+
+        }
+        public void SetAcceleration(PhysicsVector accel)
+        {
+            this._acceleration = accel;
+        }
+
+        public override void AddForce(PhysicsVector force)
+        {
+
+        }
+
+        public override void SetMomentum(PhysicsVector momentum)
+        {
+
+        }
+
+        public void Move(float timeStep)
+        {
+            PhysicsVector vec = new PhysicsVector();
+            vec.X = this._velocity.X * timeStep;
+            vec.Y = this._velocity.Y * timeStep;
+            if (flying)
+            {
+                vec.Z = (this._velocity.Z + 0.5f) * timeStep;
+            }
+            d.BodySetLinearVel(this.BoundingCapsule, vec.X, vec.Y, vec.Z);
+        }
+
+        public void UpdatePosition()
+        {
+            d.Vector3 vec = d.BodyGetPosition(BoundingCapsule);
+            this._position.X = vec.X;
+            this._position.Y = vec.Y;
+            this._position.Z = vec.Z+1.0f;
+        }
+    }
+
+    public class OdePrim : PhysicsActor
+    {
+        private PhysicsVector _position;
+        private PhysicsVector _velocity;
+        private PhysicsVector _acceleration;
+
+        public OdePrim()
+        {
+            _velocity = new PhysicsVector();
+            _position = new PhysicsVector();
+            _acceleration = new PhysicsVector();
+        }
+        public override bool Flying
+        {
+            get
+            {
+                return false; //no flying prims for you
+            }
+            set
+            {
+
+            }
+        }
+        public override PhysicsVector Position
+        {
+            get
+            {
+                PhysicsVector pos = new PhysicsVector();
+                //	PhysicsVector vec = this._prim.Position;
+                //pos.X = vec.X;
+                //pos.Y = vec.Y;
+                //pos.Z = vec.Z;
+                return pos;
+
+            }
+            set
+            {
+                /*PhysicsVector vec = value;
+                PhysicsVector pos = new PhysicsVector();
+                pos.X = vec.X;
+                pos.Y = vec.Y;
+                pos.Z = vec.Z;
+                this._prim.Position = pos;*/
+            }
+        }
+
+        public override PhysicsVector Velocity
+        {
+            get
+            {
+                return _velocity;
+            }
+            set
+            {
+                _velocity = value;
+            }
+        }
+
+        public override bool Kinematic
+        {
+            get
+            {
+                return false;
+                //return this._prim.Kinematic;
+            }
+            set
+            {
+                //this._prim.Kinematic = value;
+            }
+        }
+
+        public override Axiom.MathLib.Quaternion Orientation
+        {
+            get
+            {
+                Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
+                return res;
+            }
+            set
+            {
+
+            }
+        }
+
+        public override PhysicsVector Acceleration
+        {
+            get
+            {
+                return _acceleration;
+            }
+
+        }
+        public void SetAcceleration(PhysicsVector accel)
+        {
+            this._acceleration = accel;
+        }
+
+        public override void AddForce(PhysicsVector force)
+        {
+
+        }
+
+        public override void SetMomentum(PhysicsVector momentum)
+        {
+
+        }
+
+
+    }
+
+}
diff --git a/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
new file mode 100644
index 0000000..490c681
--- /dev/null
+++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj
@@ -0,0 +1,97 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{90620634-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Physics.OdePlugin</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Physics.OdePlugin</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll" >
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Ode.NET.dll" >
+      <HintPath>..\..\..\..\bin\Ode.NET.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OdePlugin.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj.user b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
new file mode 100644
index 0000000..b49c8da
--- /dev/null
+++ b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("RealPhysXplugin")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("RealPhysXplugin")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
new file mode 100644
index 0000000..77da908
--- /dev/null
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
@@ -0,0 +1,97 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A6D191D8-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Physics.PhysXPlugin</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Physics.PhysXPlugin</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll" >
+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="PhysX_Wrapper_Dotnet.dll" >
+      <HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="PhysXPlugin.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj.user b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
new file mode 100644
index 0000000..8bf794b
--- /dev/null
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -0,0 +1,424 @@
+/*/*
+* 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 OpenSim.Physics.Manager;
+using PhysXWrapper;
+
+namespace OpenSim.Region.Physics.PhysXPlugin
+{
+	/// <summary>
+	/// Will be the PhysX plugin but for now will be a very basic physics engine
+	/// </summary>
+	public class PhysXPlugin : IPhysicsPlugin
+	{
+		private PhysXScene _mScene;
+		
+		public PhysXPlugin()
+		{
+			
+		}
+		
+		public bool Init()
+		{
+			return true;
+		}
+		
+		public PhysicsScene GetScene()
+		{
+			if(_mScene == null)
+			{
+				_mScene = new PhysXScene();
+			}
+			return(_mScene);
+		}
+		
+		public string GetName()
+		{
+			return("RealPhysX");
+		}
+		
+		public void Dispose()
+		{
+			
+		}
+	}
+	
+	public class PhysXScene :PhysicsScene
+	{
+		private List<PhysXCharacter> _characters = new List<PhysXCharacter>();
+		private List<PhysXPrim> _prims = new List<PhysXPrim>();
+		private float[] _heightMap = null;
+		private NxPhysicsSDK mySdk;
+		private NxScene scene;
+		
+		public PhysXScene()
+		{
+			mySdk = NxPhysicsSDK.CreateSDK();
+			Console.WriteLine("Sdk created - now creating scene");
+			scene = mySdk.CreateScene();
+		
+		}
+		
+		public override PhysicsActor AddAvatar(PhysicsVector position)
+		{
+			Vec3 pos = new Vec3();
+			pos.X = position.X;
+			pos.Y = position.Y;
+			pos.Z = position.Z;
+			PhysXCharacter act = new PhysXCharacter( scene.AddCharacter(pos));
+			act.Position = position;
+			_characters.Add(act);
+			return act;
+		}
+
+        public override void RemoveAvatar(PhysicsActor actor)
+        {
+
+        }
+		
+		public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
+		{
+			Vec3 pos = new Vec3();
+			pos.X = position.X;
+			pos.Y = position.Y;
+			pos.Z = position.Z;
+			Vec3 siz = new Vec3();
+			siz.X = size.X;
+			siz.Y = size.Y;
+			siz.Z = size.Z;
+			PhysXPrim act = new PhysXPrim( scene.AddNewBox(pos, siz));
+			_prims.Add(act);
+			return act;
+		}
+		public override void Simulate(float timeStep)
+		{
+            try
+            {
+                foreach (PhysXCharacter actor in _characters)
+                {
+                    actor.Move(timeStep);
+                }
+                scene.Simulate(timeStep);
+                scene.FetchResults();
+                scene.UpdateControllers();
+
+                foreach (PhysXCharacter actor in _characters)
+                {
+                    actor.UpdatePosition();
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+            }
+				
+		}
+		
+		public override void GetResults()
+		{
+		
+		}
+		
+		public override bool IsThreaded
+		{
+			get
+			{
+				return(false); // for now we won't be multithreaded
+			}
+		}
+		
+		public override void SetTerrain(float[] heightMap)
+		{
+            if (this._heightMap != null)
+            {
+                Console.WriteLine("PhysX - deleting old terrain");
+                this.scene.DeleteTerrain();
+            }
+			this._heightMap = heightMap;
+			this.scene.AddTerrain(heightMap);
+		}
+
+        public override void DeleteTerrain()
+        {
+            this.scene.DeleteTerrain();
+        }	
+    }
+	
+	public  class PhysXCharacter : PhysicsActor
+	{
+		private PhysicsVector _position;
+		private PhysicsVector _velocity;
+		private PhysicsVector _acceleration;
+		private NxCharacter _character;
+		private bool flying;
+		private float gravityAccel;
+		
+		public PhysXCharacter(NxCharacter character)
+		{
+			_velocity = new PhysicsVector();
+			_position = new PhysicsVector();
+			_acceleration = new PhysicsVector();
+			_character = character;
+		}
+		
+		public override bool Flying
+		{
+			get
+			{
+				return flying;
+			}
+			set
+			{
+				flying = value;
+			}
+		}
+		
+		public override PhysicsVector Position
+		{
+			get
+			{
+				return _position;
+			}
+			set
+			{
+				_position = value;
+                Vec3 ps = new Vec3();
+                ps.X = value.X;
+                ps.Y = value.Y;
+                ps.Z = value.Z;
+                this._character.Position = ps;
+			}
+		}
+		
+		public override PhysicsVector Velocity
+		{
+			get
+			{
+				return _velocity;
+			}
+			set
+			{
+				_velocity = value;
+			}
+		}
+		
+		public override bool Kinematic
+		{
+			get
+			{
+				return false;
+			}
+			set
+			{
+				
+			}
+		}
+		
+		public override Axiom.MathLib.Quaternion Orientation
+		{
+			get
+			{
+				return Axiom.MathLib.Quaternion.Identity;
+			}
+			set
+			{
+				
+			}
+		}
+		
+		public override PhysicsVector Acceleration
+		{
+			get
+			{
+				return _acceleration;
+			}
+			
+		}
+		public void SetAcceleration (PhysicsVector accel)
+		{
+			this._acceleration = accel;
+		}
+		
+		public override void AddForce(PhysicsVector force)
+		{
+			
+		}
+		
+		public override void SetMomentum(PhysicsVector momentum)
+		{
+			
+		}
+		
+		public void Move(float timeStep)
+		{
+			Vec3 vec = new Vec3();
+			vec.X = this._velocity.X * timeStep;
+			vec.Y = this._velocity.Y * timeStep;
+			if(flying)
+			{
+				vec.Z = ( this._velocity.Z) * timeStep;
+			}
+			else
+			{
+				gravityAccel+= -9.8f;
+				vec.Z = (gravityAccel + this._velocity.Z) * timeStep;
+			}
+			int res = this._character.Move(vec);
+			if(res == 1)
+			{
+				gravityAccel = 0;
+			}
+		}
+		
+		public void UpdatePosition()
+		{
+			Vec3 vec = this._character.Position;
+			this._position.X = vec.X;
+			this._position.Y = vec.Y;
+			this._position.Z = vec.Z;
+		}
+	}
+	
+	public  class PhysXPrim : PhysicsActor
+	{
+		private PhysicsVector _position;
+		private PhysicsVector _velocity;
+		private PhysicsVector _acceleration;
+		private NxActor _prim;
+		
+		public PhysXPrim(NxActor prim)
+		{
+			_velocity = new PhysicsVector();
+			_position = new PhysicsVector();
+			_acceleration = new PhysicsVector();
+			_prim = prim;
+		}
+		public override bool Flying
+		{
+			get
+			{
+				return false; //no flying prims for you
+			}
+			set
+			{
+				
+			}
+		}
+		public override PhysicsVector Position
+		{
+			get
+			{
+				PhysicsVector pos = new PhysicsVector();
+				Vec3 vec = this._prim.Position;
+				pos.X = vec.X;
+				pos.Y = vec.Y;
+				pos.Z = vec.Z;
+				return pos;
+				
+			}
+			set
+			{
+				PhysicsVector vec = value;
+				Vec3 pos = new Vec3();
+				pos.X = vec.X;
+				pos.Y = vec.Y;
+				pos.Z = vec.Z;
+				this._prim.Position = pos;
+			}
+		}
+		
+		public override PhysicsVector Velocity
+		{
+			get
+			{
+				return _velocity;
+			}
+			set
+			{
+				_velocity = value;
+			}
+		}
+		
+		public override bool Kinematic
+		{
+			get
+			{
+				return this._prim.Kinematic;
+			}
+			set
+			{
+				this._prim.Kinematic = value;
+			}
+		}
+		
+		public override Axiom.MathLib.Quaternion Orientation
+		{
+			get
+			{
+				Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
+				PhysXWrapper.Quaternion quat = this._prim.GetOrientation();
+				res.w = quat.W;
+				res.x = quat.X;
+				res.y = quat.Y;
+				res.z = quat.Z;
+				return res;
+			}
+			set
+			{
+				
+			}
+		}
+		
+		public override PhysicsVector Acceleration
+		{
+			get
+			{
+				return _acceleration;
+			}
+			
+		}
+		public void SetAcceleration (PhysicsVector accel)
+		{
+			this._acceleration = accel;
+		}
+		
+		public override void AddForce(PhysicsVector force)
+		{
+			
+		}
+		
+		public override void SetMomentum(PhysicsVector momentum)
+		{
+			
+		}
+		
+		
+	}
+
+}
diff --git a/OpenSim/Region/Scripting/Properties/AssemblyInfo.cs b/OpenSim/Region/Scripting/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f5da4c0
--- /dev/null
+++ b/OpenSim/Region/Scripting/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.Scripting")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.Scripting")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("61eae1ad-82aa-4c77-8bc5-b5a8c9522b18")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Scripting/Script.cs b/OpenSim/Region/Scripting/Script.cs
new file mode 100644
index 0000000..0f4af00
--- /dev/null
+++ b/OpenSim/Region/Scripting/Script.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Framework.Console;
+using OpenSim.Framework;
+using OpenSim.Region;
+using OpenSim.Region.Scenes;
+
+namespace OpenSim.Scripting
+{
+    public interface IScript
+    {
+        void Initialise(ScriptInfo scriptInfo);
+    }
+
+    public class TestScript : IScript
+    {
+        ScriptInfo script;
+
+        public void Initialise(ScriptInfo scriptInfo)
+        {
+            script = scriptInfo;
+            script.events.OnFrame += new OpenSim.Region.Scenes.EventManager.OnFrameDelegate(events_OnFrame);
+        }
+
+        void events_OnFrame()
+        {
+            script.logger.Verbose("Hello World!");
+        }
+    }
+}
diff --git a/OpenSim/Region/Scripting/ScriptAccess.cs b/OpenSim/Region/Scripting/ScriptAccess.cs
new file mode 100644
index 0000000..a9fede5
--- /dev/null
+++ b/OpenSim/Region/Scripting/ScriptAccess.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Region.Scenes;
+using OpenSim.Framework.Console;
+
+namespace OpenSim.Scripting
+{
+    /// <summary>
+    /// Class which provides access to the world
+    /// </summary>
+    public class ScriptInfo
+    {
+        // Reference to world.eventsManager provided for convenience
+        public EventManager events;
+
+        // The main world
+        public Scene world;
+
+        // The console
+        public LogBase logger;
+
+        public ScriptInfo(Scene scene)
+        {
+            world = scene;
+            events = world.eventManager;
+            logger = OpenSim.Framework.Console.MainLog.Instance;
+        }
+    }
+}
diff --git a/OpenSim/Region/Simulation/Caps.cs b/OpenSim/Region/Simulation/Caps.cs
new file mode 100644
index 0000000..13a351d
--- /dev/null
+++ b/OpenSim/Region/Simulation/Caps.cs
@@ -0,0 +1,258 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Xml;
+using OpenSim.Servers;
+using OpenSim.Framework;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Types;
+using OpenSim.Caches;
+using libsecondlife;
+
+namespace OpenSim.Region
+{
+    public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
+
+    public class Caps
+    {
+        private string httpListenerAddress;
+        private uint httpListenPort;
+        private string capsObjectPath = "00001-";
+        private string requestPath = "0000/";
+        private string mapLayerPath = "0001/";
+        private string newInventory = "0002/";
+        private string requestTexture = "0003/";
+        private string eventQueue = "0100/";
+        private BaseHttpServer httpListener;
+        private LLUUID agentID;
+        private AssetCache assetCache;
+        private int eventQueueCount = 1;
+        private Queue<string> CapsEventQueue = new Queue<string>();
+
+        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
+        {
+            assetCache = assetCach;
+            capsObjectPath = capsPath;
+            httpListener = httpServer;
+            httpListenerAddress = httpListen;
+            httpListenPort = httpPort;
+            agentID = agent;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RegisterHandlers()
+        {
+            Console.WriteLine("registering CAPS handlers");
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string CapsRequest(string request, string path, string param)
+        {
+           // Console.WriteLine("Caps Request " + request);
+            string result = ""; 
+            result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
+            return result;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected LLSDCapsDetails GetCapabilities()
+        {
+           /* string capURLS = "";
+            capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>";
+            capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>";
+            //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>";
+            //capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>";
+            return capURLS;*/
+
+            LLSDCapsDetails caps = new LLSDCapsDetails();
+            caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath;
+            caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory;
+            return caps;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string MapLayer(string request, string path, string param)
+        {
+            Encoding _enc = System.Text.Encoding.UTF8;
+            Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
+            LLSDMapRequest mapReq = new LLSDMapRequest();
+            LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
+
+            LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
+            mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
+            string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
+            
+            //Console.WriteLine(" Maplayer response is " + res);
+          
+            return res;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected LLSDMapLayer BuildLLSDMapLayerResponse()
+        {
+            LLSDMapLayer mapLayer = new LLSDMapLayer();
+            mapLayer.Right = 5000;
+            mapLayer.Top = 5000;
+            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+
+            return mapLayer;
+        }
+
+        public string ProcessEventQueue(string request, string path, string param)
+        {
+            //  Console.WriteLine("event queue request " + request);
+            string res = "";
+            int timer = 0;
+
+            /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
+             {
+                 timer++;
+             }*/
+            if (this.CapsEventQueue.Count > 0)
+            {
+                lock (this.CapsEventQueue)
+                {
+                    string item = CapsEventQueue.Dequeue();
+                    res = item;
+                }
+            }
+            else
+            {
+                res = this.CreateEmptyEventResponse();
+            }
+            return res;
+        }
+
+        public string CreateEstablishAgentComms(string caps, string ipAddressPort)
+        {
+            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
+            res += "<key>events</key><array><map>";
+            res += "<key>message</key><string>EstablishAgentCommunication</string>";
+            res += "<key>body</key><map>";
+            res += "<key>sim-ip-and-port</key><string>" + ipAddressPort + "</string>";
+            res += "<key>seed-capability</key><string>" + caps + "</string>";
+            res += "<key>agent-id</key><uuid>" + this.agentID.ToStringHyphenated() + "</uuid>";
+            res += "</map>";
+            res += "</map></array>";
+            res += "</map></llsd>";
+            eventQueueCount++;
+            this.CapsEventQueue.Enqueue(res);
+            return res;
+        }
+
+        public string CreateEmptyEventResponse()
+        {
+            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
+            res += "<key>events</key><array><map>";
+            res += "</map></array>";
+            res += "</map></llsd>";
+            eventQueueCount++;
+            return res;
+        }
+
+        public string NewAgentInventory(string request, string path, string param)
+        {
+            //Console.WriteLine("received upload request:"+ request);
+            string res = "";
+            LLUUID newAsset = LLUUID.Random();
+            LLUUID newInvItem = LLUUID.Random();
+            string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
+            AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
+            httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
+            string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
+            //Console.WriteLine("uploader url is " + uploaderURL);
+            res += "<llsd><map>";
+            res += "<key>uploader</key><string>" + uploaderURL + "</string>";
+            //res += "<key>success</key><boolean>true</boolean>";
+            res += "<key>state</key><string>upload</string>";
+            res += "</map></llsd>";
+            uploader.OnUpLoad += this.UploadHandler;
+            return res;
+        }
+
+        public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
+        {
+            // Console.WriteLine("upload handler called");
+            AssetBase asset;
+            asset = new AssetBase();
+            asset.FullID = assetID;
+            asset.Type = 0;
+            asset.InvType = 0;
+            asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
+            asset.Data = data;
+            this.assetCache.AddAsset(asset);
+        }
+
+        public class AssetUploader
+        {
+            public event UpLoadedTexture OnUpLoad;
+
+            private string uploaderPath = "";
+            private LLUUID newAssetID;
+            private LLUUID inventoryItemID;
+            private BaseHttpServer httpListener;
+            public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
+            {
+                newAssetID = assetID;
+                inventoryItemID = inventoryItem;
+                uploaderPath = path;
+                httpListener = httpServer;
+
+            }
+
+            public string uploaderCaps(string request, string path, string param)
+            {
+                Encoding _enc = System.Text.Encoding.UTF8;
+                byte[] data = _enc.GetBytes(request);
+                //Console.WriteLine("recieved upload " + Util.FieldToString(data));
+                LLUUID inv = this.inventoryItemID;
+                string res = "";
+                res += "<llsd><map>";
+                res += "<key>new_asset</key><string>" + newAssetID.ToStringHyphenated() + "</string>";
+                res += "<key>new_inventory_item</key><uuid>" + inv.ToStringHyphenated() + "</uuid>";
+                res += "<key>state</key><string>complete</string>";
+                res += "</map></llsd>";
+
+               // Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
+                httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
+                if (OnUpLoad != null)
+                {
+                    OnUpLoad(newAssetID, inv, data);
+                }
+
+                /*FileStream fs = File.Create("upload.jp2");
+                BinaryWriter bw = new BinaryWriter(fs);
+                bw.Write(data);
+                bw.Close();
+                fs.Close();*/
+                return res;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Simulation/EstateManager.cs b/OpenSim/Region/Simulation/EstateManager.cs
new file mode 100644
index 0000000..dcb5564
--- /dev/null
+++ b/OpenSim/Region/Simulation/EstateManager.cs
@@ -0,0 +1,301 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Region;
+using OpenSim.Region.Scenes;
+using OpenSim;
+using libsecondlife;
+using libsecondlife.Packets;
+using Avatar = OpenSim.Region.Scenes.ScenePresence;
+
+
+namespace OpenSim.Region
+{
+
+    /// <summary>
+    /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
+    /// </summary>
+    public class EstateManager
+    {
+        private Scene m_world;
+        private RegionInfo m_regInfo;
+
+        public EstateManager(Scene world,RegionInfo reginfo)
+        {
+            m_world = world; //Estate settings found at world.m_regInfo.estateSettings      
+            m_regInfo = reginfo;
+        }
+
+        private bool convertParamStringToBool(byte[] field)
+        {
+            string s = Helpers.FieldToUTF8String(field);
+            if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true")
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, IClientAPI remote_client)
+        {
+            if (remote_client.AgentId == m_regInfo.MasterAvatarAssignedUUID)
+            {
+                switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
+                {
+                    case "getinfo":
+                        Console.WriteLine("GETINFO Requested");
+                        this.sendRegionInfoPacketToAll();
+
+                        break;
+                    case "setregioninfo":
+                        if (packet.ParamList.Length != 9)
+                        {
+                            OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
+                        }
+                        else
+                        {
+                            m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;
+
+                            if (convertParamStringToBool(packet.ParamList[0].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[1].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[2].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;
+                            }
+
+
+                            int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter)));
+                            m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents;
+
+                            float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+                            m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
+
+                            int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
+                            m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;
+                            
+
+                            if (convertParamStringToBool(packet.ParamList[7].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[8].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;
+                            }
+
+                            sendRegionInfoPacketToAll();
+                            
+                        }
+                        break;
+                    case "texturebase":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 2)
+                            {
+                                LLUUID tempUUID = new LLUUID(splitField[1]);
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_regInfo.estateSettings.terrainBase0 = tempUUID;
+                                        break;
+                                    case 1:
+                                        m_regInfo.estateSettings.terrainBase1 = tempUUID;
+                                        break;
+                                    case 2:
+                                        m_regInfo.estateSettings.terrainBase2 = tempUUID;
+                                        break;
+                                    case 3:
+                                        m_regInfo.estateSettings.terrainBase3 = tempUUID;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "texturedetail":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 2)
+                            {
+                                LLUUID tempUUID = new LLUUID(splitField[1]);
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_regInfo.estateSettings.terrainDetail0 = tempUUID;
+                                        break;
+                                    case 1:
+                                        m_regInfo.estateSettings.terrainDetail1 = tempUUID;
+                                        break;
+                                    case 2:
+                                        m_regInfo.estateSettings.terrainDetail2 = tempUUID;
+                                        break;
+                                    case 3:
+                                        m_regInfo.estateSettings.terrainDetail3 = tempUUID;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "textureheights":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 3)
+                            {
+
+                                float tempHeightLow = (float)Convert.ToDecimal(splitField[1]);
+                                float tempHeightHigh = (float)Convert.ToDecimal(splitField[2]);
+
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh;
+                                        break;
+                                    case 1:
+                                        m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh;
+                                        break;
+                                    case 2:
+                                        m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh;
+                                        break;
+                                    case 3:
+                                        m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "texturecommit":
+                        sendRegionHandshakeToAll();
+                        break;
+                    case "setregionterrain":
+                        if (packet.ParamList.Length != 9)
+                        {
+                            OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
+                        }
+                        else
+                        {
+                            m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter));
+                            m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter));
+                            m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter));
+                            m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter);
+                            m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+
+                            sendRegionInfoPacketToAll();
+                        }
+                        break;
+                    default:
+                        OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
+                        break;
+                }
+            }
+        }
+
+        public void sendRegionInfoPacketToAll()
+        {
+             List<Avatar> avatars = m_world.RequestAvatarList();
+
+             for (int i = 0; i < avatars.Count; i++)
+             {
+                 this.sendRegionInfoPacket(avatars[i].ControllingClient);
+             }
+        }
+
+        public void sendRegionHandshakeToAll()
+        {
+            List<Avatar> avatars = m_world.RequestAvatarList();
+
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                this.sendRegionHandshake(avatars[i].ControllingClient);
+            }         
+        }
+
+        public void sendRegionInfoPacket(IClientAPI remote_client)
+        {
+            Encoding _enc = System.Text.Encoding.ASCII;
+
+            AgentCircuitData circuitData = remote_client.RequestClientInfo();
+
+            RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
+            regionInfoPacket.AgentData.AgentID = circuitData.AgentID;
+            regionInfoPacket.AgentData.SessionID = circuitData.SessionID;
+            regionInfoPacket.RegionInfo.BillableFactor = m_regInfo.estateSettings.billableFactor;
+            regionInfoPacket.RegionInfo.EstateID = m_regInfo.estateSettings.estateID;
+            regionInfoPacket.RegionInfo.MaxAgents = m_regInfo.estateSettings.maxAgents;
+            regionInfoPacket.RegionInfo.ObjectBonusFactor = m_regInfo.estateSettings.objectBonusFactor;
+            regionInfoPacket.RegionInfo.ParentEstateID = m_regInfo.estateSettings.parentEstateID;
+            regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.estateSettings.pricePerMeter;
+            regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.estateSettings.redirectGridX;
+            regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.estateSettings.redirectGridY;
+            regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags;
+            regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess;
+            regionInfoPacket.RegionInfo.SimName = _enc.GetBytes( m_regInfo.RegionName);
+            regionInfoPacket.RegionInfo.SunHour = m_regInfo.estateSettings.sunHour;
+            regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.estateSettings.terrainLowerLimit;
+            regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.estateSettings.terrainRaiseLimit;
+            regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.estateSettings.useFixedSun;
+            regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.estateSettings.waterHeight;
+
+            remote_client.OutPacket(regionInfoPacket);
+        }
+
+        public void sendRegionHandshake(IClientAPI remoteClient)
+        {
+            remoteClient.SendRegionHandshake(m_regInfo);
+        }
+
+    }
+}
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj
new file mode 100644
index 0000000..7811a55
--- /dev/null
+++ b/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj
@@ -0,0 +1,211 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C0DAB338-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Simulation</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Simulation</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll" >
+      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
+      <Name>OpenSim.Framework.Communications</Name>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
+      <Name>OpenSim.Framework.GenericConfig.Xml</Name>
+      <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
+      <Name>OpenSim.Region.Caches</Name>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
+      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
+      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Caps.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="EstateManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ParcelManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RegionManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Entity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\IScenePresenceBody.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Primitive.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.Scripting.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneEvents.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.Animations.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.Body.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptEntity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\Script.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\ScriptFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user b/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Simulation/ParcelManager.cs b/OpenSim/Region/Simulation/ParcelManager.cs
new file mode 100644
index 0000000..d15d77d
--- /dev/null
+++ b/OpenSim/Region/Simulation/ParcelManager.cs
@@ -0,0 +1,892 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Region.Scenes;
+using Avatar = OpenSim.Region.Scenes.ScenePresence;
+
+namespace OpenSim.Region
+{
+
+
+    #region ParcelManager Class
+    /// <summary>
+    /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
+    /// </summary>
+    public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver
+    {
+
+        #region Constants
+        //Parcel types set with flags in ParcelOverlay.
+        //Only one of these can be used. 
+        public const byte PARCEL_TYPE_PUBLIC = (byte)0;      //Equals 00000000
+        public const byte PARCEL_TYPE_OWNED_BY_OTHER = (byte)1;      //Equals 00000001
+        public const byte PARCEL_TYPE_OWNED_BY_GROUP = (byte)2;      //Equals 00000010
+        public const byte PARCEL_TYPE_OWNED_BY_REQUESTER = (byte)3;      //Equals 00000011
+        public const byte PARCEL_TYPE_IS_FOR_SALE = (byte)4;      //Equals 00000100
+        public const byte PARCEL_TYPE_IS_BEING_AUCTIONED = (byte)5;      //Equals 00000101
+
+
+        //Flags that when set, a border on the given side will be placed
+        //NOTE: North and East is assumable by the west and south sides (if parcel to east has a west border, then I have an east border; etc)
+        //This took forever to figure out -- jeesh. /blame LL for even having to send these
+        public const byte PARCEL_FLAG_PROPERTY_BORDER_WEST = (byte)64;     //Equals 01000000
+        public const byte PARCEL_FLAG_PROPERTY_BORDER_SOUTH = (byte)128;    //Equals 10000000
+
+        //RequestResults (I think these are right, they seem to work):
+        public const int PARCEL_RESULT_ONE_PARCEL = 0;	// The request they made contained only one parcel
+        public const int PARCEL_RESULT_MULTIPLE_PARCELS = 1;	// The request they made contained more than one parcel
+
+        //These are other constants. Yay!
+        public const int START_PARCEL_LOCAL_ID = 1;
+        #endregion
+
+        #region Member Variables
+        public Dictionary<int, Parcel> parcelList = new Dictionary<int, Parcel>();
+        private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+        private int[,] parcelIDList = new int[64, 64];
+
+        private Scene m_world;
+        private RegionInfo m_regInfo;
+
+        #endregion
+
+        #region Constructors
+        public ParcelManager(Scene world, RegionInfo reginfo)
+        {
+
+            m_world = world;
+            m_regInfo = reginfo;
+            parcelIDList.Initialize();
+
+        }
+        #endregion
+
+        #region Member Functions
+
+        #region Parcel From Storage Functions
+        public void ParcelFromStorage(ParcelData data)
+        {
+            Parcel new_parcel = new Parcel(data.ownerID, data.isGroupOwned, m_world);
+            new_parcel.parcelData = data.Copy();
+            new_parcel.setParcelBitmapFromByteArray();
+            addParcel(new_parcel);
+
+        }
+
+        public void NoParcelDataFromStorage()
+        {
+            resetSimParcels();
+        }
+        #endregion
+
+        #region Parcel Add/Remove/Get/Create
+        /// <summary>
+        /// Creates a basic Parcel object without an owner (a zeroed key)
+        /// </summary>
+        /// <returns></returns>
+        public Parcel createBaseParcel()
+        {
+            return new Parcel(new LLUUID(), false, m_world);
+        }
+
+        /// <summary>
+        /// Adds a parcel to the stored list and adds them to the parcelIDList to what they own
+        /// </summary>
+        /// <param name="new_parcel">The parcel being added</param>
+        public void addParcel(Parcel new_parcel)
+        {
+            lastParcelLocalID++;
+            new_parcel.parcelData.localID = lastParcelLocalID;
+            parcelList.Add(lastParcelLocalID, new_parcel.Copy());
+
+
+            bool[,] parcelBitmap = new_parcel.getParcelBitmap();
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmap[x, y])
+                    {
+                        parcelIDList[x, y] = lastParcelLocalID;
+                    }
+                }
+            }
+            parcelList[lastParcelLocalID].forceUpdateParcelInfo();
+
+
+        }
+        /// <summary>
+        /// Removes a parcel from the list. Will not remove if local_id is still owning an area in parcelIDList
+        /// </summary>
+        /// <param name="local_id">Parcel.localID of the parcel to remove.</param>
+        public void removeParcel(int local_id)
+        {
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelIDList[x, y] == local_id)
+                    {
+                        throw new Exception("Could not remove parcel. Still being used at " + x + ", " + y);
+                    }
+                }
+            }
+            m_world.localStorage.RemoveParcel(parcelList[local_id].parcelData);
+            parcelList.Remove(local_id);
+        }
+
+        private void performFinalParcelJoin(Parcel master, Parcel slave)
+        {
+            int x, y;
+            bool[,] parcelBitmapSlave = slave.getParcelBitmap();
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmapSlave[x, y])
+                    {
+                        parcelIDList[x, y] = master.parcelData.localID;
+                    }
+                }
+            }
+            removeParcel(slave.parcelData.localID);
+        }
+        /// <summary>
+        /// Get the parcel at the specified point
+        /// </summary>
+        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
+        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
+        /// <returns>Parcel at the point supplied</returns>
+        public Parcel getParcel(int x, int y)
+        {
+            if (x > 256 || y > 256 || x < 0 || y < 0)
+            {
+                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
+            }
+            else
+            {
+                return parcelList[parcelIDList[x / 4, y / 4]];
+            }
+
+        }
+        #endregion
+
+        #region Parcel Modification
+        /// <summary>
+        /// Subdivides a parcel
+        /// </summary>
+        /// <param name="start_x">West Point</param>
+        /// <param name="start_y">South Point</param>
+        /// <param name="end_x">East Point</param>
+        /// <param name="end_y">North Point</param>
+        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
+        /// <returns>Returns true if successful</returns>
+        private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+            //First, lets loop through the points and make sure they are all in the same parcel
+            //Get the parcel at start
+            Parcel startParcel = getParcel(start_x, start_y);
+            if (startParcel == null) return false; //No such parcel at the beginning
+
+            //Loop through the points
+            try
+            {
+                int totalX = end_x - start_x;
+                int totalY = end_y - start_y;
+                int x, y;
+                for (y = 0; y < totalY; y++)
+                {
+                    for (x = 0; x < totalX; x++)
+                    {
+                        Parcel tempParcel = getParcel(start_x + x, start_y + y);
+                        if (tempParcel == null) return false; //No such parcel at that point
+                        if (tempParcel != startParcel) return false; //Subdividing over 2 parcels; no-no
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                return false; //Exception. For now, lets skip subdivision
+            }
+
+            //If we are still here, then they are subdividing within one parcel
+            //Check owner
+            if (startParcel.parcelData.ownerID != attempting_user_id)
+            {
+                return false; //They cant do this!
+            }
+
+            //Lets create a new parcel with bitmap activated at that point (keeping the old parcels info)
+            Parcel newParcel = startParcel.Copy();
+            newParcel.parcelData.parcelName = "Subdivision of " + newParcel.parcelData.parcelName;
+            newParcel.parcelData.globalID = LLUUID.Random();
+
+            newParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(start_x, start_y, end_x, end_y));
+
+            //Now, lets set the subdivision area of the original to false
+            int startParcelIndex = startParcel.parcelData.localID;
+            parcelList[startParcelIndex].setParcelBitmap(Parcel.modifyParcelBitmapSquare(startParcel.getParcelBitmap(), start_x, start_y, end_x, end_y, false));
+            parcelList[startParcelIndex].forceUpdateParcelInfo();
+
+
+            //Now add the new parcel
+            addParcel(newParcel);
+
+
+
+
+
+            return true;
+        }
+        /// <summary>
+        /// Join 2 parcels together
+        /// </summary>
+        /// <param name="start_x">x value in first parcel</param>
+        /// <param name="start_y">y value in first parcel</param>
+        /// <param name="end_x">x value in second parcel</param>
+        /// <param name="end_y">y value in second parcel</param>
+        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the parcels</param>
+        /// <returns>Returns true if successful</returns>
+        private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+            end_x -= 4;
+            end_y -= 4;
+
+            //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
+            //This should be fixed later -- somewhat "incomplete code" --Ming
+            Parcel startParcel, endParcel;
+
+            try
+            {
+                startParcel = getParcel(start_x, start_y);
+                endParcel = getParcel(end_x, end_y);
+            }
+            catch (Exception)
+            {
+                return false; //Error occured when trying to get the start and end parcels
+            }
+            if (startParcel == endParcel)
+            {
+                return false; //Subdivision of the same parcel is not allowed
+            }
+
+            //Check the parcel owners:
+            if (startParcel.parcelData.ownerID != endParcel.parcelData.ownerID)
+            {
+                return false;
+            }
+            if (startParcel.parcelData.ownerID != attempting_user_id)
+            {
+                //TODO: Group editing stuff. Avatar owner support for now
+                return false;
+            }
+
+            //Same owners! Lets join them
+            //Merge them to startParcel
+            parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
+            performFinalParcelJoin(startParcel, endParcel);
+
+            return true;
+
+
+
+        }
+        #endregion
+
+        #region Parcel Updating
+        /// <summary>
+        /// Where we send the ParcelOverlay packet to the client
+        /// </summary>
+        /// <param name="remote_client">The object representing the client</param>
+        public void sendParcelOverlay(IClientAPI remote_client)
+        {
+            const int PARCEL_BLOCKS_PER_PACKET = 1024;
+            int x, y = 0;
+            byte[] byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+            int byteArrayCount = 0;
+            int sequenceID = 0;
+            ParcelOverlayPacket packet;
+
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    byte tempByte = (byte)0; //This represents the byte for the current 4x4
+                    Parcel currentParcelBlock = getParcel(x * 4, y * 4);
+
+                    if (currentParcelBlock.parcelData.ownerID == remote_client.AgentId)
+                    {
+                        //Owner Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_REQUESTER);
+                    }
+                    else if (currentParcelBlock.parcelData.salePrice > 0 && (currentParcelBlock.parcelData.authBuyerID == LLUUID.Zero || currentParcelBlock.parcelData.authBuyerID == remote_client.AgentId))
+                    {
+                        //Sale Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);
+                    }
+                    else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)
+                    {
+                        //Public Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
+                    }
+                    else
+                    {
+                        //Other Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_OTHER);
+                    }
+
+
+                    //Now for border control
+                    if (x == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+                    }
+                    else if (getParcel((x - 1) * 4, y * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+                    }
+
+                    if (y == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+                    else if (getParcel(x * 4, (y - 1) * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+
+                    byteArray[byteArrayCount] = tempByte;
+                    byteArrayCount++;
+                    if (byteArrayCount >= PARCEL_BLOCKS_PER_PACKET)
+                    {
+                        byteArrayCount = 0;
+                        packet = new ParcelOverlayPacket();
+                        packet.ParcelData.Data = byteArray;
+                        packet.ParcelData.SequenceID = sequenceID;
+                        remote_client.OutPacket((Packet)packet);
+                        sequenceID++;
+                        byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+                    }
+                }
+            }
+
+            packet = new ParcelOverlayPacket();
+            packet.ParcelData.Data = byteArray;
+            packet.ParcelData.SequenceID = sequenceID; //Eh?
+            remote_client.OutPacket((Packet)packet);
+        }
+
+        public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)
+        {
+            //Get the parcels within the bounds
+            List<Parcel> temp = new List<Parcel>();
+            int x, y, i;
+            int inc_x = end_x - start_x;
+            int inc_y = end_y - start_y;
+            for (x = 0; x < inc_x; x++)
+            {
+                for (y = 0; y < inc_y; y++)
+                {
+                    OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y);
+                    if (!temp.Contains(currentParcel))
+                    {
+                        currentParcel.forceUpdateParcelInfo();
+                        temp.Add(currentParcel);
+                    }
+                }
+            }
+
+            int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL;
+            if (temp.Count > 1)
+            {
+                requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;
+            }
+
+            for (i = 0; i < temp.Count; i++)
+            {
+                temp[i].sendParcelProperties(sequence_id, snap_selection, requestResult, remote_client);
+            }
+
+
+            sendParcelOverlay(remote_client);
+        }
+
+        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        {
+            if (parcelList.ContainsKey(packet.ParcelData.LocalID))
+            {
+                parcelList[packet.ParcelData.LocalID].updateParcelProperties(packet, remote_client);
+            }
+        }
+        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        {
+            subdivide(west, south, east, north, remote_client.AgentId);
+        }
+        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        {
+            join(west, south, east, north, remote_client.AgentId);
+
+        }
+        #endregion
+
+        /// <summary>
+        /// Resets the sim to the default parcel (full sim parcel owned by the default user)
+        /// </summary>
+        public void resetSimParcels()
+        {
+            //Remove all the parcels in the sim and add a blank, full sim parcel set to public
+            parcelList.Clear();
+            lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+            parcelIDList.Initialize();
+
+            Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world);
+
+            fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
+            fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
+            fullSimParcel.parcelData.parcelDesc = "";
+
+            fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
+            fullSimParcel.parcelData.salePrice = 1;
+            fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
+            fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
+
+            addParcel(fullSimParcel);
+
+        }
+        #endregion
+    }
+    #endregion
+
+
+    #region Parcel Class
+    /// <summary>
+    /// Keeps track of a specific parcel's information
+    /// </summary>
+    public class Parcel
+    {
+        #region Member Variables
+        public ParcelData parcelData = new ParcelData();
+        public Scene m_world;
+
+        private bool[,] parcelBitmap = new bool[64, 64];
+
+        #endregion
+
+
+        #region Constructors
+        public Parcel(LLUUID owner_id, bool is_group_owned, Scene world)
+        {
+            m_world = world;
+            parcelData.ownerID = owner_id;
+            parcelData.isGroupOwned = is_group_owned;
+
+        }
+        #endregion
+
+
+        #region Member Functions
+
+        #region General Functions
+        /// <summary>
+        /// Checks to see if this parcel contains a point
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns>Returns true if the parcel contains the specified point</returns>
+        public bool containsPoint(int x, int y)
+        {
+            if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
+            {
+                return (parcelBitmap[x / 4, y / 4] == true);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public Parcel Copy()
+        {
+            Parcel newParcel = new Parcel(this.parcelData.ownerID, this.parcelData.isGroupOwned, m_world);
+
+            //Place all new variables here!
+            newParcel.parcelBitmap = (bool[,])(this.parcelBitmap.Clone());
+            newParcel.parcelData = parcelData.Copy();
+
+            return newParcel;
+        }
+
+        #endregion
+
+
+        #region Packet Request Handling
+        /// <summary>
+        /// Sends parcel properties as requested
+        /// </summary>
+        /// <param name="sequence_id">ID sent by client for them to keep track of</param>
+        /// <param name="snap_selection">Bool sent by client for them to use</param>
+        /// <param name="remote_client">Object representing the client</param>
+        public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
+        {
+
+            ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();
+            updatePacket.ParcelData.AABBMax = parcelData.AABBMax;
+            updatePacket.ParcelData.AABBMin = parcelData.AABBMin;
+            updatePacket.ParcelData.Area = parcelData.area;
+            updatePacket.ParcelData.AuctionID = parcelData.auctionID;
+            updatePacket.ParcelData.AuthBuyerID = parcelData.authBuyerID; //unemplemented
+
+            updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
+
+            updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);
+            updatePacket.ParcelData.Category = (byte)parcelData.category;
+            updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
+            updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
+            updatePacket.ParcelData.GroupID = parcelData.groupID;
+            updatePacket.ParcelData.GroupPrims = parcelData.groupPrims;
+            updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;
+            updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;
+            updatePacket.ParcelData.LocalID = parcelData.localID;
+            updatePacket.ParcelData.MaxPrims = 1000; //unemplemented
+            updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;
+            updatePacket.ParcelData.MediaID = parcelData.mediaID;
+            updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);
+            updatePacket.ParcelData.MusicURL = Helpers.StringToField(parcelData.musicURL);
+            updatePacket.ParcelData.Name = Helpers.StringToField(parcelData.parcelName);
+            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
+            updatePacket.ParcelData.OtherCount = 0; //unemplemented
+            updatePacket.ParcelData.OtherPrims = 0; //unemplented
+            updatePacket.ParcelData.OwnerID = parcelData.ownerID;
+            updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
+            updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented
+            updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented
+            updatePacket.ParcelData.PassHours = parcelData.passHours;
+            updatePacket.ParcelData.PassPrice = parcelData.passPrice;
+            updatePacket.ParcelData.PublicCount = 0; //unemplemented
+            updatePacket.ParcelData.RegionDenyAnonymous = false; //unemplemented
+            updatePacket.ParcelData.RegionDenyIdentified = false; //unemplemented
+            updatePacket.ParcelData.RegionDenyTransacted = false; //unemplemented
+            updatePacket.ParcelData.RegionPushOverride = true; //unemplemented
+            updatePacket.ParcelData.RentPrice = 0; //??
+            updatePacket.ParcelData.RequestResult = request_result;
+            updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented
+            updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented
+            updatePacket.ParcelData.SelfCount = 0;//unemplemented
+            updatePacket.ParcelData.SequenceID = sequence_id;
+            updatePacket.ParcelData.SimWideMaxPrims = 15000; //unemplemented
+            updatePacket.ParcelData.SimWideTotalPrims = 0; //unemplemented
+            updatePacket.ParcelData.SnapSelection = snap_selection;
+            updatePacket.ParcelData.SnapshotID = parcelData.snapshotID;
+            updatePacket.ParcelData.Status = (byte)parcelData.parcelStatus;
+            updatePacket.ParcelData.TotalPrims = 0; //unemplemented
+            updatePacket.ParcelData.UserLocation = parcelData.userLocation;
+            updatePacket.ParcelData.UserLookAt = parcelData.userLookAt;
+            remote_client.OutPacket((Packet)updatePacket);
+        }
+
+        public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        {
+            if (remote_client.AgentId == parcelData.ownerID)
+            {
+                //Needs later group support
+                parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
+                parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
+                parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
+                parcelData.groupID = packet.ParcelData.GroupID;
+                parcelData.landingType = packet.ParcelData.LandingType;
+                parcelData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
+                parcelData.mediaID = packet.ParcelData.MediaID;
+                parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
+                parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
+                parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);
+                parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
+                parcelData.passHours = packet.ParcelData.PassHours;
+                parcelData.passPrice = packet.ParcelData.PassPrice;
+                parcelData.salePrice = packet.ParcelData.SalePrice;
+                parcelData.snapshotID = packet.ParcelData.SnapshotID;
+                parcelData.userLocation = packet.ParcelData.UserLocation;
+                parcelData.userLookAt = packet.ParcelData.UserLookAt;
+
+                List<Avatar> avatars = m_world.RequestAvatarList();
+
+                for (int i = 0; i < avatars.Count; i++)
+                {
+                    Parcel over = m_world.parcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));
+                    if (over == this)
+                    {
+                        sendParcelProperties(0, false, 0, avatars[i].ControllingClient);
+                    }
+                }
+
+            }
+        }
+        #endregion
+
+
+        #region Update Functions
+        /// <summary>
+        /// Updates the AABBMin and AABBMax values after area/shape modification of parcel
+        /// </summary>
+        private void updateAABBAndAreaValues()
+        {
+            int min_x = 64;
+            int min_y = 64;
+            int max_x = 0;
+            int max_y = 0;
+            int tempArea = 0;
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmap[x, y] == true)
+                    {
+                        if (min_x > x) min_x = x;
+                        if (min_y > y) min_y = y;
+                        if (max_x < x) max_x = x;
+                        if (max_y < y) max_y = y;
+                        tempArea += 16; //16sqm parcel
+                    }
+                }
+            }
+            parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);
+            parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);
+            parcelData.area = tempArea;
+        }
+
+        public void updateParcelBitmapByteArray()
+        {
+            parcelData.parcelBitmapByteArray = convertParcelBitmapToBytes();
+        }
+
+        /// <summary>
+        /// Update all settings in parcel such as area, bitmap byte array, etc
+        /// </summary>
+        public void forceUpdateParcelInfo()
+        {
+            this.updateAABBAndAreaValues();
+            this.updateParcelBitmapByteArray();
+        }
+
+        public void setParcelBitmapFromByteArray()
+        {
+            parcelBitmap = convertBytesToParcelBitmap();
+        }
+        #endregion
+
+
+        #region Parcel Bitmap Functions
+        /// <summary>
+        /// Sets the parcel's bitmap manually
+        /// </summary>
+        /// <param name="bitmap">64x64 block representing where this parcel is on a map</param>
+        public void setParcelBitmap(bool[,] bitmap)
+        {
+            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap");
+            }
+            else
+            {
+                //Valid: Lets set it
+                parcelBitmap = bitmap;
+                forceUpdateParcelInfo();
+
+            }
+        }
+        /// <summary>
+        /// Gets the parcels bitmap manually
+        /// </summary>
+        /// <returns></returns>
+        public bool[,] getParcelBitmap()
+        {
+            return parcelBitmap;
+        }
+        /// <summary>
+        /// Converts the parcel bitmap to a packet friendly byte array
+        /// </summary>
+        /// <returns></returns>
+        private byte[] convertParcelBitmapToBytes()
+        {
+            byte[] tempConvertArr = new byte[512];
+            byte tempByte = 0;
+            int x, y, i, byteNum = 0;
+            i = 0;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(parcelBitmap[x, y]) << (i++ % 8));
+                    if (i % 8 == 0)
+                    {
+                        tempConvertArr[byteNum] = tempByte;
+                        tempByte = (byte)0;
+                        i = 0;
+                        byteNum++;
+                    }
+                }
+            }
+            return tempConvertArr;
+        }
+
+        private bool[,] convertBytesToParcelBitmap()
+        {
+            bool[,] tempConvertMap = new bool[64, 64];
+            tempConvertMap.Initialize();
+            byte tempByte = 0;
+            int x = 0, y = 0, i = 0, bitNum = 0;
+            for (i = 0; i < 512; i++)
+            {
+                tempByte = parcelData.parcelBitmapByteArray[i];
+                for (bitNum = 0; bitNum < 8; bitNum++)
+                {
+                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);
+                    tempConvertMap[x, y] = bit;
+                    x++;
+                    if (x > 63)
+                    {
+                        x = 0;
+                        y++;
+                    }
+
+                }
+
+            }
+            return tempConvertMap;
+        }
+        /// <summary>
+        /// Full sim parcel creation
+        /// </summary>
+        /// <returns></returns>
+        public static bool[,] basicFullRegionParcelBitmap()
+        {
+            return getSquareParcelBitmap(0, 0, 256, 256);
+        }
+
+        /// <summary>
+        /// Used to modify the bitmap between the x and y points. Points use 64 scale
+        /// </summary>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <returns></returns>
+        public static bool[,] getSquareParcelBitmap(int start_x, int start_y, int end_x, int end_y)
+        {
+
+            bool[,] tempBitmap = new bool[64, 64];
+            tempBitmap.Initialize();
+
+            tempBitmap = modifyParcelBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            return tempBitmap;
+        }
+
+        /// <summary>
+        /// Change a parcel's bitmap at within a square and set those points to a specific value
+        /// </summary>
+        /// <param name="parcel_bitmap"></param>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <param name="set_value"></param>
+        /// <returns></returns>
+        public static bool[,] modifyParcelBitmapSquare(bool[,] parcel_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)
+        {
+            if (parcel_bitmap.GetLength(0) != 64 || parcel_bitmap.GetLength(1) != 64 || parcel_bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap in modifyParcelBitmapSquare()");
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (x >= start_x / 4 && x < end_x / 4
+                        && y >= start_y / 4 && y < end_y / 4)
+                    {
+                        parcel_bitmap[x, y] = set_value;
+                    }
+                }
+            }
+            return parcel_bitmap;
+        }
+        /// <summary>
+        /// Join the true values of 2 bitmaps together
+        /// </summary>
+        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_add"></param>
+        /// <returns></returns>
+        public static bool[,] mergeParcelBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
+        {
+            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeParcelBitmaps");
+            }
+            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeParcelBitmaps");
+
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (bitmap_add[x, y])
+                    {
+                        bitmap_base[x, y] = true;
+                    }
+                }
+            }
+            return bitmap_base;
+        }
+        #endregion
+
+        #endregion
+
+
+    }
+    #endregion
+
+
+}
diff --git a/OpenSim/Region/Simulation/RegionManager.cs b/OpenSim/Region/Simulation/RegionManager.cs
new file mode 100644
index 0000000..a317f0f
--- /dev/null
+++ b/OpenSim/Region/Simulation/RegionManager.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenGrid.Framework.Communications;
+using OpenSim.Framework;
+using OpenSim.Framework.Types;
+using OpenSim.Servers;
+
+namespace OpenSim.Region
+{
+    public class RegionManager //needs renaming , but first we need to rename the namespace
+    {
+        protected AuthenticateSessionsBase authenticateHandler;
+        protected RegionCommsListener regionCommsHost;
+        protected CommunicationsManager commsManager;
+        protected List<Caps> capsHandlers = new List<Caps>();
+        protected BaseHttpServer httpListener;
+
+        protected Scenes.Scene m_Scene;
+
+        public ParcelManager parcelManager;
+        public EstateManager estateManager;
+
+        public RegionManager()
+        {
+
+        }
+
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/Entity.cs b/OpenSim/Region/Simulation/Scenes/Entity.cs
new file mode 100644
index 0000000..f8754f5
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/Entity.cs
@@ -0,0 +1,194 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Axiom.MathLib;
+using OpenSim.Physics.Manager;
+using libsecondlife;
+using OpenSim.Region.Scripting;
+
+namespace OpenSim.Region.Scenes
+{
+    public abstract class Entity : IScriptReadonlyEntity
+    {
+        public libsecondlife.LLUUID uuid;
+        public Quaternion rotation;
+        protected List<Entity> children;
+        
+        protected PhysicsActor _physActor;
+        protected Scene m_world;
+        protected string m_name;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual string Name
+        {
+            get { return m_name; }
+        }
+
+        protected LLVector3 m_pos;
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual LLVector3 Pos
+        {
+            get
+            {
+                if (this._physActor != null)
+                {
+                    m_pos.X = _physActor.Position.X;
+                    m_pos.Y = _physActor.Position.Y;
+                    m_pos.Z = _physActor.Position.Z;
+                }
+
+                return m_pos;
+            }
+            set
+            {
+                if (this._physActor != null)
+                {
+                    try
+                    {
+                        lock (this.m_world.SyncRoot)
+                        {
+
+                            this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(e.Message);
+                    }
+                }
+
+                m_pos = value;
+            }
+        }
+
+        public LLVector3 velocity;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual LLVector3 Velocity
+        {
+            get
+            {
+                if (this._physActor != null)
+                {
+                    velocity.X = _physActor.Velocity.X;
+                    velocity.Y = _physActor.Velocity.Y;
+                    velocity.Z = _physActor.Velocity.Z;
+                }
+
+                return velocity;
+            }
+            set
+            {
+                if (this._physActor != null)
+                {
+                    try
+                    {
+                        lock (this.m_world.SyncRoot)
+                        {
+
+                            this._physActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(e.Message);
+                    }
+                }
+
+                velocity = value;
+            }
+        }
+
+        protected uint m_localId;
+
+        public uint LocalId
+        {
+            get { return m_localId; }
+        }
+
+        /// <summary>
+        /// Creates a new Entity (should not occur on it's own)
+        /// </summary>
+        public Entity()
+        {
+            uuid = new libsecondlife.LLUUID();
+
+            m_pos = new LLVector3();
+            velocity = new LLVector3();
+            rotation = new Quaternion();
+            m_name = "(basic entity)";
+            children = new List<Entity>();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual void updateMovement()
+        {
+        	foreach (Entity child in children)
+            {
+                child.updateMovement();
+            }
+        }
+
+        /// <summary>
+        /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
+        /// </summary>
+        public virtual void update() {
+            // Do any per-frame updates needed that are applicable to every type of entity
+            foreach (Entity child in children)
+            {
+                child.update();
+            }
+        }
+
+        /// <summary>
+        /// Called at a set interval to inform entities that they should back themsleves up to the DB 
+        /// </summary>
+        public virtual void BackUp()
+        {
+        	
+        }
+
+        /// <summary>
+        /// Infoms the entity that the land (heightmap) has changed
+        /// </summary>
+        public virtual void LandRenegerated()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
new file mode 100644
index 0000000..65077e6
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Region.Scenes
+{
+    public interface IScenePresenceBody
+    {
+        void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
+        void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
+        void SendOurAppearance(IClientAPI OurClient);
+        void SendAppearanceToOtherAgent(ScenePresence avatarInfo);
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/Primitive.cs b/OpenSim/Region/Simulation/Scenes/Primitive.cs
new file mode 100644
index 0000000..e04c711
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/Primitive.cs
@@ -0,0 +1,582 @@
+
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+
+namespace OpenSim.Region.Scenes
+{
+    public class Primitive : Entity
+    {
+        internal PrimData primData;
+        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
+       // private Dictionary<uint, IClientAPI> m_clientThreads;
+        private ulong m_regionHandle;
+        private const uint FULL_MASK_PERMISSIONS = 2147483647;
+        private bool physicsEnabled = false;
+        private byte updateFlag = 0;
+        private uint flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
+
+        private Dictionary<LLUUID, InventoryItem> inventoryItems;
+
+        #region Properties
+
+        public LLVector3 Scale
+        {
+            set
+            {
+                this.primData.Scale = value;
+                //this.dirtyFlag = true;
+            }
+            get
+            {
+                return this.primData.Scale;
+            }
+        }
+
+        public PhysicsActor PhysActor
+        {
+            set
+            {
+                this._physActor = value;
+            }
+        }
+
+        public override LLVector3 Pos
+        {
+            get
+            {
+                return base.Pos;
+            }
+            set
+            {
+                base.Pos = value;
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="clientThreads"></param>
+        /// <param name="regionHandle"></param>
+        /// <param name="world"></param>
+        public Primitive( ulong regionHandle, Scene world)
+        {
+           // m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="world"></param>
+        /// <param name="addPacket"></param>
+        /// <param name="ownerID"></param>
+        /// <param name="localID"></param>
+        public Primitive(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
+        {
+            // m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.CreateFromPacket(addPacket, ownerID, localID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="clientThreads"></param>
+        /// <param name="regionHandle"></param>
+        /// <param name="world"></param>
+        /// <param name="owner"></param>
+        /// <param name="fullID"></param>
+        /// <param name="localID"></param>
+        public Primitive( ulong regionHandle, Scene world, LLUUID owner, LLUUID fullID, uint localID)
+        {
+          //  m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.primData = new PrimData();
+            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            this.primData.OwnerID = owner;
+            this.primData.FullID = this.uuid = fullID;
+            this.primData.LocalID = m_localId = localID;
+        }
+
+        /// <summary>
+        /// Constructor to create a default cube 
+        /// </summary>
+        /// <param name="clientThreads"></param>
+        /// <param name="regionHandle"></param>
+        /// <param name="world"></param>
+        /// <param name="owner"></param>
+        /// <param name="localID"></param>
+        /// <param name="position"></param>
+        public Primitive( ulong regionHandle, Scene world, LLUUID owner, uint localID, LLVector3 position)
+        {
+            //m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.primData = PrimData.DefaultCube();
+            this.primData.OwnerID = owner;
+            this.primData.LocalID = m_localId = localID;
+            this.Pos = this.primData.Position = position;
+
+            this.updateFlag = 1;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public byte[] GetByteArray()
+        {
+            byte[] result = null;
+            List<byte[]> dataArrays = new List<byte[]>();
+            dataArrays.Add(primData.ToBytes());
+            foreach (Entity child in children)
+            {
+                if (child is OpenSim.Region.Scenes.Primitive)
+                {
+                    dataArrays.Add(((OpenSim.Region.Scenes.Primitive)child).GetByteArray());
+                }
+            }
+            byte[] primstart = Helpers.StringToField("<Prim>");
+            byte[] primend = Helpers.StringToField("</Prim>");
+            int totalLength = primstart.Length + primend.Length;
+            for (int i = 0; i < dataArrays.Count; i++)
+            {
+                totalLength += dataArrays[i].Length;
+            }
+
+            result = new byte[totalLength];
+            int arraypos = 0;
+            Array.Copy(primstart, 0, result, 0, primstart.Length);
+            arraypos += primstart.Length;
+            for (int i = 0; i < dataArrays.Count; i++)
+            {
+                Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length);
+                arraypos += dataArrays[i].Length;
+            }
+            Array.Copy(primend, 0, result, arraypos, primend.Length);
+
+            return result;
+        }
+
+        #region Overridden Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void update()
+        {
+            if (this.updateFlag == 1) // is a new prim just been created/reloaded 
+            {
+                this.SendFullUpdateToAllClients();
+                this.updateFlag = 0;
+            }
+            if (this.updateFlag == 2) //some change has been made so update the clients
+            {
+                this.SendTerseUpdateToALLClients();
+                this.updateFlag = 0;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void BackUp()
+        {
+
+        }
+
+        #endregion
+
+        #region Packet handlers
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pos"></param>
+        public void UpdatePosition(LLVector3 pos)
+        {
+            this.Pos = new LLVector3(pos.X, pos.Y, pos.Z);
+            this.updateFlag = 2;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        public void UpdateShape(ObjectShapePacket.ObjectDataBlock updatePacket)
+        {
+            this.primData.PathBegin = updatePacket.PathBegin;
+            this.primData.PathEnd = updatePacket.PathEnd;
+            this.primData.PathScaleX = updatePacket.PathScaleX;
+            this.primData.PathScaleY = updatePacket.PathScaleY;
+            this.primData.PathShearX = updatePacket.PathShearX;
+            this.primData.PathShearY = updatePacket.PathShearY;
+            this.primData.PathSkew = updatePacket.PathSkew;
+            this.primData.ProfileBegin = updatePacket.ProfileBegin;
+            this.primData.ProfileEnd = updatePacket.ProfileEnd;
+            this.primData.PathCurve = updatePacket.PathCurve;
+            this.primData.ProfileCurve = updatePacket.ProfileCurve;
+            this.primData.ProfileHollow = updatePacket.ProfileHollow;
+            this.primData.PathRadiusOffset = updatePacket.PathRadiusOffset;
+            this.primData.PathRevolutions = updatePacket.PathRevolutions;
+            this.primData.PathTaperX = updatePacket.PathTaperX;
+            this.primData.PathTaperY = updatePacket.PathTaperY;
+            this.primData.PathTwist = updatePacket.PathTwist;
+            this.primData.PathTwistBegin = updatePacket.PathTwistBegin;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="tex"></param>
+        public void UpdateTexture(byte[] tex)
+        {
+            this.primData.TextureEntry = tex;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pack"></param>
+        public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="prim"></param>
+        public void AssignToParent(Primitive prim)
+        {
+
+        }
+
+        #endregion
+
+        # region Inventory Methods
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        public bool AddToInventory(InventoryItem item)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="itemID"></param>
+        /// <returns></returns>
+        public InventoryItem RemoveFromInventory(LLUUID itemID)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="simClient"></param>
+        /// <param name="packet"></param>
+        public void RequestInventoryInfo(IClientAPI simClient, RequestTaskInventoryPacket packet)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="simClient"></param>
+        /// <param name="xferID"></param>
+        public void RequestXferInventory(IClientAPI simClient, ulong xferID)
+        {
+            //will only currently work if the total size of the inventory data array is under about 1000 bytes
+            SendXferPacketPacket send = new SendXferPacketPacket();
+
+            send.XferID.ID = xferID;
+            send.XferID.Packet = 1 + 2147483648;
+            send.DataPacket.Data = this.ConvertInventoryToBytes();
+
+            simClient.OutPacket(send);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public byte[] ConvertInventoryToBytes()
+        {
+            System.Text.Encoding enc = System.Text.Encoding.ASCII;
+            byte[] result = new byte[0];
+            List<byte[]> inventoryData = new List<byte[]>();
+            int totallength = 0;
+            foreach (InventoryItem invItem in inventoryItems.Values)
+            {
+                byte[] data = enc.GetBytes(invItem.ExportString());
+                inventoryData.Add(data);
+                totallength += data.Length;
+            }
+            //TODO: copy arrays into the single result array
+
+            return result;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="data"></param>
+        public void CreateInventoryFromBytes(byte[] data)
+        {
+
+        }
+
+        #endregion
+
+        #region Update viewers Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        public void SendFullUpdateForAllChildren(IClientAPI remoteClient)
+        {
+            this.SendFullUpdateToClient(remoteClient);
+            for (int i = 0; i < this.children.Count; i++)
+            {
+                if (this.children[i] is Primitive)
+                {
+                    ((Primitive)this.children[i]).SendFullUpdateForAllChildren(remoteClient);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        public void SendFullUpdateToClient(IClientAPI remoteClient)
+        {
+            LLVector3 lPos;
+            if (this._physActor != null && this.physicsEnabled)
+            {
+                PhysicsVector pPos = this._physActor.Position;
+                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
+            }
+            else
+            {
+                lPos = this.Pos;
+            }
+
+            remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.LocalId, this.primData, lPos, new LLUUID("00000000-0000-0000-9999-000000000005"), this.flags);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendFullUpdateToAllClients()
+        {
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                this.SendFullUpdateToClient(avatars[i].ControllingClient);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="RemoteClient"></param>
+        public void SendTerseUpdateToClient(IClientAPI RemoteClient)
+        {
+            LLVector3 lPos;
+            Axiom.MathLib.Quaternion lRot;
+            if (this._physActor != null && this.physicsEnabled) //is this needed ? doesn't the property fields do this for us?
+            {
+                PhysicsVector pPos = this._physActor.Position;
+                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
+                lRot = this._physActor.Orientation;
+            }
+            else
+            {
+                lPos = this.Pos;
+                lRot = this.rotation;
+            }
+            LLQuaternion mRot = new LLQuaternion(lRot.x, lRot.y, lRot.z, lRot.w);
+            RemoteClient.SendPrimTerseUpdate(this.m_regionHandle, 64096, this.LocalId, lPos, mRot);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendTerseUpdateToALLClients()
+        {
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                this.SendTerseUpdateToClient(avatars[i].ControllingClient);
+            }
+        }
+
+        #endregion
+
+        #region Create Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="ownerID"></param>
+        /// <param name="localID"></param>
+        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
+        {
+            PrimData PData = new PrimData();
+            this.primData = PData;
+            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+
+            PData.OwnerID = ownerID;
+            PData.PCode = addPacket.ObjectData.PCode;
+            PData.PathBegin = addPacket.ObjectData.PathBegin;
+            PData.PathEnd = addPacket.ObjectData.PathEnd;
+            PData.PathScaleX = addPacket.ObjectData.PathScaleX;
+            PData.PathScaleY = addPacket.ObjectData.PathScaleY;
+            PData.PathShearX = addPacket.ObjectData.PathShearX;
+            PData.PathShearY = addPacket.ObjectData.PathShearY;
+            PData.PathSkew = addPacket.ObjectData.PathSkew;
+            PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
+            PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
+            PData.Scale = addPacket.ObjectData.Scale;
+            PData.PathCurve = addPacket.ObjectData.PathCurve;
+            PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
+            PData.ParentID = 0;
+            PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
+            PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
+            PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
+            PData.PathTaperX = addPacket.ObjectData.PathTaperX;
+            PData.PathTaperY = addPacket.ObjectData.PathTaperY;
+            PData.PathTwist = addPacket.ObjectData.PathTwist;
+            PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
+            LLVector3 pos1 = addPacket.ObjectData.RayEnd;
+            this.primData.FullID = this.uuid = LLUUID.Random();
+            this.primData.LocalID = m_localId = (uint)(localID);
+            this.primData.Position = this.Pos = pos1;
+
+            this.updateFlag = 1;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="data"></param>
+        public void CreateFromBytes(byte[] data)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primData"></param>
+        public void CreateFromPrimData(PrimData primData)
+        {
+            this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primData"></param>
+        /// <param name="posi"></param>
+        /// <param name="localID"></param>
+        /// <param name="newprim"></param>
+        public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
+        {
+
+        }
+        
+        public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
+        {
+           // Console.WriteLine("moving prim to new location " + pos.X + " , " + pos.Y + " , " + pos.Z);
+            this.Pos = pos;
+            this.SendTerseUpdateToALLClients();
+        }
+
+        public void GetProperites(IClientAPI client)
+        {
+            //needs changing
+            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
+            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
+            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
+            proper.ObjectData[0].ItemID = LLUUID.Zero;
+            proper.ObjectData[0].CreationDate = (ulong)primData.CreationDate;
+            proper.ObjectData[0].CreatorID = primData.OwnerID;
+            proper.ObjectData[0].FolderID = LLUUID.Zero;
+            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
+            proper.ObjectData[0].GroupID = LLUUID.Zero;
+            proper.ObjectData[0].InventorySerial = 0;
+            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
+            proper.ObjectData[0].ObjectID = this.uuid;
+            proper.ObjectData[0].OwnerID = primData.OwnerID;
+            proper.ObjectData[0].TouchName = new byte[0];
+            proper.ObjectData[0].TextureID = new byte[0];
+            proper.ObjectData[0].SitName = new byte[0];
+            proper.ObjectData[0].Name = new byte[0];
+            proper.ObjectData[0].Description = new byte[0];
+            proper.ObjectData[0].OwnerMask = primData.OwnerMask;
+            proper.ObjectData[0].NextOwnerMask = primData.NextOwnerMask;
+            proper.ObjectData[0].GroupMask = primData.GroupMask;
+            proper.ObjectData[0].EveryoneMask = primData.EveryoneMask;
+            proper.ObjectData[0].BaseMask = primData.BaseMask;
+
+            client.OutPacket(proper);
+
+        }
+
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
new file mode 100644
index 0000000..d1a2717
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
@@ -0,0 +1,305 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Region.Scenes
+{
+    public partial class Scene
+    {
+        /// <summary>
+        /// Modifies terrain using the specified information
+        /// </summary>
+        /// <param name="height">The height at which the user started modifying the terrain</param>
+        /// <param name="seconds">The number of seconds the modify button was pressed</param>
+        /// <param name="brushsize">The size of the brush used</param>
+        /// <param name="action">The action to be performed</param>
+        /// <param name="north">Distance from the north border where the cursor is located</param>
+        /// <param name="west">Distance from the west border where the cursor is located</param>
+        public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west)
+        {
+            // Shiny.
+            double size = (double)(1 << brushsize);
+
+            switch (action)
+            {
+                case 0:
+                    // flatten terrain
+                    Terrain.flatten(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 1:
+                    // raise terrain
+                    Terrain.raise(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 2:
+                    //lower terrain
+                    Terrain.lower(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 3:
+                    // smooth terrain
+                    Terrain.smooth(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 4:
+                    // noise
+                    Terrain.noise(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 5:
+                    // revert
+                    Terrain.revert(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+
+                // CLIENT EXTENSIONS GO HERE
+                case 128:
+                    // erode-thermal
+                    break;
+                case 129:
+                    // erode-aerobic
+                    break;
+                case 130:
+                    // erode-hydraulic
+                    break;
+            }
+            return;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="type"></param>
+        /// <param name="fromPos"></param>
+        /// <param name="fromName"></param>
+        /// <param name="fromAgentID"></param>
+        public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+        {
+            Console.WriteLine("Chat message");
+            ScenePresence avatar = null;
+            foreach (IClientAPI client in m_clientThreads.Values)
+            {
+                int dis = -1000;
+                if (this.Avatars.ContainsKey(client.AgentId))
+                {
+                    
+                    avatar = this.Avatars[client.AgentId];
+                    // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
+                    dis= (int)avatar.Pos.GetDistanceTo(fromPos);
+                    Console.WriteLine("found avatar at " +dis);
+
+                }
+             
+                switch (type)
+                {
+                    case 0: // Whisper
+                        if ((dis < 10) && (dis > -10))
+                        {
+                            //should change so the message is sent through the avatar rather than direct to the ClientView
+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+                    case 1: // Say
+                        if ((dis < 30) && (dis > -30))
+                        {
+                            Console.WriteLine("sending chat");
+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+                    case 2: // Shout
+                        if ((dis < 100) && (dis > -100))
+                        {
+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+
+                    case 0xff: // Broadcast
+                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        break;
+                }
+
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primAsset"></param>
+        /// <param name="pos"></param>
+        public void RezObject(AssetBase primAsset, LLVector3 pos)
+        {
+          
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="packet"></param>
+        /// <param name="simClient"></param>
+        public void DeRezObject(Packet packet, IClientAPI simClient)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        public void SendAvatarsToClient(IClientAPI remoteClient)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="parentPrim"></param>
+        /// <param name="childPrims"></param>
+        public void LinkObjects(uint parentPrim, List<uint> childPrims)
+        {
+            
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primLocalID"></param>
+        /// <param name="shapeBlock"></param>
+        public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primLocalID"></param>
+        /// <param name="remoteClient"></param>
+        public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.LocalId == primLocalID)
+                {
+                    ((OpenSim.Region.Scenes.Primitive)ent).GetProperites(remoteClient);
+                    break;
+                }
+            }
+        }
+
+        public void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
+        {
+            if (this.Entities.ContainsKey(objectID))
+            {
+                ((Primitive)this.Entities[objectID]).GrapMovement(offset, pos, remoteClient);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="packet"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="texture"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="pos"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimPosition(uint localID, LLVector3 pos, IClientAPI remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.LocalId == localID)
+                {
+                    ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos);
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="rot"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="scale"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimScale(uint localID, LLVector3 scale, IClientAPI remoteClient)
+        {
+        }
+
+        /// <summary>
+        /// Sends prims to a client
+        /// </summary>
+        /// <param name="RemoteClient">Client to send to</param>
+        public void GetInitialPrims(IClientAPI RemoteClient)
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
new file mode 100644
index 0000000..7b53388
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
@@ -0,0 +1,184 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using libsecondlife;
+
+namespace OpenSim.Region.Scenes
+{
+    public partial class Scene
+    {
+        private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void LoadScriptEngines()
+        {
+            this.LoadScriptPlugins();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        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]);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="FileName"></param>
+        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;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="scriptType"></param>
+        /// <param name="scriptName"></param>
+        /// <param name="script"></param>
+        /// <param name="ent"></param>
+        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
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <returns></returns>
+        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;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <param name="z"></param>
+        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");
+                }
+            }
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public uint GetRandomAvatarID()
+        {
+            //Console.WriteLine("script- getting random avatar id");
+            uint res = 0;
+            foreach (Entity entity in this.Entities.Values)
+            {
+                if (entity is ScenePresence)
+                {
+                    res = entity.LocalId;
+                }
+            }
+            return res;
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.cs b/OpenSim/Region/Simulation/Scenes/Scene.cs
new file mode 100644
index 0000000..bf2244e
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/Scene.cs
@@ -0,0 +1,795 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.IO;
+using System.Threading;
+using System.Timers;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework;
+using OpenSim.Region.Scripting;
+using OpenSim.Terrain;
+using OpenGrid.Framework.Communications;
+using OpenSim.Caches;
+using OpenSim.Region;
+using OpenSim.Servers;
+
+namespace OpenSim.Region.Scenes
+{
+    public delegate bool FilterAvatarList(ScenePresence avatar);
+
+    public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
+    {
+        protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
+        protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars;
+        protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;
+        private PhysicsScene phyScene;
+        private float timeStep = 0.1f;
+        private Random Rand = new Random();
+        private uint _primCount = 702000;
+        private int storageCount;
+        private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers;
+        private Dictionary<string, ScriptFactory> m_scripts;
+        private Mutex updateLock;
+        
+        protected AuthenticateSessionsBase authenticateHandler;
+        protected RegionCommsListener regionCommsHost;
+        protected CommunicationsManager commsManager;
+
+        protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
+        protected BaseHttpServer httpListener;
+
+        public ParcelManager parcelManager;
+        public EstateManager estateManager;
+        public EventManager eventManager;
+
+        #region Properties
+        /// <summary>
+        /// 
+        /// </summary>
+        public PhysicsScene PhysScene
+        {
+            set
+            {
+                this.phyScene = value;
+            }
+            get
+            {
+                return (this.phyScene);
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Creates a new World class, and a region to go with it.
+        /// </summary>
+        /// <param name="clientThreads">Dictionary to contain client threads</param>
+        /// <param name="regionHandle">Region Handle for this region</param>
+        /// <param name="regionName">Region Name for this region</param>
+        public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
+        {
+            try
+            {
+                updateLock = new Mutex(false);
+                this.authenticateHandler = authen;
+                this.commsManager = commsMan;
+                this.assetCache = assetCach;
+                m_clientThreads = clientThreads;
+                m_regInfo = regInfo;
+                m_regionHandle = m_regInfo.RegionHandle;
+                m_regionName = m_regInfo.RegionName;
+                this.m_datastore = m_regInfo.DataStore;
+                this.RegisterRegionWithComms();
+
+                parcelManager = new ParcelManager(this, this.m_regInfo);
+                estateManager = new EstateManager(this, this.m_regInfo);
+
+                eventManager = new EventManager();
+
+                m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
+                m_scripts = new Dictionary<string, ScriptFactory>();
+
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
+                Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
+                Avatars = new Dictionary<LLUUID, ScenePresence>();
+                Prims = new Dictionary<LLUUID, Primitive>();
+
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap");
+                Terrain = new TerrainEngine();
+
+                ScenePresence.LoadAnims();
+                this.httpListener = httpServer;
+                
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Error( "World.cs: Constructor failed with exception " + e.ToString());
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void StartTimer()
+        {
+            m_heartbeatTimer.Enabled = true;
+            m_heartbeatTimer.Interval = 100;
+            m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
+        }
+
+
+        #region Update Methods
+
+
+        /// <summary>
+        /// Performs per-frame updates regularly
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void Heartbeat(object sender, System.EventArgs e)
+        {
+            this.Update();
+        }
+
+        /// <summary>
+        /// Performs per-frame updates on the world, this should be the central world loop
+        /// </summary>
+        public override void Update()
+        {
+            updateLock.WaitOne();
+            try
+            {
+                if (this.phyScene.IsThreaded)
+                {
+                    this.phyScene.GetResults();
+
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].updateMovement();
+                }
+
+                lock (this.m_syncRoot)
+                {
+                    this.phyScene.Simulate(timeStep);
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].update();
+                }
+
+                // New
+                eventManager.TriggerOnFrame();
+
+                // TODO: Obsolete - Phase out
+                foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
+                {
+                    scriptHandler.OnFrame();
+                }
+                foreach (IScriptEngine scripteng in this.scriptEngines.Values)
+                {
+                    scripteng.OnFrame();
+                }
+
+                //backup world data
+                this.storageCount++;
+                if (storageCount > 1200) //set to how often you want to backup 
+                {
+                    this.Backup();
+                    storageCount = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
+            }
+            updateLock.ReleaseMutex();
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public bool Backup()
+        {
+            /*
+            try
+            {
+                // Terrain backup routines
+                if (Terrain.tainted > 0)
+                {
+                    Terrain.tainted = 0;
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain tainted, saving.");
+                    localStorage.SaveMap(Terrain.getHeights1D());
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain saved, informing Physics.");
+                    lock (this.m_syncRoot)
+                    {
+                        phyScene.SetTerrain(Terrain.getHeights1D());
+                    }
+                }
+
+                // Primitive backup routines
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Backing up Primitives");
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].BackUp();
+                }
+
+                //Parcel backup routines
+                ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
+                int i = 0;
+                foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
+                {
+                    parcels[i] = parcel.parcelData;
+                    i++;
+                }
+                localStorage.SaveParcels(parcels);
+
+                // Backup successful
+                return true;
+            }
+            catch (Exception e)
+            {
+                // Backup failed
+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
+                return false;
+            }
+            */
+            return true;
+        }
+        #endregion
+
+        #region Regenerate Terrain
+
+        /// <summary>
+        /// Rebuilds the terrain using a procedural algorithm
+        /// </summary>
+        public void RegenerateTerrain()
+        {
+            try
+            {
+                Terrain.hills();
+
+                lock (this.m_syncRoot)
+                {
+                    this.phyScene.SetTerrain(Terrain.getHeights1D());
+                }
+                this.localStorage.SaveMap(this.Terrain.getHeights1D());
+
+                foreach (IClientAPI client in m_clientThreads.Values)
+                {
+                    this.SendLayerData(client);
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].LandRenegerated();
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Rebuilds the terrain using a 2D float array
+        /// </summary>
+        /// <param name="newMap">256,256 float array containing heights</param>
+        public void RegenerateTerrain(float[,] newMap)
+        {
+            try
+            {
+                this.Terrain.setHeights2D(newMap);
+                lock (this.m_syncRoot)
+                {
+                    this.phyScene.SetTerrain(this.Terrain.getHeights1D());
+                }
+                this.localStorage.SaveMap(this.Terrain.getHeights1D());
+
+                foreach (IClientAPI client in m_clientThreads.Values)
+                {
+                    this.SendLayerData(client);
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].LandRenegerated();
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Rebuilds the terrain assuming changes occured at a specified point[?]
+        /// </summary>
+        /// <param name="changes">???</param>
+        /// <param name="pointx">???</param>
+        /// <param name="pointy">???</param>
+        public void RegenerateTerrain(bool changes, int pointx, int pointy)
+        {
+            try
+            {
+                if (changes)
+                {
+                    /* Dont save here, rely on tainting system instead */
+
+                    foreach (IClientAPI client in m_clientThreads.Values)
+                    {
+                        this.SendLayerData(pointx, pointy, client);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+            }
+        }
+
+        #endregion
+
+        #region Load Terrain
+        /// <summary>
+        /// Loads the World heightmap
+        /// </summary>
+        /// 
+        public override void LoadWorldMap()
+        {
+            try
+            {
+                float[] map = this.localStorage.LoadWorld();
+                if (map == null)
+                {
+                    if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
+                    {
+                        Console.WriteLine("No default terrain, procedurally generating...");
+                        this.Terrain.hills();
+
+                        this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                    }
+                    else
+                    {
+                        try
+                        {
+                            this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);
+                            this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;
+                        }
+                        catch
+                        {
+                            Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
+                            Terrain.hills();
+                        }
+                        this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                    }
+                }
+                else
+                {
+                    this.Terrain.setHeights1D(map);
+                }
+
+                CreateTerrainTexture();
+
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void CreateTerrainTexture()
+        {
+            //create a texture asset of the terrain 
+            byte[] data = this.Terrain.exportJpegImage("defaultstripe.png");
+            this.m_regInfo.estateSettings.terrainImageID = LLUUID.Random();
+            AssetBase asset = new AssetBase();
+            asset.FullID = this.m_regInfo.estateSettings.terrainImageID;
+            asset.Data = data;
+            asset.Name = "terrainImage";
+            asset.Type = 0;
+            this.assetCache.AddAsset(asset);
+        }
+        #endregion
+
+        #region Primitives Methods
+
+
+        /// <summary>
+        /// Loads the World's objects
+        /// </summary>
+        public void LoadPrimsFromStorage()
+        {
+            try
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: LoadPrimsFromStorage() - Loading primitives");
+                this.localStorage.LoadPrimitives(this);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Loads a specific object from storage
+        /// </summary>
+        /// <param name="prim">The object to load</param>
+        public void PrimFromStorage(PrimData prim)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="agentClient"></param>
+        public void AddNewPrim(Packet addPacket, IClientAPI agentClient)
+        {
+            AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentId);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="ownerID"></param>
+        public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
+        {
+            try
+            {
+                Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
+
+                this.Entities.Add(prim.uuid, prim);
+                this._primCount++;
+
+                // Trigger event for listeners
+                eventManager.TriggerOnNewPrimitive(prim);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
+            }
+        }
+
+        #endregion
+
+        #region Add/Remove Avatar Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param          
+        /// <param name="agentID"></param>
+        /// <param name="child"></param>
+        public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child)
+        {
+            remoteClient.OnRegionHandShakeReply += this.SendLayerData;
+            //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
+            remoteClient.OnChatFromViewer += this.SimChat;
+            remoteClient.OnRequestWearables += this.InformClientOfNeighbours;
+            remoteClient.OnAddPrim += this.AddNewPrim;
+            remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;
+            remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;
+            remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
+           //remoteClient.OnObjectSelect += this.SelectPrim;
+            remoteClient.OnGrapUpdate += this.MoveObject;
+
+            /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
+            remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
+            remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
+            remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
+            remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
+            */
+
+            ScenePresence newAvatar = null;
+            try
+            {
+
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
+                newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo);
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");
+
+                //newAvatar.SendRegionHandshake();
+                this.estateManager.sendRegionHandshake(remoteClient);
+
+                PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
+                lock (this.m_syncRoot)
+                {
+                    newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
+                }
+
+                lock (Entities)
+                {
+                    if (!Entities.ContainsKey(agentID))
+                    {
+                        this.Entities.Add(agentID, newAvatar);
+                    }
+                    else
+                    {
+                        Entities[agentID] = newAvatar;
+                    }
+                }
+                lock (Avatars)
+                {
+                    if (Avatars.ContainsKey(agentID))
+                    {
+                        Avatars[agentID] = newAvatar;
+                    }
+                    else
+                    {
+                        this.Avatars.Add(agentID, newAvatar);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
+            }
+            return;
+        }
+
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agentID"></param>
+        public override void RemoveClient(LLUUID agentID)
+        {
+            eventManager.TriggerOnRemovePresence(agentID);
+
+            return;
+        }
+        #endregion
+
+        #region Request Avatars List Methods
+        //The idea is to have a group of method that return a list of avatars meeting some requirement
+        // ie it could be all Avatars within a certain range of the calling prim/avatar. 
+
+        /// <summary>
+        /// Request a List of all Avatars in this World
+        /// </summary>
+        /// <returns></returns>
+        public List<ScenePresence> RequestAvatarList()
+        {
+            List<ScenePresence> result = new List<ScenePresence>();
+
+            foreach (ScenePresence avatar in Avatars.Values)
+            {
+                result.Add(avatar);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Request a filtered list of Avatars in this World
+        /// </summary>
+        /// <returns></returns>
+        public List<ScenePresence> RequestAvatarList(FilterAvatarList filter)
+        {
+            List<ScenePresence> result = new List<ScenePresence>();
+
+            foreach (ScenePresence avatar in Avatars.Values)
+            {
+                if (filter(avatar))
+                {
+                    result.Add(avatar);
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Request a Avatar by UUID
+        /// </summary>
+        /// <param name="avatarID"></param>
+        /// <returns></returns>
+        public ScenePresence RequestAvatar(LLUUID avatarID)
+        {
+            if (this.Avatars.ContainsKey(avatarID))
+            {
+                return Avatars[avatarID];
+            }
+            return null;
+        }
+        #endregion
+
+
+        #region RegionCommsHost
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RegisterRegionWithComms()
+        {
+            GridInfo gridSettings = new GridInfo();
+            this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings);
+            if (this.regionCommsHost != null)
+            {
+                this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
+                this.regionCommsHost.OnAvatarCrossingIntoRegion += new AgentCrossing(this.AgentCrossing);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="agent"></param>
+        public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
+        {
+            // Console.WriteLine("World.cs - add new user connection");
+            //should just check that its meant for this region 
+            if (regionHandle == this.m_regInfo.RegionHandle)
+            {
+                if (agent.CapsPath != "")
+                {
+                    //Console.WriteLine("new user, so creating caps handler for it");
+                    Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
+                    cap.RegisterHandlers();
+                    this.capsHandlers.Add(agent.AgentID, cap);
+                }
+                this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+            }
+        }
+
+        public void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (regionHandle == this.m_regInfo.RegionHandle)
+            {
+                if (this.Avatars.ContainsKey(agentID))
+                {
+                    this.Avatars[agentID].MakeAvatar(position);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void InformClientOfNeighbours(IClientAPI remoteClient)
+        {
+            // Console.WriteLine("informing client of neighbouring regions");
+            List<RegionInfo> neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo);
+
+            //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
+            if (neighbours != null)
+            {
+                for (int i = 0; i < neighbours.Count; i++)
+                {
+                    // Console.WriteLine("sending neighbours data");
+                    AgentCircuitData agent = remoteClient.RequestClientInfo();
+                    agent.BaseFolder = LLUUID.Zero;
+                    agent.InventoryFolder = LLUUID.Zero;
+                    agent.startpos = new LLVector3(128, 128, 70);
+                    agent.child = true;
+                    this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent);
+                    remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr), (ushort)neighbours[i].CommsIPListenPort);
+                    //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <returns></returns>
+        public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
+        {
+            return this.commsManager.GridServer.RequestNeighbourInfo(regionHandle);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="minX"></param>
+        /// <param name="minY"></param>
+        /// <param name="maxX"></param>
+        /// <param name="maxY"></param>
+        public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
+        {
+            List<MapBlockData> mapBlocks;
+            mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
+            remoteClient.SendMapBlock(mapBlocks);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="RegionHandle"></param>
+        /// <param name="position"></param>
+        /// <param name="lookAt"></param>
+        /// <param name="flags"></param>
+        public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags)
+        {
+            if (regionHandle == this.m_regionHandle)
+            {
+                if (this.Avatars.ContainsKey(remoteClient.AgentId))
+                {
+                    remoteClient.SendTeleportLocationStart();
+                    remoteClient.SendLocalTeleport(position, lookAt, flags);
+                    this.Avatars[remoteClient.AgentId].Teleport(position);
+                }
+            }
+            else
+            {
+                RegionInfo reg = this.RequestNeighbouringRegionInfo(regionHandle);
+                if (reg != null)
+                {
+                    remoteClient.SendTeleportLocationStart();
+                    AgentCircuitData agent = remoteClient.RequestClientInfo();
+                    agent.BaseFolder = LLUUID.Zero;
+                    agent.InventoryFolder = LLUUID.Zero;
+                    agent.startpos = new LLVector3(128, 128, 70);
+                    agent.child = true;
+                    this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
+                    this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position);
+                    remoteClient.SendRegionTeleport(regionHandle, 13, reg.CommsIPListenAddr, (ushort)reg.CommsIPListenPort, 4, (1 << 4));               
+                }
+                //remoteClient.SendTeleportCancel();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionhandle"></param>
+        /// <param name="agentID"></param>
+        /// <param name="position"></param>
+        public bool InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position)
+        {
+           return this.commsManager.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position);
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/SceneBase.cs b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
new file mode 100644
index 0000000..4dbd374
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
@@ -0,0 +1,201 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.IO;
+using System.Threading;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Region.Scripting;
+using OpenSim.Terrain;
+using OpenSim.Caches;
+
+namespace OpenSim.Region.Scenes
+{
+    public abstract class SceneBase :  IWorld 
+    {
+        public Dictionary<libsecondlife.LLUUID, Entity> Entities;
+        protected Dictionary<uint, IClientAPI> m_clientThreads;
+        protected ulong m_regionHandle;
+        protected string m_regionName;
+        protected RegionInfo m_regInfo;
+
+        public TerrainEngine Terrain;
+
+        public string m_datastore;
+        public ILocalStorage localStorage;
+
+        protected object m_syncRoot = new object();
+        private uint m_nextLocalId = 8880000;
+        protected AssetCache assetCache;
+
+        #region Update Methods
+        /// <summary>
+        /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
+        /// </summary>
+        public abstract void Update();
+
+        #endregion
+
+        #region Terrain Methods
+
+        /// <summary>
+        /// Loads the World heightmap
+        /// </summary>
+        public abstract void LoadWorldMap();
+
+        /// <summary>
+        /// Loads a new storage subsystem from a named library
+        /// </summary>
+        /// <param name="dllName">Storage Library</param>
+        /// <returns>Successful or not</returns>
+        public bool LoadStorageDLL(string dllName)
+        {
+            try
+            {
+                Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+                ILocalStorage store = null;
+
+                foreach (Type pluginType in pluginAssembly.GetTypes())
+                {
+                    if (pluginType.IsPublic)
+                    {
+                        if (!pluginType.IsAbstract)
+                        {
+                            Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
+
+                            if (typeInterface != null)
+                            {
+                                ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                                store = plug;
+
+                                store.Initialise(this.m_datastore);
+                                break;
+                            }
+
+                            typeInterface = null;
+                        }
+                    }
+                }
+                pluginAssembly = null;
+                this.localStorage = store;
+                return (store == null);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
+                return false;
+            }
+        }
+
+        
+        /// <summary>
+        /// Send the region heightmap to the client
+        /// </summary>
+        /// <param name="RemoteClient">Client to send to</param>
+        public virtual void SendLayerData(IClientAPI RemoteClient)
+        {
+            RemoteClient.SendLayerData(Terrain.getHeights1D());
+        }
+
+        /// <summary>
+        /// Sends a specified patch to a client
+        /// </summary>
+        /// <param name="px">Patch coordinate (x) 0..16</param>
+        /// <param name="py">Patch coordinate (y) 0..16</param>
+        /// <param name="RemoteClient">The client to send to</param>
+        public virtual void SendLayerData(int px, int py, IClientAPI RemoteClient)
+        {
+            RemoteClient.SendLayerData(px, py, Terrain.getHeights1D());
+        }
+
+        #endregion
+
+        #region Add/Remove Agent/Avatar
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="agentID"></param>
+        /// <param name="child"></param>
+        public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agentID"></param>
+        public abstract void RemoveClient(LLUUID agentID);
+       
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public virtual RegionInfo RegionInfo
+        {
+            get { return this.m_regInfo; }
+        }
+
+        public object SyncRoot
+        {
+            get { return m_syncRoot; }
+        }
+
+        public uint NextLocalId
+        {
+            get { return m_nextLocalId++; }
+        }
+
+        #region Shutdown
+        /// <summary>
+        /// Tidy before shutdown
+        /// </summary>
+        public virtual void Close()
+        {
+            try
+            {
+                this.localStorage.ShutDown();
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
+            }
+        }
+
+        #endregion
+
+ 
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
new file mode 100644
index 0000000..2898578
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Scenes
+{
+    /// <summary>
+    /// A class for triggering remote scene events.
+    /// </summary>
+    public class EventManager
+    {
+        public delegate void OnFrameDelegate();
+        public event OnFrameDelegate OnFrame;
+
+        public delegate void OnNewPresenceDelegate(ScenePresence presence);
+        public event OnNewPresenceDelegate OnNewPresence;
+
+        public delegate void OnNewPrimitiveDelegate(Primitive prim);
+        public event OnNewPrimitiveDelegate OnNewPrimitive;
+
+        public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
+        public event OnRemovePresenceDelegate OnRemovePresence;
+
+        public void TriggerOnFrame()
+        {
+            if (OnFrame != null)
+            {
+                OnFrame();
+            }
+        }
+
+        public void TriggerOnNewPrimitive(Primitive prim)
+        {
+            if (OnNewPrimitive != null)
+                OnNewPrimitive(prim);
+        }
+
+        public void TriggerOnNewPresence(ScenePresence presence)
+        {
+            if (OnNewPresence != null)
+                OnNewPresence(presence);
+        }
+
+        public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
+        {
+            if (OnRemovePresence != null)
+            {
+                OnRemovePresence(uuid);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/SceneObject.cs b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
new file mode 100644
index 0000000..5df87bf
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
@@ -0,0 +1,128 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+
+namespace OpenSim.Region.Scenes
+{
+    public class SceneObject : Entity
+    {
+        private LLUUID rootUUID;
+        //private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>();
+        protected Primitive rootPrimitive;
+        private Scene m_world;
+        protected ulong regionHandle;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public SceneObject()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="agentID"></param>
+        /// <param name="localID"></param>
+        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
+        {
+            this.rootPrimitive = new Primitive( this.regionHandle, this.m_world, addPacket, agentID, localID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="data"></param>
+        public void CreateFromBytes(byte[] data)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void update()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void BackUp()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="client"></param>
+        public void GetProperites(IClientAPI client)
+        {
+            //needs changing
+            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
+            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
+            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
+            proper.ObjectData[0].ItemID = LLUUID.Zero;
+            proper.ObjectData[0].CreationDate = (ulong)this.rootPrimitive.primData.CreationDate;
+            proper.ObjectData[0].CreatorID = this.rootPrimitive.primData.OwnerID;
+            proper.ObjectData[0].FolderID = LLUUID.Zero;
+            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
+            proper.ObjectData[0].GroupID = LLUUID.Zero;
+            proper.ObjectData[0].InventorySerial = 0;
+            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
+            proper.ObjectData[0].ObjectID = this.uuid;
+            proper.ObjectData[0].OwnerID = this.rootPrimitive.primData.OwnerID;
+            proper.ObjectData[0].TouchName = new byte[0];
+            proper.ObjectData[0].TextureID = new byte[0];
+            proper.ObjectData[0].SitName = new byte[0];
+            proper.ObjectData[0].Name = new byte[0];
+            proper.ObjectData[0].Description = new byte[0];
+            proper.ObjectData[0].OwnerMask = this.rootPrimitive.primData.OwnerMask;
+            proper.ObjectData[0].NextOwnerMask = this.rootPrimitive.primData.NextOwnerMask;
+            proper.ObjectData[0].GroupMask = this.rootPrimitive.primData.GroupMask;
+            proper.ObjectData[0].EveryoneMask = this.rootPrimitive.primData.EveryoneMask;
+            proper.ObjectData[0].BaseMask = this.rootPrimitive.primData.BaseMask;
+
+            client.OutPacket(proper);
+            
+        }
+
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
new file mode 100644
index 0000000..f0a8721
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
@@ -0,0 +1,76 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using System.Xml;
+
+namespace OpenSim.Region.Scenes
+{
+    partial class ScenePresence
+    {
+        public class AvatarAnimations
+        {
+
+            public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
+            public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
+
+            public AvatarAnimations()
+            {
+            }
+
+            public void LoadAnims()
+            {
+                //OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
+                XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
+
+                XmlDocument doc = new XmlDocument();
+                doc.Load(reader);
+                foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+                {
+
+                    if (nod.Attributes["name"] != null)
+                    {
+                        AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
+                    }
+
+                }
+
+                reader.Close();
+
+                // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+
+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID)
+                {
+                    AnimsNames.Add(kp.Value, kp.Key);
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
new file mode 100644
index 0000000..d21b11f
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
@@ -0,0 +1,90 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Region.Scenes
+{
+    partial class ScenePresence
+    {
+        public class Avatar : IScenePresenceBody
+        {
+            public Avatar()
+            {
+
+            }
+
+            public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
+            {
+            }
+
+            public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+            {
+            }
+
+            public void SendOurAppearance(IClientAPI OurClient)
+            {
+            }
+
+            public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
+            {
+            }
+        }
+
+        public class ChildAgent : IScenePresenceBody //is a ghost
+        {
+            public ChildAgent()
+            {
+
+            }
+
+            public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
+            {
+            }
+
+            public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+            {
+            }
+
+            public void SendOurAppearance(IClientAPI OurClient)
+            {
+            }
+
+            public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
+            {
+            }
+        }
+    }
+
+}
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
new file mode 100644
index 0000000..45d3fed
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
@@ -0,0 +1,525 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using Axiom.MathLib;
+
+namespace OpenSim.Region.Scenes
+{
+    public partial class ScenePresence : Entity
+    {
+        public static bool PhysicsEngineFlying = false;
+        public static AvatarAnimations Animations;
+        public static byte[] DefaultTexture;
+        public string firstname;
+        public string lastname;
+        public IClientAPI ControllingClient;
+        public LLUUID current_anim;
+        public int anim_seq;
+        private bool updateflag = false;
+        private byte movementflag = 0;
+        private List<NewForce> forcesList = new List<NewForce>();
+        private short _updateCount = 0;
+        private Axiom.MathLib.Quaternion bodyRot;
+        private LLObject.TextureEntry avatarAppearanceTexture = null;
+        private byte[] visualParams;
+        private AvatarWearable[] Wearables;
+        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
+        private ulong m_regionHandle;
+        private bool childAgent = false;
+        private bool newForce = false;
+        private bool newAvatar = false;
+        private IScenePresenceBody m_body;
+
+        protected RegionInfo m_regionInfo;
+
+        #region Properties
+        /// <summary>
+        /// 
+        /// </summary>
+        public PhysicsActor PhysActor
+        {
+            set
+            {
+                this._physActor = value;
+            }
+            get
+            {
+                return _physActor;
+            }
+        }
+        #endregion
+
+        #region Constructor(s)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="theClient"></param>
+        /// <param name="world"></param>
+        /// <param name="clientThreads"></param>
+        /// <param name="regionDat"></param>
+        public ScenePresence(IClientAPI theClient, Scene world, RegionInfo reginfo)
+        {
+
+            m_world = world;
+            this.uuid = theClient.AgentId;
+
+            m_regionInfo = reginfo;
+            m_regionHandle = reginfo.RegionHandle;
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");
+            ControllingClient = theClient;
+            this.firstname = ControllingClient.FirstName;
+            this.lastname = ControllingClient.LastName;
+            m_localId = m_world.NextLocalId;
+            Pos = ControllingClient.StartPos;
+            visualParams = new byte[218];
+            for (int i = 0; i < 218; i++)
+            {
+                visualParams[i] = 100;
+            }
+
+            Wearables = AvatarWearable.DefaultWearables;
+            
+            this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
+
+            //register for events
+            ControllingClient.OnRequestWearables += this.SendOurAppearance;
+            //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
+            ControllingClient.OnCompleteMovementToRegion += this.CompleteMovement;
+            ControllingClient.OnCompleteMovementToRegion += this.SendInitialData;
+            ControllingClient.OnAgentUpdate += this.HandleAgentUpdate;
+            // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
+            // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
+            //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
+
+        }
+        #endregion
+
+        #region Status Methods
+        /// <summary>
+        /// Not Used, most likely can be deleted
+        /// </summary>
+        /// <param name="status"></param>
+        public void ChildStatusChange(bool status)
+        {
+            this.childAgent = status;
+
+            if (this.childAgent == true)
+            {
+                this.Velocity = new LLVector3(0, 0, 0);
+                this.Pos = new LLVector3(128, 128, 70);
+                
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pos"></param>
+        public void MakeAvatar(LLVector3 pos)
+        {
+            //this.childAvatar = false;
+            this.Pos = pos;
+            this.newAvatar = true;
+            this.childAgent = false;
+        }
+
+        protected void MakeChildAgent()
+        {
+            this.Velocity = new LLVector3(0, 0, 0);
+            this.Pos = new LLVector3(128, 128, 70);
+            this.childAgent = true;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pos"></param>
+        public void Teleport(LLVector3 pos)
+        {
+            this.Pos = pos;
+            this.SendTerseUpdateToALLClients();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void StopMovement()
+        {
+
+        }
+        #endregion
+
+        #region Event Handlers
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="texture"></param>
+        /// <param name="visualParam"></param>
+        public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+        {
+
+        }
+
+        /// <summary>
+        /// Complete Avatar's movement into the region
+        /// </summary>
+        public void CompleteMovement()
+        {
+            LLVector3 look = this.Velocity;
+            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
+            {
+                look = new LLVector3(0.99f, 0.042f, 0);
+            }
+            this.ControllingClient.MoveAgentIntoRegion(m_regionInfo, Pos, look);
+            if (this.childAgent)
+            {
+                this.childAgent = false;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pack"></param>
+        public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
+        {  
+            if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
+            {
+                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+                if (((movementflag & 1) == 0) || (q != this.bodyRot))
+                {
+                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
+                    this.AddNewMovement(v3, q);
+                    movementflag = 1;
+                    this.bodyRot = q;
+                }
+            }
+            else if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
+            {
+                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+                if (((movementflag & 2) == 0) || (q != this.bodyRot))
+                {  
+                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
+                    this.AddNewMovement(v3, q);
+                    movementflag = 2;
+                    this.bodyRot = q;
+                }
+            }
+            else
+            {
+                if ((movementflag) != 0)
+                {
+                    NewForce newVelocity = new NewForce();
+                    newVelocity.X = 0;
+                    newVelocity.Y = 0;
+                    newVelocity.Z = 0;
+                    this.forcesList.Add(newVelocity);
+                    movementflag = 0;
+                }
+            }
+
+        }
+
+        protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation)
+        {
+            NewForce newVelocity = new NewForce();
+            Axiom.MathLib.Vector3 direc = rotation * vec;
+            direc.Normalize();
+
+            direc = direc * ((0.03f) * 128f);
+            if (this._physActor.Flying)
+                direc *= 4;
+
+            newVelocity.X = direc.x;
+            newVelocity.Y = direc.y;
+            newVelocity.Z = direc.z;
+            this.forcesList.Add(newVelocity);
+        }
+
+        #endregion
+
+        #region Overridden Methods
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void LandRenegerated()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void update()
+        {
+            if (this.childAgent == false)
+            {
+                if (this.newForce)
+                {
+                    this.SendTerseUpdateToALLClients();
+                    _updateCount = 0;
+                }
+                else if (movementflag != 0)
+                {
+                    _updateCount++;
+                    if (_updateCount > 3)
+                    {
+                        this.SendTerseUpdateToALLClients();
+                        _updateCount = 0;
+                    }
+                }
+
+                this.CheckForBorderCrossing();
+            }
+        }
+        #endregion
+
+        #region Update Client(s)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="RemoteClient"></param>
+        public void SendTerseUpdateToClient(IClientAPI RemoteClient)
+        {
+            LLVector3 pos = this.Pos;
+            LLVector3 vel = this.Velocity;
+            RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendTerseUpdateToALLClients()
+        {
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                this.SendTerseUpdateToClient(avatars[i].ControllingClient);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteAvatar"></param>
+        public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
+        {
+            remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendInitialData()
+        {
+            this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
+            if (this.newAvatar)
+            {
+                this.m_world.InformClientOfNeighbours(this.ControllingClient);
+                this.newAvatar = false;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="OurClient"></param>
+        public void SendOurAppearance(IClientAPI OurClient)
+        {
+            this.ControllingClient.SendWearables(this.Wearables);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="avatarInfo"></param>
+        public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="animID"></param>
+        /// <param name="seq"></param>
+        public void SendAnimPack(LLUUID animID, int seq)
+        {
+
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendAnimPack()
+        {
+
+        }
+        #endregion
+
+        #region Border Crossing Methods
+        /// <summary>
+        /// 
+        /// </summary>
+        protected void CheckForBorderCrossing()
+        {
+            LLVector3 pos2 = this.Pos;
+            LLVector3 vel = this.Velocity;
+
+            float timeStep = 0.2f;
+            pos2.X = pos2.X + (vel.X * timeStep);
+            pos2.Y = pos2.Y + (vel.Y * timeStep);
+            pos2.Z = pos2.Z + (vel.Z * timeStep);
+
+            if ((pos2.X < 0) || (pos2.X > 256))
+            {
+                this.CrossToNewRegion();
+            }
+
+            if ((pos2.Y < 0) || (pos2.Y > 256))
+            {
+                this.CrossToNewRegion();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected void CrossToNewRegion()
+        {
+            LLVector3 pos = this.Pos;
+            LLVector3 newpos = new LLVector3(pos.X, pos.Y, pos.Z);
+            uint neighbourx = this.m_regionInfo.RegionLocX;
+            uint neighboury = this.m_regionInfo.RegionLocY;
+
+            if (pos.X < 2)
+            {
+                neighbourx -= 1;
+                newpos.X = 254;
+            }
+            if (pos.X > 253)
+            {
+                neighbourx += 1;
+                newpos.X = 1;
+            }
+            if (pos.Y < 2)
+            {
+                neighboury -= 1;
+                newpos.Y = 254;
+            }
+            if (pos.Y > 253)
+            {
+                neighboury += 1;
+                newpos.Y = 1;
+            }
+
+            LLVector3 vel = this.velocity;
+            ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * 256), (uint)(neighboury * 256));
+            RegionInfo neighbourRegion = this.m_world.RequestNeighbouringRegionInfo(neighbourHandle);
+            if (neighbourRegion != null)
+            {
+                bool res = this.m_world.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos);
+                if (res)
+                {
+                    this.MakeChildAgent();
+                    this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.CommsIPListenAddr), (ushort)neighbourRegion.CommsIPListenPort);
+                }
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public static void LoadAnims()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void updateMovement()
+        {
+            newForce = false;
+            lock (this.forcesList)
+            {
+                if (this.forcesList.Count > 0)
+                {
+                    for (int i = 0; i < this.forcesList.Count; i++)
+                    {
+                        NewForce force = this.forcesList[i];
+
+                        this.updateflag = true;
+                        this.Velocity = new LLVector3(force.X, force.Y, force.Z);
+                        this.newForce = true;
+                    }
+                    for (int i = 0; i < this.forcesList.Count; i++)
+                    {
+                        this.forcesList.RemoveAt(0);
+                    }
+                }
+            }
+        }
+
+        public static void LoadTextureFile(string name)
+        {
+            FileInfo fInfo = new FileInfo(name);
+            long numBytes = fInfo.Length;
+            FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
+            BinaryReader br = new BinaryReader(fStream);
+            byte[] data1 = br.ReadBytes((int)numBytes);
+            br.Close();
+            fStream.Close();
+            DefaultTexture = data1;
+        }
+
+        public class NewForce
+        {
+            public float X;
+            public float Y;
+            public float Z;
+
+            public NewForce()
+            {
+
+            }
+        }
+    }
+
+}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
new file mode 100644
index 0000000..daa1b92
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Scripting
+{
+    public interface IScriptContext
+    {
+        IScriptEntity Entity { get; }
+        bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
new file mode 100644
index 0000000..44b886f
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Scripting
+{
+    public interface IScriptReadonlyEntity
+    {
+        LLVector3 Pos { get; }
+        string Name { get; }
+    }
+    
+    public interface IScriptEntity
+    {
+        LLVector3 Pos { get; set; }
+        string Name { get; }
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
new file mode 100644
index 0000000..797998d
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
@@ -0,0 +1,126 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Physics.Manager;
+using OpenSim.Region;
+using OpenSim.Region.Scenes;
+using Avatar=OpenSim.Region.Scenes.ScenePresence;
+using Primitive = OpenSim.Region.Scenes.Primitive;
+
+namespace OpenSim.Region.Scripting
+{
+    public delegate void ScriptEventHandler(IScriptContext context);
+
+    public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
+    {
+        private Scene m_world;
+        private Script m_script;
+        private Entity m_entity;
+
+        public LLUUID ScriptId
+        {
+            get
+            {
+                return m_script.ScriptId;
+            }
+        }
+
+        public void OnFrame()
+        {
+            m_script.OnFrame(this);
+        }
+
+        public ScriptHandler(Script script, Entity entity, Scene world)
+        {
+            m_script = script;
+            m_entity = entity;
+            m_world = world;
+        }
+
+        #region IScriptContext Members
+
+        IScriptEntity IScriptContext.Entity
+        {
+            get
+            {
+                return this;
+            }
+        }
+
+        bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
+        {
+            foreach (Entity entity in m_world.Entities.Values )
+            {
+                if( entity is Avatar )
+                {
+                    avatar = entity;
+                    return true;
+                }
+            }
+            
+            avatar = null;
+            return false;
+        }
+
+        #endregion
+
+        #region IScriptEntity and IScriptReadonlyEntity Members
+
+        public string Name
+        {
+            get
+            {
+                return m_entity.Name;
+            }
+        }
+
+        public LLVector3 Pos
+        {
+            get
+            {
+                return m_entity.Pos;
+            }
+
+            set
+            {
+                if (m_entity is Primitive)
+                {
+                    Primitive prim = m_entity as Primitive;
+                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
+                   // prim.UpdatePosition( value );
+                }
+            }
+        }
+
+        #endregion
+    }
+
+}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
new file mode 100644
index 0000000..1d01f3c
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Scripting
+{
+    public class Script
+    {
+        private LLUUID m_scriptId;        
+        public virtual LLUUID ScriptId
+        {
+            get
+            {
+                return m_scriptId;
+            }
+        }
+
+        public Script( LLUUID scriptId )
+        {
+            m_scriptId = scriptId;
+        }
+        
+        public ScriptEventHandler OnFrame;
+    }
+}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
new file mode 100644
index 0000000..32ef046
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Scripting
+{
+    public delegate Script ScriptFactory();
+}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
new file mode 100644
index 0000000..21f07a8
--- /dev/null
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
@@ -0,0 +1,64 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Scripting
+{
+    public class FollowRandomAvatar : Script
+    {
+        public FollowRandomAvatar()
+            : base(LLUUID.Random())
+        {
+            OnFrame += MyOnFrame;
+        }
+
+        private void MyOnFrame(IScriptContext context)
+        {
+            LLVector3 pos = context.Entity.Pos;
+
+            IScriptReadonlyEntity avatar;
+
+            if (context.TryGetRandomAvatar(out avatar))
+            {
+                LLVector3 avatarPos = avatar.Pos;
+
+                float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
+                float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
+
+                LLVector3 newPos = new LLVector3(x, y, pos.Z);
+
+                context.Entity.Pos = newPos;
+            }
+        }
+    }
+
+
+}
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
new file mode 100644
index 0000000..ab3c34c
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -0,0 +1,117 @@
+/*
+* 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.
+* 
+*/
+
+// BDB Support
+// Apparently broken on Mono
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using BerkeleyDb;
+using Kds.Serialization;
+using Kds.Serialization.Buffer;
+
+namespace OpenSim.Storage.LocalStorageBDB
+{
+    public class BDBLocalStorage : ILocalStorage
+    {
+        const string simDbName = "localsim.db";
+
+        DbHash sim;
+        Db DB;
+        //BEFormatter formatter;
+
+        public BDBLocalStorage()
+        {
+            DB = new Db(DbCreateFlags.None);
+            sim = (DbHash)DB.Open(null, simDbName, null, BerkeleyDb.DbType.Hash, Db.OpenFlags.Create, 0);
+            //vendorDb = (DbBTree)db.Open(null, VendorDbName, null, DbType.BTree, Db.OpenFlags.Create, 0);
+        }
+
+        public void Initialise(string file)
+        {
+            // Blank
+        }
+
+        public void StorePrim(PrimData prim)
+        {
+            DbEntry key = new DbEntry();
+            DbEntry data = new DbEntry();
+            lock (sim)
+            {
+                sim.PutUnique(null, ref key, ref data, DbFile.WriteFlags.AutoCommit);
+            }
+        }
+        public void RemovePrim(LLUUID primID)
+        {
+
+        }
+        public void LoadPrimitives(ILocalStorageReceiver receiver)
+        {
+
+        }
+        public float[] LoadWorld()
+        {
+            return new float[65536];
+        }
+        public void SaveMap(float[] heightmap)
+        {
+
+        }
+
+        public void SaveParcels(ParcelData[] parcel_data)
+        {
+        }
+
+        public void SaveParcel(ParcelData parcel)
+        {
+        }
+
+        public void RemoveParcel(ParcelData parcel)
+        {
+        }
+
+        public void RemoveAllParcels()
+        {
+        }
+
+        public void LoadParcels(ILocalStorageParcelReceiver recv)
+        {
+            recv.NoParcelDataFromStorage();
+        }
+
+        public void ShutDown()
+        {
+            sim.GetDb().Close();
+            DB.Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
new file mode 100644
index 0000000..b956c9b
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
@@ -0,0 +1,112 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A4691E59-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Storage.LocalStorageBerkeleyDB</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Storage.LocalStorageBerkeleyDB</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Kds.Serialization.dll" >
+      <HintPath>..\..\..\..\bin\Kds.Serialization.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libdb_dotNET43.dll" >
+      <HintPath>..\..\..\..\bin\libdb_dotNET43.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BDBLocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
new file mode 100644
index 0000000..bc2d8ec
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Storage.LocalStorageBerkeleyDB" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="BDBLocalStorage.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Kds.Serialization.dll" />
+                <include name="../../../bin/libdb_dotNET43.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
new file mode 100644
index 0000000..ea2b62e
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("Db4LocalStorage")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Db4LocalStorage")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
new file mode 100644
index 0000000..8e6b04d
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -0,0 +1,271 @@
+/*
+* 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 Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Console;
+
+
+namespace OpenSim.Storage.LocalStorageDb4o
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class Db4LocalStorage : ILocalStorage
+    {
+        private IObjectContainer db;
+        private string datastore;
+
+        public Db4LocalStorage()
+        {
+
+        }
+
+        public void Initialise(string dfile)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage Opening " + dfile);
+            datastore = dfile;
+            try
+            {
+                db = Db4oFactory.OpenFile(datastore);
+                OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage creation");
+            }
+            catch (Exception e)
+            {
+                db.Close();
+                OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+            }
+        }
+
+        public void StorePrim(PrimData prim)
+        {
+            IObjectSet result = db.Query(new UUIDPrimQuery(prim.FullID));
+            if (result.Count > 0)
+            {
+                //prim already in storage
+                //so update it
+                PrimData found = (PrimData)result.Next();
+                found.PathBegin = prim.PathBegin;
+                found.PathCurve = prim.PathCurve;
+                found.PathEnd = prim.PathEnd;
+                found.PathRadiusOffset = prim.PathRadiusOffset;
+                found.PathRevolutions = prim.PathRevolutions;
+                found.PathScaleX = prim.PathScaleX;
+                found.PathScaleY = prim.PathScaleY;
+                found.PathShearX = prim.PathShearX;
+                found.PathShearY = prim.PathShearY;
+                found.PathSkew = prim.PathSkew;
+                found.PathTaperX = prim.PathTaperX;
+                found.PathTaperY = prim.PathTaperY;
+                found.PathTwist = prim.PathTwist;
+                found.PathTwistBegin = prim.PathTwistBegin;
+                found.PCode = prim.PCode;
+                found.ProfileBegin = prim.ProfileBegin;
+                found.ProfileCurve = prim.ProfileCurve;
+                found.ProfileEnd = prim.ProfileEnd;
+                found.ProfileHollow = prim.ProfileHollow;
+                found.Position = prim.Position;
+                found.Rotation = prim.Rotation;
+                found.TextureEntry = prim.TextureEntry;
+                db.Set(found);
+                db.Commit();
+            }
+            else
+            {
+                //not in storage
+                db.Set(prim);
+                db.Commit();
+            }
+        }
+
+        public void RemovePrim(LLUUID primID)
+        {
+            IObjectSet result = db.Query(new UUIDPrimQuery(primID));
+            if (result.Count > 0)
+            {
+                PrimData found = (PrimData)result.Next();
+                db.Delete(found);
+            }
+        }
+
+
+        public void LoadPrimitives(ILocalStorageReceiver receiver)
+        {
+            IObjectSet result = db.Get(typeof(PrimData));
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count);
+            foreach (PrimData prim in result)
+            {
+                receiver.PrimFromStorage(prim);
+            }
+        }
+
+        public float[] LoadWorld()
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Loading world....");
+            float[] heightmap = null;
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");
+            IObjectSet world_result = db.Get(typeof(MapStorage));
+            if (world_result.Count > 0)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");
+                MapStorage map = (MapStorage)world_result.Next();
+                //blank.LandMap = map.Map;
+                heightmap = map.Map;
+            }
+            return heightmap;
+        }
+
+        public void SaveMap(float[] heightmap)
+        {
+            IObjectSet world_result = db.Get(typeof(MapStorage));
+            if (world_result.Count > 0)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");
+                MapStorage map = (MapStorage)world_result.Next();
+                db.Delete(map);
+            }
+            MapStorage map1 = new MapStorage();
+            map1.Map = heightmap; //OpenSim_Main.local_world.LandMap;
+            db.Set(map1);
+            db.Commit();
+        }
+
+        public void SaveParcel(ParcelData parcel)
+        {
+            IObjectSet result = db.Query(new UUIDParcelQuery(parcel.globalID));
+            if (result.Count > 0)
+            {
+                //Old Parcel
+                ParcelData updateParcel = (ParcelData)result.Next();
+                updateParcel.AABBMax = parcel.AABBMax;
+                updateParcel.AABBMin = parcel.AABBMin;
+                updateParcel.area = parcel.area;
+                updateParcel.auctionID = parcel.auctionID;
+                updateParcel.authBuyerID = parcel.authBuyerID;
+                updateParcel.category = parcel.category;
+                updateParcel.claimDate = parcel.claimDate;
+                updateParcel.claimPrice = parcel.claimPrice;
+                updateParcel.groupID = parcel.groupID;
+                updateParcel.groupPrims = parcel.groupPrims;
+                updateParcel.isGroupOwned = parcel.isGroupOwned;
+                updateParcel.landingType = parcel.landingType;
+                updateParcel.mediaAutoScale = parcel.mediaAutoScale;
+                updateParcel.mediaID = parcel.mediaID;
+                updateParcel.mediaURL = parcel.mediaURL;
+                updateParcel.musicURL = parcel.musicURL;
+                updateParcel.localID = parcel.localID;
+                updateParcel.ownerID = parcel.ownerID;
+                updateParcel.passHours = parcel.passHours;
+                updateParcel.passPrice = parcel.passPrice;
+                updateParcel.parcelBitmapByteArray = (byte[])parcel.parcelBitmapByteArray.Clone();
+                updateParcel.parcelDesc = parcel.parcelDesc;
+                updateParcel.parcelFlags = parcel.parcelFlags;
+                updateParcel.parcelName = parcel.parcelName;
+                updateParcel.parcelStatus = parcel.parcelStatus;
+                updateParcel.salePrice = parcel.salePrice;
+                updateParcel.snapshotID = parcel.snapshotID;
+                updateParcel.userLocation = parcel.userLocation;
+                updateParcel.userLookAt = parcel.userLookAt;
+
+                db.Set(updateParcel);
+            }
+            else
+            {
+                db.Set(parcel);
+            }
+            db.Commit();
+        }
+
+        public void SaveParcels(ParcelData[] parcel_data)
+        {
+            MainLog.Instance.Notice("Parcel Backup: Saving Parcels...");
+            int i;
+            for (i = 0; i < parcel_data.GetLength(0); i++)
+            {
+
+                SaveParcel(parcel_data[i]);
+
+            }
+            MainLog.Instance.Notice("Parcel Backup: Parcel Save Complete");
+        }
+
+        public void RemoveParcel(ParcelData parcel)
+        {
+            IObjectSet result = db.Query(new UUIDParcelQuery(parcel.globalID));
+            if (result.Count > 0)
+            {
+                db.Delete(result[0]);
+            }
+            db.Commit();
+        }
+        public void RemoveAllParcels()
+        {
+            MainLog.Instance.Notice("Parcel Backup: Removing all parcels...");
+            IObjectSet result = db.Get(typeof(ParcelData));
+            if (result.Count > 0)
+            {
+                foreach (ParcelData parcelData in result)
+                {
+                    RemoveParcel(parcelData);
+                }
+            }
+        }
+
+        public void LoadParcels(ILocalStorageParcelReceiver recv)
+        {
+            MainLog.Instance.Notice("Parcel Backup: Loading Parcels...");
+            IObjectSet result = db.Get(typeof(ParcelData));
+            if (result.Count > 0)
+            {
+                MainLog.Instance.Notice("Parcel Backup: Parcels exist in database.");
+                foreach (ParcelData parcelData in result)
+                {
+
+                    recv.ParcelFromStorage(parcelData);
+                }
+            }
+            else
+            {
+                MainLog.Instance.Notice("Parcel Backup: No parcels exist. Creating basic parcel.");
+                recv.NoParcelDataFromStorage();
+            }
+            MainLog.Instance.Notice("Parcel Backup: Parcels Restored");
+        }
+        public void ShutDown()
+        {
+            db.Commit();
+            db.Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
new file mode 100644
index 0000000..56387ac
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Storage.LocalStorageDb4o
+{
+    public class MapStorage
+    {
+        public float[] Map;
+
+        public MapStorage()
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
new file mode 100644
index 0000000..147158c
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -0,0 +1,116 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{43DB702D-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Storage.LocalStorageDb4o</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Storage.LocalStorageDb4o</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Db4LocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MapStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UUIDParcelQuery.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UUIDPrimQuery.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj.user b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
new file mode 100644
index 0000000..d24fb5f
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
@@ -0,0 +1,52 @@
+/*
+* 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 Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Storage.LocalStorageDb4o
+{
+    public class UUIDParcelQuery : Predicate
+    {
+        private LLUUID globalIDSearch;
+
+        public UUIDParcelQuery(LLUUID find)
+        {
+            globalIDSearch = find;
+        }
+        public bool Match(ParcelData parcel)
+        {
+            return (parcel.globalID == globalIDSearch);
+        }
+    }
+}
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
new file mode 100644
index 0000000..b2e8a91
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
@@ -0,0 +1,52 @@
+/*
+* 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 Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Storage.LocalStorageDb4o
+{
+    public class UUIDPrimQuery : Predicate
+    {
+        private LLUUID _findID;
+
+        public UUIDPrimQuery(LLUUID find)
+        {
+            _findID = find;
+        }
+        public bool Match(PrimData prim)
+        {
+            return (prim.FullID == _findID);
+        }
+    }
+}
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj
new file mode 100644
index 0000000..d1353a5
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj
@@ -0,0 +1,111 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{477B9270-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Storage.LocalStorageSQLite</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Storage.LocalStorageSQLite</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data.SQLite.dll" >
+      <HintPath>..\..\..\..\bin\System.Data.SQLite.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="SQLiteLocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj.user b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
new file mode 100644
index 0000000..bd4c731
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Storage.LocalStorageSQLite" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Storage.LocalStorageSQLite" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="SQLiteLocalStorage.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="../../../bin/System.Data.SQLite.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..b45debf
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
@@ -0,0 +1,62 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.Storage.LocalStorageSQLite")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.Storage.LocalStorageSQLite")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("ecd6e0c1-7909-413e-9e3f-659678ac3bc3")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.*")]
+[assembly: AssemblyFileVersion("1.0.0.*")]
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
new file mode 100644
index 0000000..8a7893e
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -0,0 +1,198 @@
+/*
+* 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.
+* 
+*/
+
+// SQLite Support
+// A bad idea, but the IRC people told me to!
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SQLite;
+using libsecondlife;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Storage.LocalStorageSQLite
+{
+    public class SQLiteLocalStorage : ILocalStorage
+    {
+        IDbConnection db;
+
+        public SQLiteLocalStorage()
+        {
+            try
+            {
+                string connectionstring = "URI=file:localsim.sdb";
+                db = (IDbConnection)new SQLiteConnection(connectionstring);
+                db.Open();
+            }
+            catch (Exception e)
+            {
+                db.Close();
+                OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+            }
+        }
+
+        public void Initialise(string file)
+        {
+            // Blank
+        }
+
+        public void StorePrim(PrimData prim)
+        {
+            IDbCommand cmd = db.CreateCommand();
+
+            //SECURITY WARNING:
+            // These parameters wont produce SQL injections since they are all integer based, however.
+            // if inserting strings such as name or description, you will need to use appropriate
+            // measures to prevent SQL injection (although the value of SQL injection in this is limited).
+
+            string sql = "REPLACE INTO prim (OwnerID,PCode,PathBegin,PathEnd,PathScaleX,PathScaleY,PathShearX,PathShearY,PathSkew,ProfileBegin,ProfileEnd,Scale,PathCurve,ProfileCurve,ParentID,ProfileHollow,PathRadiusOffset,PathRevolutions,PathTaperX,PathTaperY,PathTwist,PathTwistBegin,Texture,CreationDate,OwnerMask,NextOwnerMask,GroupMask,EveryoneMask,BaseMask,Position,Rotation,LocalID,FullID) ";
+            sql += "VALUES (";
+            sql += "\"" + prim.OwnerID.ToStringHyphenated() + "\","; // KILL ME NOW!
+            sql += "\"" + prim.PCode.ToString() + "\",";
+            sql += "\"" + prim.PathBegin.ToString() + "\",";
+            sql += "\"" + prim.PathEnd.ToString() + "\",";
+            sql += "\"" + prim.PathScaleX.ToString() + "\",";
+            sql += "\"" + prim.PathScaleY.ToString() + "\",";
+            sql += "\"" + prim.PathShearX.ToString() + "\",";
+            sql += "\"" + prim.PathShearY.ToString() + "\",";
+            sql += "\"" + prim.PathSkew.ToString() + "\",";
+            sql += "\"" + prim.ProfileBegin.ToString() + "\",";
+            sql += "\"" + prim.ProfileEnd.ToString() + "\",";
+            sql += "\"" + prim.Scale.ToString() + "\",";
+            sql += "\"" + prim.PathCurve.ToString() + "\",";
+            sql += "\"" + prim.ProfileCurve.ToString() + "\",";
+            sql += "\"" + prim.ParentID.ToString() + "\",";
+            sql += "\"" + prim.ProfileHollow.ToString() + "\",";
+            sql += "\"" + prim.PathRadiusOffset.ToString() + "\",";
+            sql += "\"" + prim.PathRevolutions.ToString() + "\",";
+            sql += "\"" + prim.PathTaperX.ToString() + "\",";
+            sql += "\"" + prim.PathTaperY.ToString() + "\",";
+            sql += "\"" + prim.PathTwist.ToString() + "\",";
+            sql += "\"" + prim.PathTwistBegin.ToString() + "\",";
+            sql += "\"" + prim.TextureEntry.ToString() + "\",";
+            sql += "\"" + prim.CreationDate.ToString() + "\",";
+            sql += "\"" + prim.OwnerMask.ToString() + "\",";
+            sql += "\"" + prim.NextOwnerMask.ToString() + "\",";
+            sql += "\"" + prim.GroupMask.ToString() + "\",";
+            sql += "\"" + prim.EveryoneMask.ToString() + "\",";
+            sql += "\"" + prim.BaseMask.ToString() + "\",";
+            sql += "\"" + prim.Position.ToString() + "\",";
+            sql += "\"" + prim.Rotation.ToString() + "\",";
+            sql += "\"" + prim.LocalID.ToString() + "\",";
+            sql += "\"" + prim.FullID.ToString() + "\")";
+
+            cmd.CommandText = sql;
+
+            try
+            {
+                cmd.ExecuteNonQuery();
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+            }
+
+            cmd.Dispose();
+            cmd = null;
+        }
+
+        public void RemovePrim(LLUUID primID)
+        {
+            IDbCommand cmd = db.CreateCommand();
+
+            //SECURITY WARNING:
+            // These parameters wont produce SQL injections since they are all integer based, however.
+            // if inserting strings such as name or description, you will need to use appropriate
+            // measures to prevent SQL injection (although the value of SQL injection in this is limited).
+
+            string sql = "DELETE FROM prim WHERE FullID = \"" + primID.ToStringHyphenated() + "\"";
+
+            cmd.CommandText = sql;
+
+            try
+            {
+                cmd.ExecuteNonQuery();
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+            }
+
+            cmd.Dispose();
+            cmd = null;
+        }
+
+        public void LoadPrimitives(ILocalStorageReceiver receiver)
+        {
+
+        }
+
+        public float[] LoadWorld()
+        {
+            return new float[65536];
+        }
+
+        public void SaveMap(float[] heightmap)
+        {
+
+        }
+
+        public void SaveParcels(ParcelData[] parcel_manager)
+        {
+
+        }
+
+        public void SaveParcel(ParcelData parcel)
+        {
+        }
+
+        public void RemoveParcel(ParcelData parcel)
+        {
+        }
+
+        public void RemoveAllParcels()
+        {
+        }
+
+        public void LoadParcels(ILocalStorageParcelReceiver recv)
+        {
+            recv.NoParcelDataFromStorage();
+        }
+
+        public void ShutDown()
+        {
+            db.Close();
+            db = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
new file mode 100644
index 0000000..24667e5
--- /dev/null
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
@@ -0,0 +1,110 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C9E0F891-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Terrain.BasicTerrain</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Terrain.BasicTerrain</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libTerrain-BSD.dll" >
+      <HintPath>..\..\..\bin\libTerrain-BSD.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.JScript" >
+      <HintPath>Microsoft.JScript.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="openjpegnet.dll" >
+      <HintPath>..\..\..\bin\openjpegnet.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data" >
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Drawing" >
+      <HintPath>System.Drawing.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TerrainEngine.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TerrainFilter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj.user b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..827c68f
--- /dev/null
+++ b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
@@ -0,0 +1,62 @@
+/*
+* 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.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3263f5b5-0a41-4ed5-91a2-9baaaeecc849")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
new file mode 100644
index 0000000..4f989fa
--- /dev/null
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -0,0 +1,786 @@
+/*
+* 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.Drawing;
+using libTerrain;
+using OpenJPEGNet;
+
+namespace OpenSim.Terrain
+{
+    public class TerrainCommand
+    {
+        public virtual bool run(string[] cmdargs, ref string output)
+        {
+            return false;
+        }
+
+        public string args;
+        public string help;
+    }
+
+    public class TerrainEngine
+    {
+        /// <summary>
+        /// Plugin library for scripts
+        /// </summary>
+        public FilterHost customFilters = new FilterHost();
+
+        /// <summary>
+        /// A [normally] 256x256 heightmap
+        /// </summary>
+        public Channel heightmap;
+
+        /// <summary>
+        /// A copy of heightmap at the last save point (for reverting)
+        /// </summary>
+        public Channel revertmap;
+
+        /// <summary>
+        /// Water heightmap (needs clientside mods to work)
+        /// </summary>
+        public Channel watermap;
+
+        /// <summary>
+        /// Whether or not the terrain has been modified since it was last saved and sent to the Physics engine.
+        /// Counts the number of modifications since the last save. (0 = Untainted)
+        /// </summary>
+        public int tainted;
+
+        int w, h;
+
+        /// <summary>
+        /// Generate a new TerrainEngine instance and creates a new heightmap
+        /// </summary>
+        public TerrainEngine()
+        {
+            w = 256;
+            h = 256;
+            heightmap = new Channel(w, h);
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Converts the heightmap to a 65536 value 1D floating point array
+        /// </summary>
+        /// <returns>A float[65536] array containing the heightmap</returns>
+        public float[] getHeights1D()
+        {
+            float[] heights = new float[w * h];
+            int i;
+
+            for (i = 0; i < w * h; i++)
+            {
+                heights[i] = (float)heightmap.map[i / w, i % w];
+            }
+
+            return heights;
+        }
+
+        /// <summary>
+        /// Converts the heightmap to a 256x256 value 2D floating point array.
+        /// </summary>
+        /// <returns>An array of 256,256 values containing the heightmap</returns>
+        public float[,] getHeights2D()
+        {
+            float[,] heights = new float[w, h];
+            int x, y;
+            for (x = 0; x < w; x++)
+            {
+                for (y = 0; y < h; y++)
+                {
+                    heights[x, y] = (float)heightmap.map[x, y];
+                }
+            }
+            return heights;
+        }
+
+        /// <summary>
+        /// Imports a 1D floating point array into the 2D heightmap array
+        /// </summary>
+        /// <param name="heights">The array to import (must have 65536 members)</param>
+        public void setHeights1D(float[] heights)
+        {
+            int i;
+            for (i = 0; i < w * h; i++)
+            {
+                heightmap.map[i / w, i % w] = heights[i];
+            }
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Loads a 2D array of values into the heightmap
+        /// </summary>
+        /// <param name="heights">An array of 256,256 float values</param>
+        public void setHeights2D(float[,] heights)
+        {
+            int x, y;
+            for (x = 0; x < w; x++)
+            {
+                for (y = 0; y < h; y++)
+                {
+                    heightmap.set(x, y, (double)heights[x, y]);
+                }
+            }
+            tainted++;
+        }
+
+        /// <summary>
+        /// Swaps the two heightmap buffers (the 'revert map' and the heightmap)
+        /// </summary>
+        public void swapRevertMaps()
+        {
+            Channel backup = heightmap.copy();
+            heightmap = revertmap;
+            revertmap = backup;
+        }
+
+        /// <summary>
+        /// Saves the current heightmap into the revertmap
+        /// </summary>
+        public void saveRevertMap()
+        {
+            revertmap = heightmap.copy();
+        }
+
+        /// <summary>
+        /// Processes a terrain-specific command
+        /// </summary>
+        /// <param name="args">Commandline arguments (space seperated)</param>
+        /// <param name="resultText">Reference that returns error or help text if returning false</param>
+        /// <returns>If the operation was successful (if not, the error is placed into resultText)</returns>
+        public bool RunTerrainCmd(string[] args, ref string resultText)
+        {
+            string command = args[0];
+
+            try
+            {
+
+                switch (command)
+                {
+                    case "help":
+                        resultText += "terrain regenerate - rebuilds the sims terrain using a default algorithm\n";
+                        resultText += "terrain voronoi <points> <blocksize> - generates a worley fractal with X points per block";
+                        resultText += "terrain seed <seed> - sets the random seed value to <seed>\n";
+                        resultText += "terrain load <type> <filename> - loads a terrain from disk, type can be 'F32', 'F64', 'RAW' or 'IMG'\n";
+                        resultText += "terrain save <type> <filename> - saves a terrain to disk, type can be 'F32', 'F64' or 'PNG'\n";
+                        resultText += "terrain save grdmap <filename> <gradient map> - creates a PNG snapshot of the region using a named gradient map\n";
+                        resultText += "terrain rescale <min> <max> - rescales a terrain to be between <min> and <max> meters high\n";
+                        resultText += "terrain erode aerobic <windspeed> <pickupmin> <dropmin> <carry> <rounds> <lowest>\n";
+                        resultText += "terrain erode thermal <talus> <rounds> <carry>\n";
+                        resultText += "terrain multiply <val> - multiplies a terrain by <val>\n";
+                        resultText += "terrain revert - reverts the terrain to the stored original\n";
+                        resultText += "terrain bake - saves the current terrain into the revert map\n";
+                        resultText += "terrain csfilter <filename.cs> - loads a new filter from the specified .cs file\n";
+                        resultText += "terrain jsfilter <filename.js> - loads a new filter from the specified .js file\n";
+                        foreach (KeyValuePair<string, ITerrainFilter> filter in customFilters.filters)
+                        {
+                            resultText += filter.Value.Help();
+                        }
+
+                        return false;
+
+                    case "revert":
+                        swapRevertMaps();
+                        saveRevertMap();
+                        break;
+
+                    case "bake":
+                        saveRevertMap();
+                        break;
+
+                    case "seed":
+                        setSeed(Convert.ToInt32(args[1]));
+                        break;
+
+                    case "erode":
+                        return consoleErosion(args, ref resultText);
+
+                    case "voronoi":
+                        double[] c = new double[2];
+                        c[0] = -1;
+                        c[1] = 1;
+                        heightmap.voronoiDiagram(Convert.ToInt32(args[1]), Convert.ToInt32(args[2]), c);
+                        break;
+
+                    case "hills":
+                        return consoleHills(args, ref resultText);
+
+                    case "regenerate":
+                        hills();
+                        break;
+
+                    case "rescale":
+                        setRange(Convert.ToSingle(args[1]), Convert.ToSingle(args[2]));
+                        break;
+
+                    case "multiply":
+                        heightmap *= Convert.ToDouble(args[1]);
+                        break;
+
+                    case "load":
+                        switch (args[1].ToLower())
+                        {
+                            case "f32":
+                                loadFromFileF32(args[2]);
+                                break;
+
+                            case "f64":
+                                loadFromFileF64(args[2]);
+                                break;
+
+                            case "raw":
+                                loadFromFileSLRAW(args[2]);
+                                break;
+
+                            case "img":
+                                heightmap.loadImage(args[2]);
+                                return false;
+
+                            default:
+                                resultText = "Unknown image or data format";
+                                return false;
+                        }
+                        break;
+
+                    case "save":
+                        switch (args[1].ToLower())
+                        {
+                            case "f32":
+                                writeToFileF32(args[2]);
+                                break;
+
+                            case "f64":
+                                writeToFileF64(args[2]);
+                                break;
+
+                            case "grdmap":
+                                exportImage(args[2], args[3]);
+                                break;
+
+                            case "png":
+                                heightmap.saveImage(args[2]);
+                                break;
+
+                            default:
+                                resultText = "Unknown image or data format";
+                                return false;
+                        }
+                        break;
+
+                    case "csfilter":
+                        customFilters.LoadFilterCSharp(args[1]);
+                        break;
+                    case "jsfilter":
+                        customFilters.LoadFilterJScript(args[1]);
+                        break;
+
+                    default:
+                        // Run any custom registered filters
+                        if (customFilters.filters.ContainsKey(command))
+                        {
+                            customFilters.filters[command].Filter(heightmap, args);
+                            break;
+                        }
+                        else
+                        {
+                            resultText = "Unknown terrain command";
+                            return false;
+                        }
+                }
+                return true;
+            }
+            catch (Exception e)
+            {
+                resultText = "Error running terrain command: " + e.ToString();
+                return false;
+            }
+        }
+
+        private bool consoleErosion(string[] args, ref string resultText)
+        {
+            switch (args[1].ToLower())
+            {
+                case "aerobic":
+                    // WindSpeed, PickupMinimum,DropMinimum,Carry,Rounds,Lowest
+                    heightmap.AerobicErosion(Convert.ToDouble(args[2]), Convert.ToDouble(args[3]), Convert.ToDouble(args[4]), Convert.ToDouble(args[5]), Convert.ToInt32(args[6]), Convert.ToBoolean(args[7]));
+                    break;
+                case "thermal":
+                    heightmap.thermalWeathering(Convert.ToDouble(args[2]), Convert.ToInt32(args[3]), Convert.ToDouble(args[4]));
+                    break;
+                default:
+                    resultText = "Unknown erosion type";
+                    return false;
+            }
+            return true;
+        }
+
+        private bool consoleHills(string[] args, ref string resultText)
+        {
+            int count;
+            double sizeMin;
+            double sizeRange;
+            bool island;
+            bool additive;
+            bool noisy;
+
+            if (args.GetLength(0) > 2)
+            {
+                count = Convert.ToInt32(args[2]);
+                sizeMin = Convert.ToDouble(args[3]);
+                sizeRange = Convert.ToDouble(args[4]);
+                island = Convert.ToBoolean(args[5]);
+                additive = Convert.ToBoolean(args[6]);
+                noisy = Convert.ToBoolean(args[7]);
+            }
+            else
+            {
+                count = 200;
+                sizeMin = 20;
+                sizeRange = 40;
+                island = true;
+                additive = true;
+                noisy = false;
+            }
+
+            switch (args[1].ToLower())
+            {
+                case "blocks":
+                    heightmap.hillsBlocks(count, sizeMin, sizeRange, island, additive, noisy);
+                    break;
+                case "cones":
+                    heightmap.hillsCones(count, sizeMin, sizeRange, island, additive, noisy);
+                    break;
+                case "spheres":
+                    heightmap.hillsSpheres(count, sizeMin, sizeRange, island, additive, noisy);
+                    break;
+                case "squared":
+                    heightmap.hillsSquared(count, sizeMin, sizeRange, island, additive, noisy);
+                    break;
+                default:
+                    resultText = "Unknown hills type";
+                    return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Renormalises the array between min and max
+        /// </summary>
+        /// <param name="min">Minimum value of the new array</param>
+        /// <param name="max">Maximum value of the new array</param>
+        public void setRange(float min, float max)
+        {
+            heightmap.normalise((double)min, (double)max);
+            tainted++;
+        }
+
+        /// <summary>
+        /// Loads a file consisting of 256x256 doubles and imports it as an array into the map.
+        /// </summary>
+        /// <remarks>TODO: Move this to libTerrain itself</remarks>
+        /// <param name="filename">The filename of the double array to import</param>
+        public void loadFromFileF64(string filename)
+        {
+            System.IO.FileInfo file = new System.IO.FileInfo(filename);
+            System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read);
+            System.IO.BinaryReader bs = new System.IO.BinaryReader(s);
+            int x, y;
+            for (x = 0; x < w; x++)
+            {
+                for (y = 0; y < h; y++)
+                {
+                    heightmap.map[x, y] = bs.ReadDouble();
+                }
+            }
+
+            bs.Close();
+            s.Close();
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Loads a file consisting of 256x256 floats and imports it as an array into the map.
+        /// </summary>
+        /// <remarks>TODO: Move this to libTerrain itself</remarks>
+        /// <param name="filename">The filename of the float array to import</param>
+        public void loadFromFileF32(string filename)
+        {
+            System.IO.FileInfo file = new System.IO.FileInfo(filename);
+            System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read);
+            System.IO.BinaryReader bs = new System.IO.BinaryReader(s);
+            int x, y;
+            for (x = 0; x < w; x++)
+            {
+                for (y = 0; y < h; y++)
+                {
+                    heightmap.map[x, y] = (double)bs.ReadSingle();
+                }
+            }
+
+            bs.Close();
+            s.Close();
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Loads a file formatted in the SL .RAW Format used on the main grid
+        /// </summary>
+        /// <remarks>This file format stinks and is best avoided.</remarks>
+        /// <param name="filename">A path to the .RAW format</param>
+        public void loadFromFileSLRAW(string filename)
+        {
+            System.IO.FileInfo file = new System.IO.FileInfo(filename);
+            System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read);
+            System.IO.BinaryReader bs = new System.IO.BinaryReader(s);
+            int x, y;
+            for (x = 0; x < w; x++)
+            {
+                for (y = 0; y < h; y++)
+                {
+                    heightmap.map[x, y] = (double)bs.ReadByte() * ((double)bs.ReadByte() / 127.0);
+                    bs.ReadBytes(11); // Advance the stream to next bytes.
+                }
+            }
+
+            bs.Close();
+            s.Close();
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Writes the current terrain heightmap to disk, in the format of a 65536 entry double[] array.
+        /// </summary>
+        /// <param name="filename">The desired output filename</param>
+        public void writeToFileF64(string filename)
+        {
+            System.IO.FileInfo file = new System.IO.FileInfo(filename);
+            System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write);
+            System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s);
+
+            int x, y;
+            for (x = 0; x < w; x++)
+            {
+                for (y = 0; y < h; y++)
+                {
+                    bs.Write(heightmap.get(x, y));
+                }
+            }
+
+            bs.Close();
+            s.Close();
+        }
+
+        /// <summary>
+        /// Writes the current terrain heightmap to disk, in the format of a 65536 entry float[] array
+        /// </summary>
+        /// <param name="filename">The desired output filename</param>
+        public void writeToFileF32(string filename)
+        {
+            System.IO.FileInfo file = new System.IO.FileInfo(filename);
+            System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write);
+            System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s);
+
+            int x, y;
+            for (x = 0; x < w; x++)
+            {
+                for (y = 0; y < h; y++)
+                {
+                    bs.Write((float)heightmap.get(x, y));
+                }
+            }
+
+            bs.Close();
+            s.Close();
+        }
+
+        /// <summary>
+        /// Sets the random seed to be used by procedural functions which involve random numbers.
+        /// </summary>
+        /// <param name="val">The desired seed</param>
+        public void setSeed(int val)
+        {
+            heightmap.seed = val;
+        }
+
+        /// <summary>
+        /// Raises land in a sphere around the specified coordinates
+        /// </summary>
+        /// <param name="rx">Center of the sphere on the X axis</param>
+        /// <param name="ry">Center of the sphere on the Y axis</param>
+        /// <param name="size">The radius of the sphere</param>
+        /// <param name="amount">Scale the height of the sphere by this amount (recommended 0..2)</param>
+        public void raise(double rx, double ry, double size, double amount)
+        {
+            lock (heightmap)
+            {
+                heightmap.raise(rx, ry, size, amount);
+            }
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Lowers the land in a sphere around the specified coordinates
+        /// </summary>
+        /// <param name="rx">The center of the sphere at the X axis</param>
+        /// <param name="ry">The center of the sphere at the Y axis</param>
+        /// <param name="size">The radius of the sphere in meters</param>
+        /// <param name="amount">Scale the height of the sphere by this amount (recommended 0..2)</param>
+        public void lower(double rx, double ry, double size, double amount)
+        {
+            lock (heightmap)
+            {
+                heightmap.lower(rx, ry, size, amount);
+            }
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Flattens the land under the brush of specified coordinates (spherical mask)
+        /// </summary>
+        /// <param name="rx">Center of sphere</param>
+        /// <param name="ry">Center of sphere</param>
+        /// <param name="size">Radius of the sphere</param>
+        /// <param name="amount">Thickness of the mask (0..2 recommended)</param>
+        public void flatten(double rx, double ry, double size, double amount)
+        {
+            lock (heightmap)
+            {
+                heightmap.flatten(rx, ry, size, amount);
+            }
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Creates noise within the specified bounds
+        /// </summary>
+        /// <param name="rx">Center of the bounding sphere</param>
+        /// <param name="ry">Center of the bounding sphere</param>
+        /// <param name="size">The radius of the sphere</param>
+        /// <param name="amount">Strength of the mask (0..2) recommended</param>
+        public void noise(double rx, double ry, double size, double amount)
+        {
+            lock (heightmap)
+            {
+                Channel smoothed = new Channel();
+                smoothed.noise();
+
+                Channel mask = new Channel();
+                mask.raise(rx, ry, size, amount);
+
+                heightmap.blend(smoothed, mask);
+            }
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Reverts land within the specified bounds
+        /// </summary>
+        /// <param name="rx">Center of the bounding sphere</param>
+        /// <param name="ry">Center of the bounding sphere</param>
+        /// <param name="size">The radius of the sphere</param>
+        /// <param name="amount">Strength of the mask (0..2) recommended</param>
+        public void revert(double rx, double ry, double size, double amount)
+        {
+            lock (heightmap)
+            {
+                Channel mask = new Channel();
+                mask.raise(rx, ry, size, amount);
+
+                heightmap.blend(revertmap, mask);
+            }
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Smooths land under the brush of specified coordinates (spherical mask)
+        /// </summary>
+        /// <param name="rx">Center of the sphere</param>
+        /// <param name="ry">Center of the sphere</param>
+        /// <param name="size">Radius of the sphere</param>
+        /// <param name="amount">Thickness of the mask (0..2 recommended)</param>
+        public void smooth(double rx, double ry, double size, double amount)
+        {
+            lock (heightmap)
+            {
+                Channel smoothed = heightmap.copy();
+                smoothed.smooth(amount);
+
+                Channel mask = new Channel();
+                mask.raise(rx,ry,size,amount);
+
+                heightmap.blend(smoothed, mask);
+            }
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Generates a simple set of hills in the shape of an island
+        /// </summary>
+        public void hills()
+        {
+            lock (heightmap)
+            {
+                heightmap.hillsSpheres(200, 20, 40, true, true, false);
+                heightmap.normalise();
+                heightmap *= 60.0; // Raise to 60m
+            }
+
+            tainted++;
+        }
+
+        /// <summary>
+        /// Multiplies the heightfield by val
+        /// </summary>
+        /// <param name="meep">The heightfield</param>
+        /// <param name="val">The multiplier</param>
+        /// <returns></returns>
+        public static TerrainEngine operator *(TerrainEngine meep, Double val)
+        {
+            meep.heightmap *= val;
+            meep.tainted++;
+            return meep;
+        }
+
+        /// <summary>
+        /// Returns the height at the coordinates x,y
+        /// </summary>
+        /// <param name="x">X Coordinate</param>
+        /// <param name="y">Y Coordinate</param>
+        /// <returns></returns>
+        public float this[int x, int y]
+        {
+            get
+            {
+                return (float)heightmap.get(x, y);
+            }
+            set
+            {
+                tainted++;
+                heightmap.set(x, y, (double)value);
+            }
+        }
+
+        /// <summary>
+        /// Exports the current heightmap to a PNG file
+        /// </summary>
+        /// <param name="filename">The destination filename for the image</param>
+        /// <param name="gradientmap">A 1x*height* image which contains the colour gradient to export with. Must be at least 1x2 pixels, 1x256 or more is ideal.</param>
+        public void exportImage(string filename, string gradientmap)
+        {
+            try
+            {
+                Bitmap gradientmapLd = new Bitmap(gradientmap);
+
+                int pallete = gradientmapLd.Height;
+
+                Bitmap bmp = new Bitmap(heightmap.w, heightmap.h);
+                Color[] colours = new Color[pallete];
+
+                for (int i = 0; i < pallete; i++)
+                {
+                    colours[i] = gradientmapLd.GetPixel(0, i);
+                }
+
+                Channel copy = heightmap.copy();
+                for (int x = 0; x < copy.w; x++)
+                {
+                    for (int y = 0; y < copy.h; y++)
+                    {
+                        // 512 is the largest possible height before colours clamp
+                        int colorindex = (int)(Math.Max(Math.Min(1.0, copy.get(x, y) / 512.0), 0.0) * pallete);
+                        bmp.SetPixel(x, y, colours[colorindex]);
+                    }
+                }
+
+                bmp.Save(filename, System.Drawing.Imaging.ImageFormat.Png);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Failed generating terrain map: " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Exports the current heightmap in Jpeg2000 format to a byte[]
+        /// </summary>
+        /// <param name="gradientmap">A 1x*height* image which contains the colour gradient to export with. Must be at least 1x2 pixels, 1x256 or more is ideal.</param>
+        public byte[] exportJpegImage(string gradientmap)
+        {
+            byte[] imageData = null;
+            try
+            {
+                Bitmap gradientmapLd = new Bitmap(gradientmap);
+
+                int pallete = gradientmapLd.Height;
+
+                Bitmap bmp = new Bitmap(heightmap.w, heightmap.h);
+                Color[] colours = new Color[pallete];
+
+                for (int i = 0; i < pallete; i++)
+                {
+                    colours[i] = gradientmapLd.GetPixel(0, i);
+                }
+
+                Channel copy = heightmap.copy();
+                for (int x = 0; x < copy.w; x++)
+                {
+                    for (int y = 0; y < copy.h; y++)
+                    {
+                        // 512 is the largest possible height before colours clamp
+                        int colorindex = (int)(Math.Max(Math.Min(1.0, copy.get(copy.h - y,  x) / 512.0), 0.0) * pallete);
+                        bmp.SetPixel(x, y, colours[colorindex]);
+                    }
+                }
+
+                //bmp.Save(filename, System.Drawing.Imaging.ImageFormat.Png);
+                imageData = OpenJPEGNet.OpenJPEG.EncodeFromImage(bmp, "map");
+                
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Failed generating terrain map: " + e.ToString());
+            }
+
+            return imageData;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
new file mode 100644
index 0000000..689375d
--- /dev/null
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using System.CodeDom.Compiler;
+using System.CodeDom;
+using Microsoft.CSharp;
+using Microsoft.JScript;
+
+using libTerrain;
+
+namespace OpenSim.Terrain
+{
+    public interface ITerrainFilter
+    {
+        void Filter(Channel heightmap, string[] args);
+        string Register();
+        string Help();
+    }
+
+    public class TestFilter : ITerrainFilter
+    {
+        public void Filter(Channel heightmap, string[] args)
+        {
+            Console.WriteLine("Hello world");
+        }
+
+        public string Register()
+        {
+            return "demofilter";
+        }
+
+        public string Help()
+        {
+            return "demofilter - Does nothing";
+        }
+    }
+
+    public class FilterHost
+    {
+        public Dictionary<string, ITerrainFilter> filters = new Dictionary<string, ITerrainFilter>();
+
+        private void LoadFilter(ICodeCompiler compiler, string filename)
+        {
+            CompilerParameters compilerParams = new CompilerParameters();
+            CompilerResults compilerResults;
+            compilerParams.GenerateExecutable = false;
+            compilerParams.GenerateInMemory = true;
+            compilerParams.IncludeDebugInformation = false;
+            compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll");
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll");
+            compilerParams.ReferencedAssemblies.Add("System.dll");
+
+            compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
+
+            if (compilerResults.Errors.Count > 0)
+            {
+                Console.WriteLine("Compile errors:");
+                foreach (CompilerError error in compilerResults.Errors)
+                {
+                    Console.WriteLine(error.Line.ToString() + ": " + error.ErrorText.ToString());
+                }
+            }
+            else
+            {
+                foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
+                {
+                    Type testInterface = pluginType.GetInterface("ITerrainFilter",true);
+
+                    if (testInterface != null)
+                    {
+                        ITerrainFilter filter = (ITerrainFilter)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
+
+                        string filterName = filter.Register();
+                        Console.WriteLine("Plugin: " + filterName + " loaded.");
+
+                        if (!filters.ContainsKey(filterName))
+                        {
+                            filters.Add(filterName, filter);
+                        }
+                        else
+                        {
+                            filters[filterName] = filter;
+                        }
+                    }
+                }
+            }
+
+        }
+
+        public void LoadFilterCSharp(string filename)
+        {
+            CSharpCodeProvider compiler = new CSharpCodeProvider();
+            LoadFilter(compiler.CreateCompiler(), filename);
+        }
+
+        public void LoadFilterJScript(string filename)
+        {
+            JScriptCodeProvider compiler = new JScriptCodeProvider();
+            LoadFilter(compiler.CreateCompiler(), filename);
+        }
+    }
+}
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build
new file mode 100644
index 0000000..395fb31
--- /dev/null
+++ b/Prebuild/Prebuild.build
@@ -0,0 +1,67 @@
+<?xml version="1.0" ?>
+<project name="Prebuild" default="build">
+    <echo message="Using '${nant.settings.currentframework}' Framework"/>
+
+    <property name="bin.dir" value="bin" />
+    <property name="obj.dir" value="obj" />
+    <property name="doc.dir" value="doc" />
+    <property name="project.main.dir" value="${project::get-base-directory()}" />
+
+    <target name="Debug" description="">
+        <property name="project.config" value="Debug" />
+        <property name="build.debug" value="true" />
+    </target>
+
+    <property name="project.config" value="Release" />
+
+    <target name="Release" description="">
+        <property name="project.config" value="Release" />
+        <property name="build.debug" value="false" />
+    </target>
+
+    <target name="net-1.1" description="Sets framework to .NET 1.1">
+        <property name="nant.settings.currentframework" value="net-1.1" />
+    </target>
+
+    <target name="net-2.0" description="Sets framework to .NET 2.0">
+        <property name="nant.settings.currentframework" value="net-2.0" />
+    </target>
+
+    <target name="mono-2.0" description="Sets framework to mono 2.0">
+        <property name="nant.settings.currentframework" value="mono-2.0" />
+    </target>
+
+    <target name="mono-1.0" description="Sets framework to mono 1.0">
+        <property name="nant.settings.currentframework" value="mono-1.0" />
+    </target>
+
+    <target name="init" description="">
+        <call target="${project.config}" />
+        <sysinfo />
+        <echo message="Platform ${sys.os.platform}" />
+        <property name="build.dir" value="${bin.dir}/${project.config}" />
+    </target>
+
+    <target name="clean" description="">
+        <echo message="Deleting all builds from all configurations" />
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+        <nant buildfile="src/Prebuild.exe.build" target="clean" />
+    </target>
+
+    <target name="build" depends="init" description="">
+        <nant buildfile="src/Prebuild.exe.build" target="build" />
+    </target>
+
+    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
+
+    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
+
+    <target name="package" depends="clean, doc" description="Builds all" />
+
+    <target name="doc" depends="build-release">
+        <echo message="Generating all documentation from all builds" />
+        <nant buildfile="src/Prebuild.exe.build" target="doc" />
+    </target>
+
+</project>
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
new file mode 100644
index 0000000..449896b
--- /dev/null
+++ b/Prebuild/Prebuild.sln
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-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
+    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
+EndGlobal
diff --git a/Prebuild/Prebuild.suo b/Prebuild/Prebuild.suo
new file mode 100644
index 0000000..3829a4a
Binary files /dev/null and b/Prebuild/Prebuild.suo differ
diff --git a/Prebuild/README b/Prebuild/README
new file mode 100644
index 0000000..eca6be1
--- /dev/null
+++ b/Prebuild/README
@@ -0,0 +1,230 @@
+Prebuild Instructions
+
+Prebuild is an XML-driven pre-build tool allowing developers to easily generate project or make files for major IDE's and .NET development tools including: Visual Studio 2005, Visual Studio 2003, Visual Studio 2002, SharpDevelop, SharpDevelop2, MonoDevelop, and NAnt.
+
+_________________________________________________________________________________
+Overview
+
+Prebuild can be either be run from the command line to generate the project and make files or you can execute the included batch (*.bat) and Unix Shell script (*.sh) files.
+The Prebuild file
+
+_________________________________________________________________________________
+The currently supported developement tools and their associated batch and shell script files.
+
+Visual Studio .NET 2005 (VS2005.bat)
+Visual Studio .NET 2003 (VS2003.bat)
+Visual Studio .NET 2002 (VS2002.bat)
+SharpDevelop (SharpDevelop.bat) - http://www.icsharpcode.net/OpenSource/SD/
+SharpDevelop2 (SharpDevelop.bat) - http://www.icsharpcode.net/OpenSource/SD/
+MonoDevelop (MonoDevelop.sh) - http://www.monodevelop.com/
+NAnt (nant.sh and nant.bat) - http://nant.sourceforge.net/
+Autotools (autotools.bat and autotools.sh) http://www.gnu.org. Only partial support
+
+Notes:
+A Unix Shell script is provided for MonoDevelop, as this is more appropriate than a windows batch file.
+Visual Studio .NET 2005 and the Visual Express IDE's can import solutions from older versions of Visual Studio .NET.
+Makefiles are not currently supported.
+
+_________________________________________________________________________________
+Command Line Syntax:
+ 
+Example:
+>Prebuild /target vs2003
+
+This will generate the project files for Visual Studio.NET 2003 and place the redirect the log to a file named PrebuildLog.txt in the parent directory
+
+
+The syntax structure is as below, where commandParameter is optional depending on the command and you can provide several option-value pairs.
+Note: The '>' signified the command line, do not actually enter this manually
+
+>Prebuild /<option> <commandParameter>
+
+>Prebuild /target vs2003 /pause
+
+>Prebuild /target vs2003 /log ../Log.txt /pause /ppo /file ProjectConfig.xml
+
+>Prebuild /target sharpdev /log
+
+>Prebuild /removedir obj|bin
+
+>Prebuild /target vs2003 /allowedgroups Group1|Group2
+
+>Prebuild /clean
+
+>Prebuild /clean /yes
+
+>Prebuild /clean vs2003
+
+_________________________________________________________________________________
+Command Line Options:
+
+/usage  - Shows the help information on how to use Prebuild and what the different options are and what they do
+
+/clean - The project files generated for the target type specified as a parameter for this option will be deleted.  If no value is specified or if 'all' is specified, then project files for all the target types will be deleted.
+
+/target - Specified the name of the development tool for which project or make files will be generated.  Possible parameter values include:  vs2003, vs2002, sharpdev
+
+/file - Specifies the name of the XML which defines what files are to be referenced by the generated project files as well as configures the options for them.  If not specified, prebuild.xml will be used as the default.
+
+/log - Specified the log file that should be written to for build errors.  If this option is not specified, no log file is generated, but if just no value is specified, then the defaul filename will be used for the log (Prebuild.log).
+
+/ppo - Preprocesses the xml file to test for syntax errors or problems but doesn't generate the files
+
+/pause - Shows the console until you press a key so that you can view the messages written while performing the specified actions.
+This allows you to check if an errors occurred and - if so - what it was.
+
+/showtargets - Shows a list of all the targets that can be specified as values for the /clean and /target commands.
+
+/allowedgroups - This is followed by a pipe-delimited list of project group filter flags (eg. Group1|Group2) allow optional filtering of all projects that dont have at least one of these flags
+
+/removedir - This is followed by a pipe-delimited list of directory names that will be deleted while recursivly searching the directory of the prebuild application and its child directories (eg. use obj|bin to delete all output and temporary directories before file releases)
+
+/yes - Answer yes to any warnings (e.g. when cleaning all projects).
+
+_________________________________________________________________________________
+Example Batch Files and Shell Scripts
+
+NOTE: Common batch and shell script files are included with Prebuild source and file releases.
+______________________________
+MonoDevelop
+
+#!/bin/sh
+# Generates a combine (.cmbx) and a set of project files (.prjx) 
+# for MonoDevelop, a Mono port of SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)
+./Prebuild /target sharpdev /pause
+
+______________________________
+Visual Studio .NET 2003
+
+@rem Generates a solution (.sln) and a set of project files (.csproj) 
+@rem for Microsoft Visual Studio .NET 2002
+Prebuild /target vs2003 /pause
+
+Notes:
+Text after lines that start with @rem are comments and are not evaluated
+You can also place pause on the last line instead of specifing the /pause command.
+
+________________________________________________________________________________
+Example XML Configuration File
+
+Note:
+XML Comments (<!-- Comment -->) are used to markup the prebuild.xml file with notes
+The below file may be out-of-date, however the RealmForge Prebuild file serves as an up-to-date and extensive example.
+It can be viewed using Tigris.org's WebSVN (http://realmforge.tigris.org/source/browse/realmforge/trunk/src/prebuild.xml) by just clicking on the "view file" link for the latest revision.
+
+_________________________________
+
+<?xml version="1.0" encoding="utf-8"?>
+    <!--The version of the XML schema specified in the version and xmlns attributes should match the one for which the version of Prebuild.exe used was compiled for.  In this example it is the version 1.3 schema, you can find the XSD schema file at the url specified in the xmlns attribute. -->
+<Prebuild version="1.6" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
+	<Solution name="RealmForge"> <!--The title and file name for the solution, combine, workspace, or project group (depending on what development tool you are using)-->
+                       <!--Configurations found as children of Solution are used as templates for the configurations found in the project, this allows you to avoid writing the same options in each project (and maintaining each of these).  You can provide defaults and then override them in the configurations defined for each project. All options are optional.-->
+		<Configuration name="Debug">
+			<Options>
+				<!-- simple logically expressions can be evaluated, if, else, elseif, and endif are valid statements.  Note that it is not neccisary to define POSIX or WIN32 -->
+				<?if OS = "Win32" ?>
+					<CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
+				<?else ?>
+					<CompilerDefines>DEBUG;TRACE;POSIX</CompilerDefines>
+				<?endif ?>
+				<OptimizeCode>false</OptimizeCode>
+				<CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+				<AllowUnsafe>false</AllowUnsafe>
+				<WarningLevel>4</WarningLevel>   
+				<!-The filter for the number of warnings or errors shown and the tolerance level as to what is an error. This is value from 0 to 4 where 4 is the most strict (least tolerent).-->
+
+				<WarningsAsErrors>false</WarningsAsErrors>
+				<SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings> 
+ 				<!-- A semicolon ';'  delimited list of the warnings that are filtered and not shown in the output window during compiling a project.  Only include the number portion of the warning codes that are shown in output during compilation (eg CS1591, should be entered as 1591)-->
+
+				<OutputPath>..\bin</OutputPath>
+				<DebugInformation>true</DebugInformation>
+				<RegisterComInterop>false</RegisterComInterop>
+				<IncrementalBuild>true</IncrementalBuild>
+				<BaseAddress>285212672</BaseAddress>
+				<FileAlignment>4096</FileAlignment>
+				<NoStdLib>false</NoStdLib>
+				<XmlDocFile>Docs.xml</XmlDocFile>
+			</Options>
+		</Configuration>
+		<Configuration name="Release"> <!-- You can define multple configurations that projects can have, but there is no way to define which one is selected by default as this is a part of the user preferences for a project, not the solution or project files -->
+			<Options>
+				<CompilerDefines>TRACE</CompilerDefines>
+				<OptimizeCode>true</OptimizeCode>
+				<CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+				<AllowUnsafe>false</AllowUnsafe>
+				<WarningLevel>4</WarningLevel>
+				<WarningsAsErrors>false</WarningsAsErrors>
+				<SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings>
+				<OutputPath>..\bin</OutputPath>
+				<DebugInformation>false</DebugInformation>
+				<RegisterComInterop>false</RegisterComInterop>
+				<IncrementalBuild>true</IncrementalBuild>
+				<BaseAddress>285212672</BaseAddress>
+				<FileAlignment>4096</FileAlignment>
+				<NoStdLib>false</NoStdLib>
+				<GenerateXmlDocFile>true</GenerateXmlDocFile>
+				<XmlDocFile>Docs.xml</XmlDocFile>				
+			</Options>
+		</Configuration>
+
+		<!-- One of the projects that is included in the Solution -->
+		<Project name="RealmForge.Utility" Language="VisualBasic" path="Utility" type="Library" assemblyName="RealmForge.Utility" rootNamespace="RealmForge">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin\lib\Utility</OutputPath>
+					<XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin\lib\Utility</OutputPath>
+					<XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/>
+			<Reference name="System.Data"/> 
+			<Reference name="System.Drawing"/>
+			<Reference name="System.Xml"/>
+			<Reference name="System.Runtime.Serialization.Formatters.Soap"/>
+			<Reference name="ICSharpCode.SharpZipLib"/>
+			<Files>
+				<Match path="." pattern="*.vb" recurse="true"/>
+			</Files>
+		</Project>
+
+		<!-- Another projects that is included in the Solution -->
+		<Project name="DemoGame" Language="C#" path="DemoGame" type="WinExe" icon="..\bin\RealmForge.ico" assemblyName="DemoGame" rootNamespace="RealmForge">
+				<!-- icon is used to define the location of the .ico file that is embeeded in the assembly when the project is compiled.  This is relative to the project path -->
+				<!--type defines the type of project, valid types are Library (.dll), WinExe (.exe), and Exe (.exe).  WinExe is not windows specific, it just defines that it is a GUI application and that no Console or Command window will show when it is started-->
+
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin</OutputPath>
+					<XmlDocFile>DemoGame.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin</OutputPath>
+					<XmlDocFile>DemoGame.xml</XmlDocFile>		
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/> <!-- Assemblies that are located in the GAC (installed, global) can be referenced-->
+			<Reference name="ode"/>  <!-- Assemblies that are located in the output directory to which the file is built can be referenced -->
+			<Reference name="RealmForge.Utility"/> <!-- When you reference the name of another project, then that project (and it's output) will be referenced instead of looking for a pre-built assembly-->
+			<Files>
+				<Match path="." pattern="*.cs" recurse="true"/>
+				<Match path="." pattern="*.bmp" recurse="true" buildAction="EmbeddedResource"/>
+				<Match path="." pattern="[^a]*\.(png|jpg)" useRegex="true" buildAction="EmbeddedResource"/>
+				
+				<!-- Uses a regex or regular expression to find all files that end with .png or .jpg but dont have the letter 'a' in their name and add them to the project as EmbeddedResource's.  Because recurse enabled (default is false), only the values in the files in that are directly in the project directory (not child directories) are checked.-->
+				<!--EmbeddedResource, Content, and Compile are valid buildAction's-->
+			</Files>
+		</Project>
+		
+	</Solution>
+</Prebuild>
+
diff --git a/Prebuild/TODO b/Prebuild/TODO
new file mode 100644
index 0000000..d01780a
--- /dev/null
+++ b/Prebuild/TODO
@@ -0,0 +1,21 @@
+* monodev target should be able to detect whether the project is 1.x
+  or 2.x runtime
+
+* make an autotools install target for .exe files
+
+* Fix the autotools target so that
+
+if(numProjects == 1){
+  for($projectDir){
+    generate_a_project_configure_dot_ac()
+  }
+}else{
+  generate_a_solution_configure_dot_ac()
+
+  foreach($project in $projectsList){
+    mkdir $project/
+    cd $project/
+    generate_a_project_configure_dot_ac
+  }
+}
+
diff --git a/Prebuild/doc/prebuild-example1.xml b/Prebuild/doc/prebuild-example1.xml
new file mode 100644
index 0000000..ea6f455
--- /dev/null
+++ b/Prebuild/doc/prebuild-example1.xml
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Prebuild version="1.6" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
+	<Solution name="RealmForge">
+		<Configuration name="Debug">
+			<Options>
+				<CompilerDefines>TRACE;DEBUG</CompilerDefines>
+				<OptimizeCode>false</OptimizeCode>
+				<CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+				<AllowUnsafe>false</AllowUnsafe>
+				<WarningLevel>4</WarningLevel>
+				<WarningsAsErrors>false</WarningsAsErrors>
+				<SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings>
+				<OutputPath>..\bin</OutputPath>
+				<DebugInformation>true</DebugInformation>
+				<RegisterComInterop>false</RegisterComInterop>
+				<IncrementalBuild>true</IncrementalBuild>
+				<BaseAddress>285212672</BaseAddress>
+				<FileAlignment>4096</FileAlignment>
+				<NoStdLib>false</NoStdLib>
+				<XmlDocFile>Docs.xml</XmlDocFile>
+			</Options>
+		</Configuration>
+		<Configuration name="Release">
+			<Options>
+				<CompilerDefines>TRACE</CompilerDefines>
+				<OptimizeCode>true</OptimizeCode>
+				<CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+				<AllowUnsafe>false</AllowUnsafe>
+				<WarningLevel>4</WarningLevel>
+				<WarningsAsErrors>false</WarningsAsErrors>
+				<SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings>
+				<OutputPath>..\bin</OutputPath>
+				<DebugInformation>false</DebugInformation>
+				<RegisterComInterop>false</RegisterComInterop>
+				<IncrementalBuild>true</IncrementalBuild>
+				<BaseAddress>285212672</BaseAddress>
+				<FileAlignment>4096</FileAlignment>
+				<NoStdLib>false</NoStdLib>
+				<XmlDocFile>Docs.xml</XmlDocFile>				
+			</Options>
+		</Configuration>
+
+		<Project name="RealmForge.Utility" path="Utility" type="Library" assemblyName="RealmForge.Utility" rootNamespace="RealmForge">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin\lib\Utility</OutputPath>
+					<XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin\lib\Utility</OutputPath>
+					<XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/>
+			<Reference name="System.Data"/> 
+			<Reference name="System.Drawing"/>
+			<Reference name="System.Xml"/>
+			<Reference name="System.Runtime.Serialization.Formatters.Soap"/>
+			<Reference name="ICSharpCode.SharpZipLib"/>
+			<Files>
+				<Match pattern="*.cs" recurse="true"/>
+			</Files>
+		</Project>
+
+		<Project name="RealmForge.Framework" path="Framework" type="Library" assemblyName="RealmForge.Framework" rootNamespace="RealmForge">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin\lib\Framework</OutputPath>
+					<XmlDocFile>RealmForge.Framework.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin\lib\Framework</OutputPath>
+					<XmlDocFile>RealmForge.Framework.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/>
+			<Reference name="System.Data"/> 
+			<Reference name="System.Xml"/>
+			<Reference name="System.Windows.Forms"/>
+			<Reference name="System.Drawing"/>
+			<Reference name="Axiom.MathLib"/>
+			<Reference name="RealmForge.Utility"/>
+			<Reference name="Tao.OpenAl"/>
+			<Reference name="ICSharpCode.SharpZipLib"/>
+			<Reference name="csogg"/>
+			<Reference name="csvorbis"/>
+			<Files>
+				<Match pattern="*.cs" recurse="true"/>
+				<Match pattern="*.txt" recurse="true"/>
+			</Files>
+		</Project>
+
+		<Project name="RealmForge.Genres" path="Genres" type="Library" assemblyName="RealmForge.Genres" rootNamespace="RealmForge">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin\lib\Genres</OutputPath>
+					<XmlDocFile>RealmForge.Genres.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin\lib\Genres</OutputPath>
+					<XmlDocFile>RealmForge.Genres.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/>
+			<Reference name="System.Data"/> 
+			<Reference name="System.Xml"/>
+			<Reference name="System.Windows.Forms"/>
+			<Reference name="System.Drawing"/>
+			<Reference name="Axiom.MathLib"/>
+			<Reference name="RealmForge.Utility"/>
+			<Reference name="RealmForge.Framework"/>
+			<Files>
+				<Match pattern="*.cs" recurse="true"/>
+			</Files>
+		</Project>
+				
+		<Project name="RealmForge.UI.Forms" path="Forms" type="Library" assemblyName="RealmForge.UI.Forms" rootNamespace="RealmForge">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin\lib\Forms</OutputPath>	
+					<XmlDocFile>RealmForge.UI.Forms.xml</XmlDocFile>
+					<AllowUnsafe>true</AllowUnsafe>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin\lib\Forms</OutputPath>
+					<XmlDocFile>RealmForge.UI.Forms.xml</XmlDocFile>
+					<AllowUnsafe>true</AllowUnsafe>
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/>
+			<Reference name="System.Drawing"/>
+			<Reference name="System.Data"/>
+			<Reference name="System.Design"/>
+			<Reference name="System.Windows.Forms"/>
+			<Reference name="System.Xml"/>
+			<Reference name="Axiom.MathLib"/>
+			<Reference name="wx.NET"/>
+			<Reference name="RealmForge.Framework"/>
+			<Reference name="RealmForge.Utility"/>
+			<Files>
+				<File buildAction="EmbeddedResource">IDE\Resources\ImagesCaptionIDE.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Resources\ImagesCaptionPlain.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Resources\ImagesMenuControl.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Resources\ImagesPopupMenu.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Resources\ImagesTabbedGroups.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Resources\ImagesTabControl.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Resources\LibraryIcon.ico</File>
+				<File buildAction="EmbeddedResource">IDE\Resources\TabbedInvalid.cur</File>
+				<File buildAction="EmbeddedResource">IDE\Resources\TabbedValid.cur</File>
+				<File buildAction="EmbeddedResource">IDE\Resources\WizardPicture.bmp</File>
+				<File buildAction="EmbeddedResource">Controls\Trees\tv_minus.bmp</File>
+				<File buildAction="EmbeddedResource">Controls\Trees\tv_plus.bmp</File>
+				<File buildAction="EmbeddedResource">Controls\Trees\treeview.bmp</File>
+				<File buildAction="EmbeddedResource">Controls\Trees\listview.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Menus\MenuControl.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Controls\InertButton.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Controls\TabbedGroups.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Controls\TabCOntrol.bmp</File>
+				<File buildAction="EmbeddedResource">IDE\Controls\WizardControl.bmp</File>
+				<File buildAction="EmbeddedResource">Forms\IDETest.resx</File>
+				<File buildAction="EmbeddedResource">Forms\IDEWindow.resx</File>
+				<File buildAction="EmbeddedResource">Forms\Launcher.resx</File>
+				<File buildAction="EmbeddedResource">Forms\MainRenderFrame.resx</File>
+				<Match pattern="*.cs" recurse="true"/>
+			</Files>
+		</Project>
+		
+		<Project name="RealmForge.RAGE" path="RAGE" type="Library" assemblyName="RealmForge.RAGE" rootNamespace="RealmForge">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin\lib\RAGE</OutputPath>	
+					<XmlDocFile>RealmForge.RAGE.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin\lib\RAGE</OutputPath>
+					<XmlDocFile>RealmForge.RAGE.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+				<ReferencePath>../bin</ReferencePath>
+				<ReferencePath>../bin</ReferencePath>
+				<Reference name="System"/>
+				<Reference name="System.XML"/>
+				<Reference name="System.Windows.Forms"/>
+				<Reference name="System.Drawing"/>
+				<Reference name="Axiom.Plugins.CgProgramManager"/>
+				<Reference name="Axiom.Engine"/>
+				<Reference name="Axiom.MathLib"/>
+				<Reference name="Axiom.Plugins.ParticleFX"/>
+				<Reference name="Axiom.Platforms.Win32"/>
+				<Reference name="Axiom.RenderSystems.DirectX9"/>
+				<Reference localCopy="false" name="Axiom.RenderSystems.OpenGL"/>
+				<Reference name="Axiom.SceneManagers.Octree"/>
+				<Reference name="ICSharpCode.SharpZipLib"/>
+				<Reference name="System.Data"/>
+				<Reference name="RealmForge.Framework"/>
+				<Reference name="RealmForge.Utility"/>
+				<Reference name="ode"/>
+			<Files>
+				<Match pattern="*.cs" recurse="true"/>
+			</Files>
+		</Project>
+
+
+		<Project name="RealmForge.ScriptLibrary" path="ScriptLibrary" type="Library" assemblyName="RealmForge.ScriptLibrary" rootNamespace="RSL">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin\ScriptLibrary</OutputPath>
+					<XmlDocFile>RealmForge.ScriptLibrary.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin\ScriptLibrary</OutputPath>
+					<XmlDocFile>RealmForge.ScriptLibrary.xml</XmlDocFile>	
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/>
+			<Reference name="System.XML"/>
+			<Reference name="System.Windows.Forms"/>
+			<Reference name="System.Drawing"/>
+			<Reference name="Axiom.MathLib"/>
+			<Reference name="wx.NET"/>
+			<Reference name="RealmForge.UI.Forms"/>
+			<Reference name="RealmForge.RAGE"/>
+			<Reference name="RealmForge.Framework"/>
+			<Reference name="RealmForge.Utility"/>
+			<Files>
+				<Match pattern="*.cs" recurse="true"/>
+			</Files>
+		</Project>
+
+		
+		<Project name="Updater" path="Updater" type="WinExe" icon="..\bin\Updater.ico" assemblyName="Updater" rootNamespace="RealmForge">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin\lib\Updater</OutputPath>
+					<XmlDocFile>Updater.xml</XmlDocFile>	
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin\lib\Updater</OutputPath>
+					<XmlDocFile>Updater.xml</XmlDocFile>		
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/>
+			<Reference name="RealmForge.UI.Forms"/>
+			<Reference name="RealmForge.Framework"/>
+			<Reference name="RealmForge.Utility"/>
+			<Files>
+				<Match pattern="*.cs" recurse="true"/>
+			</Files>
+		</Project>
+
+
+		<Project name="DemoGame" path="DemoGame" type="WinExe" icon="..\bin\RealmForge.ico" assemblyName="DemoGame" rootNamespace="RealmForge">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin</OutputPath>
+					<XmlDocFile>DemoGame.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin</OutputPath>
+					<XmlDocFile>DemoGame.xml</XmlDocFile>		
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/>
+			<Reference name="RealmForge.UI.Forms"/>
+			<Reference name="RealmForge.ScriptLibrary"/>
+			<Reference name="RealmForge.RAGE"/>
+			<Reference name="RealmForge.Framework"/>
+			<Reference name="RealmForge.Utility"/>
+			<Files>
+				<Match pattern="*.cs" recurse="true"/>
+			</Files>
+		</Project>
+		
+	</Solution>
+</Prebuild>
+
+	
diff --git a/Prebuild/doc/prebuild-example2.xml b/Prebuild/doc/prebuild-example2.xml
new file mode 100644
index 0000000..02276f6
--- /dev/null
+++ b/Prebuild/doc/prebuild-example2.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
+    <Solution name="Prebuild">
+	<Configuration name="Debug">
+	    <Options>
+		<?if OS = "Win32" ?>
+		<CompilerDefines>DEBUG;TRACE;WIN32;NET</CompilerDefines>
+		<?else ?>
+		<CompilerDefines>DEBUG;TRACE;POSIX</CompilerDefines>
+		<?endif ?>
+		<OptimizeCode>false</OptimizeCode>
+		<OutputPath>bin\Debug</OutputPath>
+		<DebugInformation>true</DebugInformation>
+		<SuppressWarnings>1595</SuppressWarnings>
+	    </Options>
+	</Configuration>
+	<Configuration name="Release">
+	    <Options>
+		<?if OS = "Win32" ?>
+		<CompilerDefines>TRACE;WIN32;NET</CompilerDefines>
+		<?else ?>
+		<CompilerDefines>TRACE;POSIX</CompilerDefines>
+		<?endif ?>
+		<OutputPath>bin\Release</OutputPath>
+		<OptimizeCode>true</OptimizeCode>
+		<DebugInformation>false</DebugInformation>
+		<SuppressWarnings>1595</SuppressWarnings>
+	    </Options>
+	</Configuration>
+	<Files>
+	    <File>prebuild.xml</File>
+	    <Match path="doc" pattern="*.txt"/>
+	</Files>
+	<Project name="Prebuild" path="src" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild">
+	    <Configuration name="Debug">
+		<Options>
+		    <?if OS = "Win32" ?>
+		    <CompilerDefines>DEBUG;TRACE;WIN32;NET</CompilerDefines>
+		    <?else ?>
+		    <CompilerDefines>DEBUG;TRACE;POSIX</CompilerDefines>
+		    <?endif ?>
+		    <OptimizeCode>false</OptimizeCode>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>Prebuild.xml</XmlDocFile>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <?if OS = "Win32" ?>
+		    <CompilerDefines>TRACE;WIN32;NET</CompilerDefines>
+		    <?else ?>
+		    <CompilerDefines>TRACE;POSIX</CompilerDefines>
+		    <?endif ?>
+		    <OutputPath>bin\Release</OutputPath>
+		    <OptimizeCode>true</OptimizeCode>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>Prebuild.xml</XmlDocFile>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System.Xml" />
+	    <Reference name="System" />
+	    <Files>
+		<Match pattern="App.ico" buildAction="EmbeddedResource"/>
+		<Match path="data" pattern="prebuild-1.6.xsd" buildAction="EmbeddedResource"/>
+		<Match pattern="*.cs" recurse="true"/>			
+	    </Files>
+	</Project>
+    </Solution>
+</Prebuild>
diff --git a/Prebuild/doc/prebuild-example3.xml b/Prebuild/doc/prebuild-example3.xml
new file mode 100644
index 0000000..1ba38f7
--- /dev/null
+++ b/Prebuild/doc/prebuild-example3.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <!--The version of the XML schema specified in the version and xmlns attributes should match the one for which the version of Prebuild.exe used was compiled for.  In this example it is the version 1.6 schema, you can find the XSD schema file at the url specified in the xmlns attribute. -->
+    <Prebuild version="1.6" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
+	<Solution name="RealmForge"> <!--The title and file name for the solution, combine, workspace, or project group (depending on what development tool you are using)-->
+                       <!--Configurations found as children of Solution are used as templates for the configurations found in the project, this allows you to avoid writing the same options in each project (and maintaining each of these).  You can provide defaults and then override them in the configurations defined for each project. All options are optional.-->
+		<Configuration name="Debug">
+			<Options>
+				<!-- simple logically expressions can be evaluated, if, else, elseif, and endif are valid statements.  Note that it is not neccisary to define POSIX or WIN32 -->
+				<?if OS = "Win32" ?>
+					<CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
+				<?else ?>
+					<CompilerDefines>DEBUG;TRACE;POSIX</CompilerDefines>
+				<?endif ?>
+				<OptimizeCode>false</OptimizeCode>
+				<CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+				<AllowUnsafe>false</AllowUnsafe>
+				<WarningLevel>4</WarningLevel>   
+				<!--The filter for the number of warnings or errors shown and the tolerance level as to what is an error. This is value from 0 to 4 where 4 is the most strict (least tolerent).-->
+
+				<WarningsAsErrors>false</WarningsAsErrors>
+				<SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings> 
+ 				<!-- A semicolon ';'  delimited list of the warnings that are filtered and not shown in the output window during compiling a project.  Only include the number portion of the warning codes that are shown in output during compilation (eg CS1591, should be entered as 1591)-->
+
+				<OutputPath>..\bin</OutputPath>
+				<DebugInformation>true</DebugInformation>
+				<RegisterComInterop>false</RegisterComInterop>
+				<IncrementalBuild>true</IncrementalBuild>
+				<BaseAddress>285212672</BaseAddress>
+				<FileAlignment>4096</FileAlignment>
+				<NoStdLib>false</NoStdLib>
+				<XmlDocFile>Docs.xml</XmlDocFile>
+			</Options>
+		</Configuration>
+		<Configuration name="Release"> <!-- You can define multple configurations that projects can have, but there is no way to define which one is selected by default as this is a part of the user preferences for a project, not the solution or project files -->
+			<Options>
+				<CompilerDefines>TRACE</CompilerDefines>
+				<OptimizeCode>true</OptimizeCode>
+				<CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+				<AllowUnsafe>false</AllowUnsafe>
+				<WarningLevel>4</WarningLevel>
+				<WarningsAsErrors>false</WarningsAsErrors>
+				<SuppressWarnings>1591;219;1573;1572;168</SuppressWarnings>
+				<OutputPath>..\bin</OutputPath>
+				<DebugInformation>false</DebugInformation>
+				<RegisterComInterop>false</RegisterComInterop>
+				<IncrementalBuild>true</IncrementalBuild>
+				<BaseAddress>285212672</BaseAddress>
+				<FileAlignment>4096</FileAlignment>
+				<NoStdLib>false</NoStdLib>
+				<XmlDocFile>Docs.xml</XmlDocFile>				
+			</Options>
+		</Configuration>
+
+		<!-- One of the projects that is included in the Solution -->
+		<Project name="RealmForge.Utility" path="Utility" type="Library" assemblyName="RealmForge.Utility" rootNamespace="RealmForge">
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin\lib\Utility</OutputPath>
+					<XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin\lib\Utility</OutputPath>
+					<XmlDocFile>RealmForge.Utility.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/>
+			<Reference name="System.Data"/> 
+			<Reference name="System.Drawing"/>
+			<Reference name="System.Xml"/>
+			<Reference name="System.Runtime.Serialization.Formatters.Soap"/>
+			<Reference name="ICSharpCode.SharpZipLib"/>
+			<Files>
+				<Match pattern="*.cs" recurse="true"/>
+			</Files>
+		</Project>
+
+		<!-- Another projects that is included in the Solution -->
+		<Project name="DemoGame" path="DemoGame" type="WinExe" icon="..\bin\RealmForge.ico" assemblyName="DemoGame" rootNamespace="RealmForge">
+				<!-- icon is used to define the location of the .ico file that is embeeded in the assembly when the project is compiled.  This is relative to the project path -->
+				<!--type defines the type of project, valid types are Library (.dll), WinExe (.exe), and Exe (.exe).  WinExe is not windows specific, it just defines that it is a GUI application and that no Console or Command window will show when it is started-->
+
+			<Configuration name="Debug">
+				<Options>
+					<OutputPath>..\bin</OutputPath>
+					<XmlDocFile>DemoGame.xml</XmlDocFile>
+				</Options>
+			</Configuration>
+			<Configuration name="Release">
+				<Options>
+					<OutputPath>..\bin</OutputPath>
+					<XmlDocFile>DemoGame.xml</XmlDocFile>		
+				</Options>
+			</Configuration>
+			<ReferencePath>../bin</ReferencePath>
+			<Reference name="System"/> <!-- Assemblies that are located in the GAC (installed, global) can be referenced-->
+			<Reference name="ode"/>  <!-- Assemblies that are located in the output directory to which the file is built can be referenced -->
+			<Reference name="RealmForge.Utility"/> <!-- When you reference the name of another project, then that project (and it's output) will be referenced instead of looking for a pre-built assembly-->
+			<Files>
+				<!-- path defaults to . or the directory that prebuild.exe resides in -->
+				<Match path="." pattern="*.cs" recurse="true"/>
+				<Match pattern="*.bmp" recurse="true" buildAction="EmbeddedResource"/>
+				<Match pattern="[^a]*\.(png|jpg)" useRegex="true" buildAction="EmbeddedResource"/>
+				
+				<!-- Uses a regex or regular expression to find all files that end with .png or .jpg but dont have the letter 'a' in their name and add them to the project as EmbeddedResource's.  Because recurse enabled (default is false), only the values in the files in that are directly in the project directory (not child directories) are checked.-->
+				<!--EmbeddedResource, Content, and Compile are valid buildAction's-->
+			</Files>
+		</Project>
+		
+	</Solution>
+</Prebuild>
diff --git a/Prebuild/doc/prebuild-example4.xml b/Prebuild/doc/prebuild-example4.xml
new file mode 100644
index 0000000..c6c223f
--- /dev/null
+++ b/Prebuild/doc/prebuild-example4.xml
@@ -0,0 +1,715 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd" version="1.6">
+    <Solution name="SdlDotNet">
+	<Configuration name="Debug">
+	    <Options>
+		<CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		<OptimizeCode>false</OptimizeCode>
+		<AllowUnsafe>false</AllowUnsafe>
+		<OutputPath>bin\Debug</OutputPath>
+		<DebugInformation>true</DebugInformation>
+		<WarningLevel>4</WarningLevel>
+		<SuppressWarnings>1595</SuppressWarnings>
+	    </Options>
+	</Configuration>
+	<Configuration name="Release">
+	    <Options>
+		<CompilerDefines>TRACE</CompilerDefines>
+		<OptimizeCode>true</OptimizeCode>
+		<AllowUnsafe>false</AllowUnsafe>
+		<OutputPath>bin\Release</OutputPath>
+		<DebugInformation>false</DebugInformation>
+		<WarningLevel>1</WarningLevel>
+		<SuppressWarnings>1595</SuppressWarnings>
+	    </Options>
+	</Configuration>
+	<Files>
+	    <File buildAction="Content">SdlDotNet.build</File>
+	    <File buildAction="Content">prebuild.xml</File>
+	</Files>
+	<Project name="SdlDotNet" path="src" language="C#" type="Library" assemblyName="SdlDotNet" rootNamespace="SdlDotNet">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>SdlDotNet.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <XmlDocFile>SdlDotNet.xml</XmlDocFile>
+		    <DebugInformation>false</DebugInformation>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" />
+	    <Reference name="System.Windows.Forms" />
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="Tao.Sdl" localCopy="true" path="..\\lib"/>
+	    <Files>
+		<Match path="." pattern="SurfaceControl.cs" subType="Component" recurse="true"/>
+		<Match path="." pattern="*.bmp" buildAction="EmbeddedResource" recurse="true"/>
+		<Match path="." pattern="*.cs" recurse="true">
+		    <Exclude name="SurfaceControl.cs"/>
+		</Match>
+	    </Files>
+	</Project>
+	<Project name="Rectangles" path="examples\\Rectangles" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.Rectangles.Rectangles" assemblyName="Rectangles" rootNamespace="SdlDotNet.Examples.Rectangles" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>Rectangles.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>Rectangles.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="Gears" path="examples\\Gears" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.Gears.Gears" assemblyName="Gears" rootNamespace="SdlDotNet.Examples.Gears" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>Gears.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>Gears.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Reference name="Tao.OpenGl" localCopy="true" path="..\\..\\lib"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="CDPlayer" path="examples\\CDPlayer" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.CDPlayer.CDPlayer" assemblyName="CDPlayer" rootNamespace="SdlDotNet.Examples.CDPlayer" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>CDPlayer.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>CDPlayer.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="System.Windows.Forms" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<File subType="Form">CDPlayer.cs</File>
+		<Match path="." pattern="*.cs" recurse="true">
+		    <Exclude name="CDPlayer.cs"/>		    
+		</Match>
+	    </Files>
+	</Project>
+	<Project name="MoviePlayer" path="examples\\MoviePlayer" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.MoviePlayer.MoviePlayer" assemblyName="MoviePlayer" rootNamespace="SdlDotNet.Examples.MoviePlayer" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>MoviePlayer.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>MoviePlayer.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="SimpleGame" path="examples\\SimpleGame" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.SimpleGame.GameMain" assemblyName="SimpleGame" rootNamespace="SdlDotNet.Examples.SimpleGame" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>SimpleGame.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>SimpleGame.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="BombRun" path="examples\\BombRun" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.BombRun.BombRun" assemblyName="BombRun" rootNamespace="SdlDotNet.Examples.BombRun" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>BombRun.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>BombRun.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="SnowDemo" path="examples\\SnowDemo" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.SnowDemo.SnowDemo" assemblyName="SnowDemo" rootNamespace="SdlDotNet.Examples.SnowDemo" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>SnowDemo.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>SnowDemo.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="BounceSprites" path="examples\\BounceSprites" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.BounceSprites.BounceSprites" assemblyName="BounceSprites" rootNamespace="SdlDotNet.Examples.BounceSprites" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>BounceSprites.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>BounceSprites.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="Triad" path="examples\\Triad" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.Triad.MainObject" assemblyName="Triad" rootNamespace="SdlDotNet.Examples.Triad" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>Triad.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>Triad.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Reference name="nunit.framework" localCopy="true" path="..\\..\\lib"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="GuiExample" path="examples\\GuiExample" language="C#" type="Library" assemblyName="GuiExample" rootNamespace="SdlDotNet.Examples.GuiExample">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>GuiExample.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>GuiExample.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="SpriteGuiDemos" path="examples\\SpriteGuiDemos" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.SpriteGuiDemos.SdlDemo" assemblyName="SpriteGuiDemo" rootNamespace="SdlDotNet.Examples.SpriteGuiDemos" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>SpriteGuiDemos.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>SpriteGuiDemos.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Reference name="GuiExample" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="Tests" path="tests" language="C#" type="Library" assemblyName="SdlDotNet.Tests" rootNamespace="SdlDotNet.Tests">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>SdlDotNet.Tests.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>SdlDotNet.Tests.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Reference name="Tao.Sdl" localCopy="true" path="..\\lib"/>
+	    <Reference name="GuiExample" localCopy="true"/>
+	    <Reference name="nunit.framework" localCopy="true" path="..\\lib"/>
+	    <Files>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="AudioExample" path="examples\\AudioExample" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.AudioExample.AudioExample" assemblyName="AudioExample" rootNamespace="SdlDotNet.Examples.AudioExample" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>AudioExample.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>AudioExample.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="SdlDotNet.Particles" path="extras\\Particles" language="C#" type="Library" assemblyName="SdlDotNet.Particles" rootNamespace="SdlDotNet.Particles">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>SdlDotNet.Particles.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>SdlDotNet.Particles.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<Project name="ParticlesExample" path="examples\\ParticlesExample" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.ParticlesExample.ParticlesExample" assemblyName="ParticlesExample" rootNamespace="SdlDotNet.Examples.ParticlesExample" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>ParticlesExample.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>ParticlesExample.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Reference name="SdlDotNet.Particles" localCopy="true"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+	<!--<Project name="SdlDotNet.Gui" path="extras\\Gui" language="C#" type="Library" assemblyName="SdlDotNet.Gui" rootNamespace="SdlDotNet.Gui">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>SdlDotNet.Gui.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>SdlDotNet.Gui.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Files>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>-->
+	<Project name="NeHe" path="examples\\NeHe" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.NeHe.NeHe" assemblyName="NeHe" rootNamespace="SdlDotNet.Examples.NeHe" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>NeHe.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>NeHe.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="System.Windows.Forms" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Reference name="Tao.OpenGl" localCopy="true" path="..\\..\\lib"/>
+	    <Reference name="Tao.OpenGl.Glu" localCopy="true" path="..\\..\\lib"/>
+	    <Reference name="Tao.Platform.Windows" localCopy="true" path="..\\..\\lib"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<File subType="Form">NeHe.cs</File>
+		<Match path="." pattern="*.cs" recurse="true">
+		    <Exclude name="NeHe.cs"/>
+		</Match>
+	    </Files>
+	</Project>
+	<Project name="RedBook" path="examples\\RedBook" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.RedBook.RedBook" assemblyName="RedBook" rootNamespace="SdlDotNet.Examples.RedBook" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>RedBook.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>RedBook.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="System.Windows.Forms" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Reference name="Tao.OpenGl" localCopy="true" path="..\\..\\lib"/>
+	    <Reference name="Tao.OpenGl.Glu" localCopy="true" path="..\\..\\lib"/>
+	    <Reference name="Tao.FreeGlut" localCopy="true" path="..\\..\\lib"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<File subType="Form">RedBook.cs</File>
+		<Match path="." pattern="*.cs" recurse="true">
+		    <Exclude name="RedBook.cs" />
+		</Match>
+	    </Files>
+	</Project>
+	<Project name="PhysFsTest" path="examples\\PhysFsTest" language="C#" type="WinExe" startupObject="SdlDotNet.Examples.PhysFsTest.PhysFsTest" assemblyName="PhysFsTest" rootNamespace="SdlDotNet.Examples.PhysFsTest" icon="App.ico">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		    <XmlDocFile>PhysFsTest.xml</XmlDocFile>
+		    <WarningLevel>4</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		    <XmlDocFile>PhysFsTest.xml</XmlDocFile>
+		    <WarningLevel>1</WarningLevel>
+		    <SuppressWarnings>1595</SuppressWarnings>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="System.Drawing" /> 
+	    <Reference name="SdlDotNet" localCopy="true"/>
+	    <Reference name="Tao.PhysFs" localCopy="true" path="..\\..\\lib"/>
+	    <Files>
+		<File buildAction="EmbeddedResource">App.ico</File>
+		<Match path="." pattern="*.cs" recurse="true"/>
+	    </Files>
+	</Project>
+    </Solution>
+</Prebuild>
diff --git a/Prebuild/doc/prebuild-example5.xml b/Prebuild/doc/prebuild-example5.xml
new file mode 100644
index 0000000..5221547
--- /dev/null
+++ b/Prebuild/doc/prebuild-example5.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd" version="1.6">
+    <Solution name="Tao.Sdl">
+	<Configuration name="Debug">
+	    <Options>
+		<CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
+		<OptimizeCode>false</OptimizeCode>
+		<AllowUnsafe>true</AllowUnsafe>
+		<OutputPath>bin\Debug</OutputPath>
+		<XmlDocFile>Tao.Sdl.xml</XmlDocFile>
+		<DebugInformation>true</DebugInformation>
+	    </Options>
+	</Configuration>
+	<Configuration name="Release">
+	    <Options>
+		<CompilerDefines>TRACE;WIN32</CompilerDefines>
+		<OptimizeCode>true</OptimizeCode>
+		<AllowUnsafe>true</AllowUnsafe>
+		<OutputPath>bin\Release</OutputPath>
+		<XmlDocFile>Tao.Sdl.xml</XmlDocFile>
+		<DebugInformation>false</DebugInformation>
+	    </Options>
+	</Configuration>
+	<Files>
+	    <File>Tao.Sdl.License.txt</File>
+	    <File>Tao.Sdl.Readme.txt</File>
+	    <File>Tao.Sdl.snk</File>
+	    <File>Tao.Sdl.dll.config</File>
+	</Files>
+	<Project name="Tao.Sdl" path="." language="C#" type="Library">
+	    <Reference name="System" /> 
+	    <Files>
+		<File>AssemblyInfo.cs</File>
+		<File>Sdl.cs</File>
+		<File>SdlImage.cs</File>
+		<File>SdlMixer.cs</File>
+		<File>SdlTtf.cs</File>
+		<File>SdlNet.cs</File>
+		<File>SdlGfx.cs</File>
+		<File>Smpeg.cs</File>
+		<File>DelegateCallingConventionCdeclAttribute.cs</File>
+	    </Files>
+	</Project>
+	<Project name="Tao.Sdl.Tests" path="..\\..\\tests\\Sdl\\" language="C#" type="Library">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <XmlDocFile>Tao.Sdl.Tests.xml</XmlDocFile>
+		    <DebugInformation>true</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <XmlDocFile>Tao.Sdl.Tests.xml</XmlDocFile>
+		    <DebugInformation>false</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="nunit.framework.dll"/>
+	    <Reference name="Tao.Sdl" />
+	    <Files>
+		<File>AssemblyInfo.cs</File>
+		<File>SdlTest.cs</File>
+		<File>SdlTestVideo.cs</File>
+		<File>SdlTestImage.cs</File>
+		<File>SdlTestTtf.cs</File>
+		<File>SdlTestMixer.cs</File>
+		<File>SdlTestGfx.cs</File>
+		<File>SmpegTest.cs</File>
+	    </Files>
+	</Project>
+	<Project name="SdlExamples.Rectangles" path="..\\..\\examples\\SdlExamples\\Rectangles" language="C#" type="WinExe" startupObject="SdlExamples.Rectangles">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="Tao.Sdl" />
+	    <Files>
+		<File>AssemblyInfo.cs</File>
+		<File>Rectangles.cs</File>
+	    </Files>
+	</Project>
+	<Project name="SdlExamples.SmpegPlayer" path="..\\..\\examples\\SdlExamples\\SmpegPlayer" language="C#" type="WinExe" startupObject="SdlExamples.SmpegPlayer">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="Tao.Sdl" />
+	    <Files>
+		<File>AssemblyInfo.cs</File>
+		<File>SmpegPlayer.cs</File>
+	    </Files>
+	</Project>
+	<Project name="SdlExamples.GfxPrimitives" path="..\\..\\examples\\SdlExamples\\GfxPrimitives" language="C#" type="WinExe" startupObject="SdlExamples.GfxPrimitives">
+	    <Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" /> 
+	    <Reference name="Tao.Sdl" />
+	    <Files>
+		<File>AssemblyInfo.cs</File>
+		<File>GfxPrimitives.cs</File>
+	    </Files>
+	</Project>
+	<Project name="Tao.PostProcess" path="..\\Tao.PostProcess\\" language="C#" type="Exe">
+	<Configuration name="Debug">
+		<Options>
+		    <CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>false</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Debug</OutputPath>
+		    <DebugInformation>true</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Configuration name="Release">
+		<Options>
+		    <CompilerDefines>TRACE;WIN32</CompilerDefines>
+		    <OptimizeCode>true</OptimizeCode>
+		    <AllowUnsafe>false</AllowUnsafe>
+		    <OutputPath>bin\Release</OutputPath>
+		    <DebugInformation>false</DebugInformation>
+		</Options>
+	    </Configuration>
+	    <Reference name="System" />
+            <Files>
+                <File>AssemblyInfo.cs</File>
+                <File>AppMain.cs</File>
+                <File>BuildProcessor.cs</File>
+                <File>Options.cs</File>
+                <File>ReleaseBuildProcessor.cs</File>
+                <File>UsageHelp.cs</File>
+            </Files>
+        </Project>
+    </Solution>
+</Prebuild>
diff --git a/Prebuild/prebuild b/Prebuild/prebuild
new file mode 100644
index 0000000..0dc648d
--- /dev/null
+++ b/Prebuild/prebuild
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec mono [PREFIX]/prebuild.exe "$@"
diff --git a/Prebuild/scripts/Clean.bat b/Prebuild/scripts/Clean.bat
new file mode 100644
index 0000000..39fa685
--- /dev/null
+++ b/Prebuild/scripts/Clean.bat
@@ -0,0 +1,2 @@
+cd ..
+Prebuild.exe /clean /yes /removedir obj /file prebuild.xml /build NET_2_0 /pause
diff --git a/Prebuild/scripts/Help.bat b/Prebuild/scripts/Help.bat
new file mode 100644
index 0000000..a7d3db4
--- /dev/null
+++ b/Prebuild/scripts/Help.bat
@@ -0,0 +1,2 @@
+cd ..
+Prebuild.exe /usage /pause
\ No newline at end of file
diff --git a/Prebuild/scripts/MonoDevelop.sh b/Prebuild/scripts/MonoDevelop.sh
new file mode 100644
index 0000000..dae3cf4
--- /dev/null
+++ b/Prebuild/scripts/MonoDevelop.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+prebuild /target monodev /file ../prebuild.xml /build NET_1_1 /pause
diff --git a/Prebuild/scripts/Prebuild.nsi b/Prebuild/scripts/Prebuild.nsi
new file mode 100644
index 0000000..0c6e2bc
--- /dev/null
+++ b/Prebuild/scripts/Prebuild.nsi
@@ -0,0 +1,231 @@
+!verbose 3
+
+!define PRODUCT_NAME "Prebuild"
+!define PRODUCT_VERSION "1.3.1"
+!define PRODUCT_PUBLISHER "Prebuild"
+!define PRODUCT_PACKAGE "prebuild"
+!define PRODUCT_WEB_SITE "http://dnpb.sourceforge.net"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Prebuild"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\Prebuild"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+!define PRODUCT_PATH ".."
+
+;!define MUI_WELCOMEFINISHPAGE_BITMAP "PrebuildLogo.bmp"
+;!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
+;!define MUI_UNWELCOMEFINISHPAGE_BITMAP "PrebuildLogo.bmp"
+;!define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH
+
+BrandingText "© 2003-2006 David Hudson, http://dnpb.sourceforge.net/"
+SetCompressor lzma
+CRCCheck on
+
+; File Association defines
+;!include "fileassoc.nsh"
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+
+;--------------------------------
+;Variables
+
+;--------------------------------
+;Installer Pages
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "..\doc\license.txt"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+
+; Finish page
+!insertmacro MUI_PAGE_FINISH
+
+;------------------------------------
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+;------------------------------------
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+
+; Reserve files
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "..\${PRODUCT_PACKAGE}-${PRODUCT_VERSION}-setup.exe"
+InstallDir "$PROGRAMFILES\Prebuild"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+; .NET Framework check
+; http://msdn.microsoft.com/netframework/default.aspx?pull=/library/en-us/dnnetdep/html/redistdeploy1_1.asp
+; Section "Detecting that the .NET Framework 1.1 is installed"
+Function .onInit
+	ReadRegDWORD $R0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v1.1.4322" Install
+	StrCmp $R0 "" 0 CheckPreviousVersion
+	MessageBox MB_OK "Microsoft .NET Framework 1.1 was not found on this system.$\r$\n$\r$\nUnable to continue this installation."
+	Abort
+
+  CheckPreviousVersion:
+	ReadRegStr $R0 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName"
+	StrCmp $R0 "" CheckOSVersion 0
+	MessageBox MB_OK "An old version of Prebuild is installed on this computer, please uninstall first.$\r$\n$\r$\nUnable to continue this installation."
+	Abort
+	
+  CheckOSVersion:
+        Call IsSupportedWindowsVersion
+        Pop $R0
+        StrCmp $R0 "False" NoAbort 0
+	MessageBox MB_OK "The operating system you are using is not supported by Prebuild (95/98/ME/NT3.x/NT4.x)."
+        Abort
+
+  NoAbort:
+FunctionEnd
+
+Section "Source" SecSource
+  SetOverwrite ifnewer
+  SetOutPath "$INSTDIR\src"
+  File /r /x *.swp /x .svn /x *.xml /x *.csproj /x *.user /x *.build /x *.prjx /x *.mdp /x bin /x obj /x *.nsi ${PRODUCT_PATH}\src\*.*
+
+  ;Store installation folder
+  WriteRegStr HKCU "Software\Prebuild" "" $INSTDIR
+  
+SectionEnd
+
+Section "Runtime" SecRuntime
+  SetOverwrite ifnewer
+  SetOutPath "$INSTDIR"
+  File /r /x *.swp /x .svn /x *.nsi /x src /x *.sln /x *.cmbx /x *.mds ${PRODUCT_PATH}\Prebuild.exe ${PRODUCT_PATH}\prebuild.xml
+
+  ;Store installation folder
+  WriteRegStr HKCU "Software\Prebuild" "" $INSTDIR
+  
+SectionEnd
+
+Section "Documentation" SecDocs
+  SetOverwrite ifnewer
+  SetOutPath "$INSTDIR\doc"
+  File /r /x *.swp /x .svn /x *.exe ${PRODUCT_PATH}\doc\*.*
+
+  ;Store installation folder
+  WriteRegStr HKCU "Software\Prebuild" "" $INSTDIR
+SectionEnd
+
+Section "Scripts" SecScripts
+  SetOverwrite ifnewer
+  SetOutPath "$INSTDIR\scripts"
+  File /r /x *.swp /x .svn /x *.nsi /x *.exe ${PRODUCT_PATH}\scripts\*.*
+
+  ;Store installation folder
+  WriteRegStr HKCU "Software\Prebuild" "" $INSTDIR
+SectionEnd
+
+;Language strings
+
+Section -AdditionalIcons
+  WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+SectionEnd
+
+Section Uninstall
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  RMDir /r "$INSTDIR"
+
+SectionEnd
+
+; GetWindowsVersion, taken from NSIS help, modified for our purposes
+Function IsSupportedWindowsVersion
+
+   Push $R0
+   Push $R1
+
+   ReadRegStr $R0 HKLM \
+   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+
+   IfErrors 0 lbl_winnt
+
+   ; we are not NT
+   ReadRegStr $R0 HKLM \
+   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
+
+   StrCpy $R1 $R0 1
+   StrCmp $R1 '4' 0 lbl_error
+
+   StrCpy $R1 $R0 3
+
+   StrCmp $R1 '4.0' lbl_win32_95
+   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
+
+   lbl_win32_95:
+     StrCpy $R0 'False'
+   Goto lbl_done
+
+   lbl_win32_98:
+     StrCpy $R0 'False'
+   Goto lbl_done
+
+   lbl_win32_ME:
+     StrCpy $R0 'False'
+   Goto lbl_done
+
+   lbl_winnt:
+
+   StrCpy $R1 $R0 1
+
+   StrCmp $R1 '3' lbl_winnt_x
+   StrCmp $R1 '4' lbl_winnt_x
+
+   StrCpy $R1 $R0 3
+
+   StrCmp $R1 '5.0' lbl_winnt_2000
+   StrCmp $R1 '5.1' lbl_winnt_XP
+   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error
+
+   lbl_winnt_x:
+     StrCpy $R0 'False'
+   Goto lbl_done
+
+   lbl_winnt_2000:
+     Strcpy $R0 'True'
+   Goto lbl_done
+
+   lbl_winnt_XP:
+     Strcpy $R0 'True'
+   Goto lbl_done
+
+   lbl_winnt_2003:
+     Strcpy $R0 'True'
+   Goto lbl_done
+
+   lbl_error:
+     Strcpy $R0 'False'
+   lbl_done:
+
+   Pop $R1
+   Exch $R0
+
+FunctionEnd
diff --git a/Prebuild/scripts/SharpDevelop.bat b/Prebuild/scripts/SharpDevelop.bat
new file mode 100644
index 0000000..483d9c9
--- /dev/null
+++ b/Prebuild/scripts/SharpDevelop.bat
@@ -0,0 +1,4 @@
+@rem Generates a combine (.cmbx) and a set of project files (.prjx) 
+@rem for SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)
+cd ..
+Prebuild.exe /target sharpdev /file prebuild.xml /build NET_1_1 /pause
diff --git a/Prebuild/scripts/SharpDevelop2.bat b/Prebuild/scripts/SharpDevelop2.bat
new file mode 100644
index 0000000..4ca0272
--- /dev/null
+++ b/Prebuild/scripts/SharpDevelop2.bat
@@ -0,0 +1,4 @@
+@rem Generates a combine (.cmbx) and a set of project files (.prjx) 
+@rem for SharpDevelop (http://icsharpcode.net/OpenSource/SD/Default.aspx)
+cd ..
+Prebuild.exe /target sharpdev2 /file prebuild.xml /pause
diff --git a/Prebuild/scripts/VS2002.bat b/Prebuild/scripts/VS2002.bat
new file mode 100644
index 0000000..a11740e
--- /dev/null
+++ b/Prebuild/scripts/VS2002.bat
@@ -0,0 +1,4 @@
+@rem Generates a solution (.sln) and a set of project files (.csproj) 
+@rem for Microsoft Visual Studio .NET 2002
+cd ..
+Prebuild.exe /target vs2002 /file prebuild.xml /build NET_1_1 /pause
diff --git a/Prebuild/scripts/VS2003.bat b/Prebuild/scripts/VS2003.bat
new file mode 100644
index 0000000..1be57f8
--- /dev/null
+++ b/Prebuild/scripts/VS2003.bat
@@ -0,0 +1,4 @@
+@rem Generates a solution (.sln) and a set of project files (.csproj) 
+@rem for Microsoft Visual Studio .NET 2002
+cd ..
+Prebuild.exe /target vs2003 /file prebuild.xml /build NET_1_1 /pause
diff --git a/Prebuild/scripts/VS2005.bat b/Prebuild/scripts/VS2005.bat
new file mode 100644
index 0000000..86ad3fc
--- /dev/null
+++ b/Prebuild/scripts/VS2005.bat
@@ -0,0 +1,4 @@
+@rem Generates a solution (.sln) and a set of project files (.csproj, .vbproj, etc.)
+@rem for Microsoft Visual Studio .NET 2005
+cd ..
+Prebuild.exe /target vs2005 /file prebuild.xml /build NET_2_0 /pause
diff --git a/Prebuild/scripts/autotools.bat b/Prebuild/scripts/autotools.bat
new file mode 100644
index 0000000..1fd3469
--- /dev/null
+++ b/Prebuild/scripts/autotools.bat
@@ -0,0 +1,4 @@
+@rem Generates Makefiles 
+@rem for autotools
+cd ..
+Prebuild.exe /target autotools /file prebuild.xml /pause
diff --git a/Prebuild/scripts/autotools.sh b/Prebuild/scripts/autotools.sh
new file mode 100644
index 0000000..18cd46f
--- /dev/null
+++ b/Prebuild/scripts/autotools.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+prebuild /target autotools /file ../prebuild.xml /build NET_2_0 /pause
diff --git a/Prebuild/scripts/nant.bat b/Prebuild/scripts/nant.bat
new file mode 100644
index 0000000..2a6ae60
--- /dev/null
+++ b/Prebuild/scripts/nant.bat
@@ -0,0 +1,4 @@
+@rem Generates a .build files 
+@rem for NAnt
+cd ..
+Prebuild.exe /target nant /file prebuild.xml /pause
diff --git a/Prebuild/scripts/nant.sh b/Prebuild/scripts/nant.sh
new file mode 100644
index 0000000..54a8254
--- /dev/null
+++ b/Prebuild/scripts/nant.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+prebuild /target nant /file ../prebuild.xml /pause
diff --git a/Prebuild/src/App.ico b/Prebuild/src/App.ico
new file mode 100644
index 0000000..ac4ea6f
Binary files /dev/null and b/Prebuild/src/App.ico differ
diff --git a/Prebuild/src/Core/Attributes/DataNodeAttribute.cs b/Prebuild/src/Core/Attributes/DataNodeAttribute.cs
new file mode 100644
index 0000000..dbdaf0b
--- /dev/null
+++ b/Prebuild/src/Core/Attributes/DataNodeAttribute.cs
@@ -0,0 +1,81 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.Collections.Specialized;
+
+namespace Prebuild.Core.Attributes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+	public sealed class DataNodeAttribute : Attribute
+	{
+		#region Fields
+
+		private string m_Name = "unknown";
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="DataNodeAttribute"/> class.
+		/// </summary>
+		/// <param name="name">The name.</param>
+		public DataNodeAttribute(string name)
+		{
+			m_Name = name;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return m_Name;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs b/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs
new file mode 100644
index 0000000..edda56d
--- /dev/null
+++ b/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs
@@ -0,0 +1,80 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+
+namespace Prebuild.Core.Attributes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Field)]
+	public sealed class OptionNodeAttribute : Attribute
+	{
+		#region Fields
+
+		private string m_NodeName;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="OptionNodeAttribute"/> class.
+		/// </summary>
+		/// <param name="nodeName">Name of the node.</param>
+		public OptionNodeAttribute(string nodeName)
+		{
+			m_NodeName = nodeName;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the name of the node.
+		/// </summary>
+		/// <value>The name of the node.</value>
+		public string NodeName
+		{
+			get
+			{
+				return m_NodeName;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Attributes/TargetAttribute.cs b/Prebuild/src/Core/Attributes/TargetAttribute.cs
new file mode 100644
index 0000000..985f180
--- /dev/null
+++ b/Prebuild/src/Core/Attributes/TargetAttribute.cs
@@ -0,0 +1,80 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+
+namespace Prebuild.Core.Attributes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+	public sealed class TargetAttribute : Attribute
+	{
+		#region Fields
+
+		private string m_Name;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TargetAttribute"/> class.
+		/// </summary>
+		/// <param name="name">The name.</param>
+		public TargetAttribute(string name)
+		{
+			m_Name = name;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return m_Name;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/FatalException.cs b/Prebuild/src/Core/FatalException.cs
new file mode 100644
index 0000000..92aad3d
--- /dev/null
+++ b/Prebuild/src/Core/FatalException.cs
@@ -0,0 +1,94 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Prebuild.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[Serializable()]
+	public class FatalException : Exception
+	{
+		#region Constructors
+
+		
+		/// <summary>
+		/// Initializes a new instance of the <see cref="FatalException"/> class.
+		/// </summary>
+		public FatalException()
+		{
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="FatalException"/> class.
+		/// </summary>
+		/// <param name="format">The format.</param>
+		/// <param name="args">The args.</param>
+		public FatalException(string format, params object[] args)
+			: base(String.Format(format, args))
+		{
+		}
+
+		/// <summary>
+		/// Exception with specified string
+		/// </summary>
+		/// <param name="message">Exception message</param>
+		public FatalException(string message): base(message)
+		{
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="message"></param>
+		/// <param name="exception"></param>
+		public FatalException(string message, Exception exception) : base(message, exception)
+		{
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="info"></param>
+		/// <param name="context"></param>
+		protected FatalException(SerializationInfo info, StreamingContext context) : base( info, context )
+		{
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Interfaces/IDataNode.cs b/Prebuild/src/Core/Interfaces/IDataNode.cs
new file mode 100644
index 0000000..0bad97c
--- /dev/null
+++ b/Prebuild/src/Core/Interfaces/IDataNode.cs
@@ -0,0 +1,56 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.Xml;
+
+namespace Prebuild.Core.Interfaces 
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public interface IDataNode 
+	{
+		/// <summary>
+		/// Gets or sets the parent.
+		/// </summary>
+		/// <value>The parent.</value>
+		IDataNode Parent { get; set; }        
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		void Parse(XmlNode node);
+	}
+}
diff --git a/Prebuild/src/Core/Interfaces/ITarget.cs b/Prebuild/src/Core/Interfaces/ITarget.cs
new file mode 100644
index 0000000..dac6cd6
--- /dev/null
+++ b/Prebuild/src/Core/Interfaces/ITarget.cs
@@ -0,0 +1,60 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+
+namespace Prebuild.Core.Interfaces 
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public interface ITarget 
+	{
+		/// <summary>
+		/// Writes the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		void Write(Kernel kern);
+		/// <summary>
+		/// Cleans the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		void Clean(Kernel kern);
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		string Name { get; }
+	}
+}
\ No newline at end of file
diff --git a/Prebuild/src/Core/Kernel.cs b/Prebuild/src/Core/Kernel.cs
new file mode 100644
index 0000000..3117e7c
--- /dev/null
+++ b/Prebuild/src/Core/Kernel.cs
@@ -0,0 +1,758 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: robloach $
+ * $Date: 2006-09-26 00:30:53 +0200 (ti, 26 sep 2006) $
+ * $Revision: 165 $
+ */
+#endregion
+
+using System;
+using System.Diagnostics;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using System.Xml.Schema;
+using System.Text;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Nodes;
+using Prebuild.Core.Parse;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core 
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class Kernel : IDisposable
+	{
+		#region Inner Classes
+
+		private struct NodeEntry
+		{
+			public Type Type;
+			public DataNodeAttribute Attribute;
+		}
+
+		#endregion
+
+		#region Fields
+
+		private static Kernel m_Instance = new Kernel();
+
+		/// <summary>
+		/// This must match the version of the schema that is embeeded
+		/// </summary>
+		private static string m_SchemaVersion = "1.7";
+		private static string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd";
+		private static string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema;
+		bool disposed;
+		private Version m_Version;
+		private string m_Revision = "";
+		private CommandLineCollection m_CommandLine;
+		private Log m_Log;
+		private CurrentDirectory m_CurrentWorkingDirectory;
+		private XmlSchemaCollection m_Schemas;
+        
+		private Hashtable m_Targets;
+		private Hashtable m_Nodes;
+        
+		ArrayList m_Solutions;        
+		string m_Target;
+		string m_Clean;
+		string[] m_RemoveDirectories;
+		string m_CurrentFile;
+		bool m_PauseAfterFinish;
+		string[] m_ProjectGroups;
+		StringCollection m_Refs;
+
+		
+		#endregion
+
+		#region Constructors
+
+		private Kernel()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets a value indicating whether [pause after finish].
+		/// </summary>
+		/// <value><c>true</c> if [pause after finish]; otherwise, <c>false</c>.</value>
+		public bool PauseAfterFinish 
+		{
+			get
+			{ 
+				return m_PauseAfterFinish; 
+			} 
+		}
+
+		/// <summary>
+		/// Gets the instance.
+		/// </summary>
+		/// <value>The instance.</value>
+		public static Kernel Instance
+		{
+			get
+			{
+				return m_Instance;
+			}
+		}
+
+		/// <summary>
+		/// Gets the version.
+		/// </summary>
+		/// <value>The version.</value>
+		public string Version
+		{
+			get
+			{
+				return String.Format("{0}.{1}.{2}{3}", m_Version.Major, m_Version.Minor, m_Version.Build, m_Revision);
+			}
+		}
+
+		/// <summary>
+		/// Gets the command line.
+		/// </summary>
+		/// <value>The command line.</value>
+		public CommandLineCollection CommandLine
+		{
+			get
+			{
+				return m_CommandLine;
+			}
+		}
+
+		/// <summary>
+		/// Gets the targets.
+		/// </summary>
+		/// <value>The targets.</value>
+		public Hashtable Targets
+		{
+			get
+			{
+				return m_Targets;
+			}
+		}
+
+		/// <summary>
+		/// Gets the log.
+		/// </summary>
+		/// <value>The log.</value>
+		public Log Log
+		{
+			get
+			{
+				return m_Log;
+			}
+		}
+
+		/// <summary>
+		/// Gets the current working directory.
+		/// </summary>
+		/// <value>The current working directory.</value>
+		public CurrentDirectory CurrentWorkingDirectory
+		{
+			get
+			{
+				return m_CurrentWorkingDirectory;
+			}
+		}
+
+		/// <summary>
+		/// Gets the solutions.
+		/// </summary>
+		/// <value>The solutions.</value>
+		public ArrayList Solutions
+		{
+			get
+			{
+				return m_Solutions;
+			}
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		private void RemoveDirectories(string rootDir, string[] dirNames) 
+		{
+			foreach(string dir in Directory.GetDirectories(rootDir)) 
+			{
+				string simpleName = Path.GetFileName(dir);
+
+				if(Array.IndexOf(dirNames, simpleName) != -1) 
+				{
+					//delete if the name matches one of the directory names to delete
+					string fullDirPath = Path.GetFullPath(dir);
+					Directory.Delete(fullDirPath,true);
+				} 
+				else//not a match, so check children
+				{
+					RemoveDirectories(dir,dirNames);
+					//recurse, checking children for them
+				}
+			}
+		}
+
+//		private void RemoveDirectoryMatches(string rootDir, string dirPattern) 
+//		{
+//			foreach(string dir in Directory.GetDirectories(rootDir)) 
+//			{
+//				foreach(string match in Directory.GetDirectories(dir)) 
+//				{//delete all child directories that match
+//					Directory.Delete(Path.GetFullPath(match),true);
+//				}
+//				//recure through the rest checking for nested matches to delete
+//				RemoveDirectoryMatches(dir,dirPattern);
+//			}
+//		}
+
+		private void LoadSchema()
+		{
+			Assembly assembly = this.GetType().Assembly;
+			Stream stream = assembly.GetManifestResourceStream("Prebuild.data." + m_Schema);
+			if(stream == null) 
+			{
+				//try without the default namespace prepending to it in case was compiled with SharpDevelop or MonoDevelop instead of Visual Studio .NET
+				stream = assembly.GetManifestResourceStream(m_Schema);
+				if(stream == null)
+				{
+					throw new System.Reflection.TargetException(string.Format("Could not find the scheme embedded resource file '{0}'.", m_Schema));
+				}
+			}
+			XmlReader schema = new XmlTextReader(stream);
+            
+			m_Schemas = new XmlSchemaCollection();
+			m_Schemas.Add(m_SchemaURI, schema);
+		}
+
+		private void CacheVersion() 
+		{
+			m_Version = Assembly.GetEntryAssembly().GetName().Version;
+		}
+
+		private void CacheTargets(Assembly assm)
+		{
+			foreach(Type t in assm.GetTypes())
+			{
+				TargetAttribute ta = (TargetAttribute)Helper.CheckType(t, typeof(TargetAttribute), typeof(ITarget));
+				if(ta == null)
+				{
+					continue;
+				}
+
+				ITarget target = (ITarget)assm.CreateInstance(t.FullName);
+				if(target == null)
+				{
+					throw new MissingMethodException("Could not create ITarget instance");
+				}
+
+				m_Targets[ta.Name] = target;
+			}
+		}
+
+		private void CacheNodeTypes(Assembly assm)
+		{
+			foreach(Type t in assm.GetTypes())
+			{
+				DataNodeAttribute dna = (DataNodeAttribute)Helper.CheckType(t, typeof(DataNodeAttribute), typeof(IDataNode));
+				if(dna == null)
+				{
+					continue;
+				}
+
+				NodeEntry ne = new NodeEntry();
+				ne.Type = t;
+				ne.Attribute = dna;
+				m_Nodes[dna.Name] = ne;
+			}
+		}
+
+		private void LogBanner()
+		{
+			m_Log.Write("Prebuild v" + this.Version);
+			m_Log.Write("Copyright (c) Matthew Holmes, Dan Moorehead and David Hudson");
+			m_Log.Write("See 'prebuild /usage' for help");
+			m_Log.Write();
+		}
+
+		private void ProcessFile(string file)
+		{
+			m_CurrentWorkingDirectory.Push();
+            
+			string path = file;
+			try
+			{
+				try
+				{
+					path = Helper.ResolvePath(path);
+				}
+				catch(ArgumentException)
+				{
+					m_Log.Write("Could not open Prebuild file: " + path);
+					m_CurrentWorkingDirectory.Pop();
+					return;
+				}
+
+				m_CurrentFile = path;
+				Helper.SetCurrentDir(Path.GetDirectoryName(path));
+            
+				
+				XmlTextReader reader = new XmlTextReader(path);
+
+                Core.Parse.Preprocessor pre = new Core.Parse.Preprocessor();
+
+                //register command line arguments as XML variables
+                IDictionaryEnumerator dict = m_CommandLine.GetEnumerator();
+                while (dict.MoveNext())
+                {
+                    string name = dict.Key.ToString().Trim();
+                    if (name.Length > 0)
+                        pre.RegisterVariable(name, dict.Value.ToString());
+                }
+
+				string xml = pre.Process(reader);//remove script and evaulate pre-proccessing to get schema-conforming XML
+
+				
+				XmlDocument doc = new XmlDocument();
+				try
+				{
+					XmlValidatingReader validator = new XmlValidatingReader(new XmlTextReader(new StringReader(xml)));
+
+					//validate while reading from string into XmlDocument DOM structure in memory
+					foreach(XmlSchema schema in m_Schemas) 
+					{
+						validator.Schemas.Add(schema);
+					}
+					doc.Load(validator);
+				} 
+				catch(XmlException e) 
+				{
+					throw new XmlException(e.ToString());
+				}
+
+				//is there a purpose to writing it?  An syntax/schema problem would have been found during pre.Process() and reported with details
+				if(m_CommandLine.WasPassed("ppo"))
+				{
+					string ppoFile = m_CommandLine["ppo"];
+					if(ppoFile == null || ppoFile.Trim().Length < 1)
+					{
+						ppoFile = "preprocessed.xml";
+					}
+
+					StreamWriter writer = null;
+					try
+					{
+						writer = new StreamWriter(ppoFile);
+						writer.Write(xml);
+					}
+					catch(IOException ex)
+					{
+						Console.WriteLine("Could not write PPO file '{0}': {1}", ppoFile, ex.Message);
+					}
+					finally
+					{
+						if(writer != null)
+						{
+							writer.Close();
+						}
+					}
+					return;
+				}
+				//start reading the xml config file
+				XmlElement rootNode = doc.DocumentElement;
+				//string suggestedVersion = Helper.AttributeValue(rootNode,"version","1.0");
+				Helper.CheckForOSVariables = Helper.ParseBoolean(rootNode,"checkOsVars",false);
+
+				foreach(XmlNode node in rootNode.ChildNodes)//solutions or if pre-proc instructions
+				{
+					IDataNode dataNode = ParseNode(node, null);
+					if(dataNode is ProcessNode)
+					{
+						ProcessNode proc = (ProcessNode)dataNode;
+						if(proc.IsValid)
+						{
+							ProcessFile(proc.Path);
+						}
+					}
+					else if(dataNode is SolutionNode)
+					{
+						m_Solutions.Add(dataNode);
+					}
+				}
+			}
+			catch(XmlSchemaException xse)
+			{
+				m_Log.Write("XML validation error at line {0} in {1}:\n\n{2}",
+					xse.LineNumber, path, xse.Message);
+			}
+			finally
+			{
+				m_CurrentWorkingDirectory.Pop();
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Allows the project.
+		/// </summary>
+		/// <param name="projectGroupsFlags">The project groups flags.</param>
+		/// <returns></returns>
+		public bool AllowProject(string projectGroupsFlags) 
+		{
+			if(m_ProjectGroups != null && m_ProjectGroups.Length > 0) 
+			{
+				if(projectGroupsFlags != null && projectGroupsFlags.Length == 0) 
+				{
+					foreach(string group in projectGroupsFlags.Split('|')) 
+					{
+						if(Array.IndexOf(m_ProjectGroups, group) != -1) //if included in the filter list
+						{
+							return true;
+						}
+					}
+				}
+				return false;//not included in the list or no groups specified for the project
+			}
+			return true;//no filter specified in the command line args
+		}
+
+		/// <summary>
+		/// Gets the type of the node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		/// <returns></returns>
+		public Type GetNodeType(XmlNode node)
+		{
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+			if(!m_Nodes.ContainsKey(node.Name))
+			{
+				return null;
+			}
+
+			NodeEntry ne = (NodeEntry)m_Nodes[node.Name];
+			return ne.Type;
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="node"></param>
+		/// <param name="parent"></param>
+		/// <returns></returns>
+		public IDataNode ParseNode(XmlNode node, IDataNode parent)
+		{
+			return ParseNode(node, parent, null);
+		}
+
+		//Create an instance of the data node type that is mapped to the name of the xml DOM node
+		/// <summary>
+		/// Parses the node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		/// <param name="parent">The parent.</param>
+		/// <param name="preNode">The pre node.</param>
+		/// <returns></returns>
+		public IDataNode ParseNode(XmlNode node, IDataNode parent, IDataNode preNode)
+		{
+			IDataNode dataNode = null;
+
+			try
+			{
+				if( node == null )
+				{
+					throw new ArgumentNullException("node");
+				}
+				if(preNode == null)
+				{
+					if(!m_Nodes.ContainsKey(node.Name))
+					{
+						//throw new XmlException("Unknown XML node: " + node.Name);
+						return null;
+					}
+
+					NodeEntry ne = (NodeEntry)m_Nodes[node.Name];
+					Type type = ne.Type;
+					//DataNodeAttribute dna = ne.Attribute;
+
+					dataNode = (IDataNode)type.Assembly.CreateInstance(type.FullName);
+					if(dataNode == null)
+					{
+						throw new System.Reflection.TargetException("Could not create new parser instance: " + type.FullName);
+					}
+				}
+				else
+					dataNode = preNode;
+
+				dataNode.Parent = parent;
+				dataNode.Parse(node);
+			}
+			catch(WarningException wex)
+			{
+				m_Log.Write(LogType.Warning, wex.Message);
+				return null;
+			}
+			catch(FatalException fex)
+			{
+				m_Log.WriteException(LogType.Error, fex);
+				throw;
+			}
+			catch(Exception ex)
+			{
+				m_Log.WriteException(LogType.Error, ex);
+				throw;
+			}
+
+			return dataNode;
+		}
+
+		/// <summary>
+		/// Initializes the specified target.
+		/// </summary>
+		/// <param name="target">The target.</param>
+		/// <param name="args">The args.</param>
+		public void Initialize(LogTargets target, string[] args)
+		{
+			m_Targets = new Hashtable();
+			CacheTargets(this.GetType().Assembly);
+			m_Nodes = new Hashtable();
+			CacheNodeTypes(this.GetType().Assembly);
+			CacheVersion();
+
+			m_CommandLine = new CommandLineCollection(args);
+            
+			string logFile = null;
+			if(m_CommandLine.WasPassed("log")) 
+			{
+				logFile = m_CommandLine["log"];
+
+				if(logFile != null && logFile.Length == 0)
+				{
+					logFile = "Prebuild.log";
+				}
+			}
+			else 
+			{
+				target = target & ~LogTargets.File;	//dont output to a file
+			}
+            
+			m_Log = new Log(target, logFile);
+			LogBanner();
+
+			m_CurrentWorkingDirectory = new CurrentDirectory();
+
+			m_Target = m_CommandLine["target"];
+			m_Clean = m_CommandLine["clean"];
+			string removeDirs = m_CommandLine["removedir"];
+			if(removeDirs != null && removeDirs.Length == 0) 
+			{
+				m_RemoveDirectories = removeDirs.Split('|');
+			}
+
+			string flags = m_CommandLine["allowedgroups"];//allows filtering by specifying a pipe-delimited list of groups to include
+			if(flags != null && flags.Length == 0)
+			{
+				m_ProjectGroups = flags.Split('|');
+			}
+			m_PauseAfterFinish = m_CommandLine.WasPassed("pause");
+
+			LoadSchema();
+
+			m_Solutions = new ArrayList();
+			m_Refs = new StringCollection();
+		}
+
+		/// <summary>
+		/// Processes this instance.
+		/// </summary>
+		public void Process()
+		{
+			bool perfomedOtherTask = false;
+			if(m_RemoveDirectories != null && m_RemoveDirectories.Length > 0) 
+			{
+				try
+				{
+					RemoveDirectories(".",m_RemoveDirectories);
+				} 
+				catch(IOException e) 
+				{
+					m_Log.Write("Failed to remove directories named {0}",m_RemoveDirectories);
+					m_Log.WriteException(LogType.Error,e);
+				}
+				catch(UnauthorizedAccessException e) 
+				{
+					m_Log.Write("Failed to remove directories named {0}",m_RemoveDirectories);
+					m_Log.WriteException(LogType.Error,e);
+				}
+				perfomedOtherTask = true;
+			}
+
+			if(m_Target != null && m_Clean != null)
+			{
+				m_Log.Write(LogType.Error, "The options /target and /clean cannot be passed together");
+				return;
+			}
+			else if(m_Target == null && m_Clean == null)
+			{
+				if(perfomedOtherTask) //finished
+				{
+					return;
+				}
+				m_Log.Write(LogType.Error, "Must pass either /target or /clean to process a Prebuild file");
+				return;
+			}
+
+			string file = "./prebuild.xml";
+			if(m_CommandLine.WasPassed("file"))
+			{
+				file = m_CommandLine["file"];
+			}
+
+			ProcessFile(file);
+
+			string target = (m_Target != null ? m_Target.ToLower() : m_Clean.ToLower());
+			bool clean = (m_Target == null);
+			if(clean && target != null && target.Length == 0)
+			{
+				target = "all";
+			}
+			if(clean && target == "all")//default to all if no target was specified for clean
+			{
+                //check if they passed yes
+                if (!m_CommandLine.WasPassed("yes"))
+                {
+				    Console.WriteLine("WARNING: This operation will clean ALL project files for all targets, are you sure? (y/n):");
+				    string ret = Console.ReadLine();
+				    if(ret == null)
+				    {
+					    return;
+				    }
+				    ret = ret.Trim().ToLower();
+				    if((ret.ToLower() != "y" && ret.ToLower() != "yes"))
+				    {
+					    return;
+                    }
+                }
+				//clean all targets (just cleaning vs2002 target didn't clean nant)
+				foreach(ITarget targ in m_Targets.Values)
+				{
+					targ.Clean(this);
+				}
+			}
+			else
+			{
+                ITarget targ = (ITarget)m_Targets[target];
+
+                if(clean)
+                {
+                    targ.Clean(this);
+                }
+                else
+                {
+                    targ.Write(this);
+                }
+            }
+
+			m_Log.Flush();
+		}
+
+		#endregion        
+
+		#region IDisposable Members
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
+		/// <summary>
+		/// Dispose objects
+		/// </summary>
+		/// <param name="disposing">
+		/// If true, it will dispose close the handle
+		/// </param>
+		/// <remarks>
+		/// Will dispose managed and unmanaged resources.
+		/// </remarks>
+		protected virtual void Dispose(bool disposing)
+		{
+			if (!this.disposed)
+			{
+				if (disposing)
+				{
+					if (this.m_Log != null)
+					{
+						this.m_Log.Close();
+						this.m_Log = null;
+					}
+				}
+			}
+			this.disposed = true;
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		~Kernel()
+		{
+			this.Dispose(false);
+		}
+		
+		/// <summary>
+		/// Closes and destroys this object
+		/// </summary>
+		/// <remarks>
+		/// Same as Dispose(true)
+		/// </remarks>
+		public void Close() 
+		{
+			Dispose();
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Prebuild/src/Core/Nodes/ConfigurationNode.cs b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
new file mode 100644
index 0000000..390794f
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
@@ -0,0 +1,187 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("Configuration")]
+	public class ConfigurationNode : DataNode, ICloneable, IComparable
+	{
+		#region Fields
+
+		private string m_Name = "unknown";
+		private OptionsNode m_Options;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ConfigurationNode"/> class.
+		/// </summary>
+		public ConfigurationNode()
+		{
+			m_Options = new OptionsNode();
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets the parent.
+		/// </summary>
+		/// <value>The parent.</value>
+		public override IDataNode Parent
+		{
+			get
+			{
+				return base.Parent;
+			}
+			set
+			{
+				base.Parent = value;
+				if(base.Parent is SolutionNode)
+				{
+					SolutionNode node = (SolutionNode)base.Parent;
+					if(node != null && node.Options != null)
+					{
+						node.Options.CopyTo(m_Options);
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return m_Name;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the options.
+		/// </summary>
+		/// <value>The options.</value>
+		public OptionsNode Options
+		{
+			get
+			{
+				return m_Options;
+			}
+			set
+			{
+				m_Options = value;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public override void Parse(XmlNode node)
+		{
+			m_Name = Helper.AttributeValue(node, "name", m_Name);
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+			foreach(XmlNode child in node.ChildNodes)
+			{
+				IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+				if(dataNode is OptionsNode)
+				{
+					((OptionsNode)dataNode).CopyTo(m_Options);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Copies to.
+		/// </summary>
+		/// <param name="conf">The conf.</param>
+		public void CopyTo(ConfigurationNode conf)
+		{
+			m_Options.CopyTo(conf.m_Options);
+		}
+
+		#endregion
+
+		#region ICloneable Members
+
+		/// <summary>
+		/// Creates a new object that is a copy of the current instance.
+		/// </summary>
+		/// <returns>
+		/// A new object that is a copy of this instance.
+		/// </returns>
+		public object Clone()
+		{
+			ConfigurationNode ret = new ConfigurationNode();
+			ret.m_Name = m_Name;
+			m_Options.CopyTo(ret.m_Options);
+			return ret;
+		}
+
+		#endregion
+
+        #region IComparable Members
+
+        public int CompareTo(object obj)
+        {
+            ConfigurationNode that = (ConfigurationNode) obj;
+            return this.m_Name.CompareTo(that.m_Name);
+        }
+
+        #endregion
+    }
+}
diff --git a/Prebuild/src/Core/Nodes/DataNode.cs b/Prebuild/src/Core/Nodes/DataNode.cs
new file mode 100644
index 0000000..ef5f7ee
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/DataNode.cs
@@ -0,0 +1,82 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class DataNode : IDataNode
+	{
+		#region Fields
+
+		private IDataNode parent;
+
+		#endregion
+
+		#region IDataNode Members
+
+		/// <summary>
+		/// Gets or sets the parent.
+		/// </summary>
+		/// <value>The parent.</value>
+		public virtual IDataNode Parent
+		{
+			get
+			{
+				return parent;
+			}
+			set
+			{
+				parent = value;
+			}
+		}
+
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public virtual void Parse(XmlNode node)
+		{
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Nodes/ExcludeNode.cs b/Prebuild/src/Core/Nodes/ExcludeNode.cs
new file mode 100644
index 0000000..bfcebca
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/ExcludeNode.cs
@@ -0,0 +1,85 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-31 16:35:39 +0100 (ti, 31 jan 2006) $
+ * $Revision: 74 $
+ */
+#endregion
+
+using System;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("Exclude")]
+	public class ExcludeNode : DataNode
+	{
+		#region Fields
+
+		private string m_Name = "unknown";
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return m_Name;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public override void Parse(XmlNode node)
+		{
+			m_Name = Helper.AttributeValue(node, "name", m_Name);
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Nodes/FileNode.cs b/Prebuild/src/Core/Nodes/FileNode.cs
new file mode 100644
index 0000000..de3b69e
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/FileNode.cs
@@ -0,0 +1,238 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2007-01-08 17:55:40 +0100 (må, 08 jan 2007) $
+ * $Revision: 197 $
+ */
+#endregion
+
+using System;
+using System.IO;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum BuildAction
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		None,
+		/// <summary>
+		/// 
+		/// </summary>
+		Compile,
+		/// <summary>
+		/// 
+		/// </summary>
+		Content,
+		/// <summary>
+		/// 
+		/// </summary>
+		EmbeddedResource
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum SubType
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		Code,
+		/// <summary>
+		/// 
+		/// </summary>
+		Component,
+        /// <summary>
+        /// 
+        /// </summary>
+        Designer,
+		/// <summary>
+		/// 
+		/// </summary>
+		Form,
+		/// <summary>
+		/// 
+		/// </summary>
+		Settings,
+		/// <summary>
+		/// 
+		/// </summary>
+		UserControl
+	}
+
+	public enum CopyToOutput
+	{
+		Never,
+		Always,
+		PreserveNewest
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("File")]
+	public class FileNode : DataNode
+	{
+		#region Fields
+
+		private string m_Path;
+		private string m_ResourceName = "";
+		private BuildAction m_BuildAction = BuildAction.Compile;
+		private bool m_Valid;
+		private SubType m_SubType = SubType.Code;
+		private CopyToOutput m_CopyToOutput = CopyToOutput.Never;
+		private bool m_Link = false;
+
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string Path
+		{
+			get
+			{
+				return m_Path;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string ResourceName
+		{
+			get
+			{
+				return m_ResourceName;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public BuildAction BuildAction
+		{
+			get
+			{
+				return m_BuildAction;
+			}
+		}
+
+		public CopyToOutput CopyToOutput
+		{
+			get
+			{
+				return this.m_CopyToOutput;
+			}
+		}
+
+		public bool IsLink
+		{
+			get
+			{
+				return this.m_Link;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public SubType SubType
+		{
+			get
+			{
+				return m_SubType;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool IsValid
+		{
+			get
+			{
+				return m_Valid;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="node"></param>
+		public override void Parse(XmlNode node)
+		{
+			m_BuildAction = (BuildAction)Enum.Parse(typeof(BuildAction), 
+				Helper.AttributeValue(node, "buildAction", m_BuildAction.ToString()));
+			m_SubType = (SubType)Enum.Parse(typeof(SubType), 
+				Helper.AttributeValue(node, "subType", m_SubType.ToString()));
+			m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName.ToString());
+			this.m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
+			this.m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", this.m_CopyToOutput.ToString()));
+
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+
+			m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+			if(m_Path == null)
+			{
+				m_Path = "";
+			}
+
+			m_Path = m_Path.Trim();
+			m_Valid = true;
+			if(!File.Exists(m_Path))
+			{
+				m_Valid = false;
+				Kernel.Instance.Log.Write(LogType.Warning, "File does not exist: {0}", m_Path);
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs
new file mode 100644
index 0000000..d31307b
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/FilesNode.cs
@@ -0,0 +1,223 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-09-20 09:42:51 +0200 (on, 20 sep 2006) $
+ * $Revision: 164 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("Files")]
+	public class FilesNode : DataNode
+	{
+		#region Fields
+
+		private StringCollection m_Files;
+		private Hashtable m_BuildActions;
+		private Hashtable m_SubTypes;
+		private Hashtable m_ResourceNames;
+		private Hashtable m_CopyToOutputs;
+		private Hashtable m_Links;
+
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public FilesNode()
+		{
+			m_Files = new StringCollection();
+			m_BuildActions = new Hashtable();
+			m_SubTypes = new Hashtable();
+			m_ResourceNames = new Hashtable();
+			m_CopyToOutputs = new Hashtable();
+			m_Links = new Hashtable();
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public int Count
+		{
+			get
+			{
+				return m_Files.Count;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="file"></param>
+		/// <returns></returns>
+		public BuildAction GetBuildAction(string file)
+		{
+			if(!m_BuildActions.ContainsKey(file))
+			{
+				return BuildAction.Compile;
+			}
+
+			return (BuildAction)m_BuildActions[file];
+		}
+
+		public CopyToOutput GetCopyToOutput(string file)
+		{
+			if (!this.m_CopyToOutputs.ContainsKey(file))
+			{
+				return CopyToOutput.Never;
+			}
+			return (CopyToOutput) this.m_CopyToOutputs[file];
+		}
+
+		public bool GetIsLink(string file)
+		{
+			if (!this.m_Links.ContainsKey(file))
+			{
+				return false;
+			}
+			return (bool) this.m_Links[file];
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="file"></param>
+		/// <returns></returns>
+		public SubType GetSubType(string file)
+		{
+			if(!m_SubTypes.ContainsKey(file))
+			{
+				return SubType.Code;
+			}
+
+			return (SubType)m_SubTypes[file];
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="file"></param>
+		/// <returns></returns>
+		public string GetResourceName(string file)
+		{
+			if(!m_ResourceNames.ContainsKey(file))
+			{
+				return "";
+			}
+
+			return (string)m_ResourceNames[file];
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="node"></param>
+		public override void Parse(XmlNode node)
+		{
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+			foreach(XmlNode child in node.ChildNodes)
+			{
+				IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+				if(dataNode is FileNode)
+				{
+					FileNode fileNode = (FileNode)dataNode;
+					if(fileNode.IsValid)
+					{
+						if (!m_Files.Contains(fileNode.Path))
+						{
+							m_Files.Add(fileNode.Path);
+							m_BuildActions[fileNode.Path] = fileNode.BuildAction;
+							m_SubTypes[fileNode.Path] = fileNode.SubType;
+							m_ResourceNames[fileNode.Path] = fileNode.ResourceName;
+							this.m_Links[fileNode.Path] = fileNode.IsLink;
+							this.m_CopyToOutputs[fileNode.Path] = fileNode.CopyToOutput;
+
+						}
+					}
+				}
+				else if(dataNode is MatchNode)
+				{
+					foreach(string file in ((MatchNode)dataNode).Files)
+					{
+						if (!m_Files.Contains(file))
+						{
+							m_Files.Add(file);
+							m_BuildActions[file] = ((MatchNode)dataNode).BuildAction;
+							m_SubTypes[file] = ((MatchNode)dataNode).SubType;
+							m_ResourceNames[file] = ((MatchNode)dataNode).ResourceName;
+							this.m_Links[file] = ((MatchNode) dataNode).IsLink;
+							this.m_CopyToOutputs[file] = ((MatchNode) dataNode).CopyToOutput;
+
+						}
+					}
+				}
+			}
+		}
+
+		// TODO: Check in to why StringCollection's enumerator doesn't implement
+		// IEnumerator?
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <returns></returns>
+		public StringEnumerator GetEnumerator()
+		{
+			return m_Files.GetEnumerator();
+		}
+
+		#endregion
+
+    }
+}
diff --git a/Prebuild/src/Core/Nodes/MatchNode.cs b/Prebuild/src/Core/Nodes/MatchNode.cs
new file mode 100644
index 0000000..e0d2fa8
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/MatchNode.cs
@@ -0,0 +1,299 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-09-20 09:42:51 +0200 (on, 20 sep 2006) $
+ * $Revision: 164 $
+ */
+#endregion
+
+using System;
+using System.Collections.Specialized;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("Match")]
+	public class MatchNode : DataNode
+	{
+		#region Fields
+
+		private StringCollection m_Files;
+		private Regex m_Regex;
+		private BuildAction m_BuildAction = BuildAction.Compile;
+		private SubType m_SubType = SubType.Code;
+		string m_ResourceName = "";
+		private CopyToOutput m_CopyToOutput;
+		private bool m_Link;
+
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public MatchNode()
+		{
+			m_Files = new StringCollection();
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public StringCollection Files
+		{
+			get
+			{
+				return m_Files;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public BuildAction BuildAction
+		{
+			get
+			{
+				return m_BuildAction;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public SubType SubType
+		{
+			get
+			{
+				return m_SubType;
+			}
+		}
+
+		public CopyToOutput CopyToOutput
+		{
+			get
+			{
+				return this.m_CopyToOutput;
+			}
+		}
+
+		public bool IsLink
+		{
+			get
+			{
+				return this.m_Link;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string ResourceName
+		{
+			get
+			{
+				return m_ResourceName;
+			}
+		}
+
+
+		#endregion
+
+		#region Private Methods
+
+		/// <summary>
+		/// Recurses the directories.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		/// <param name="pattern">The pattern.</param>
+		/// <param name="recurse">if set to <c>true</c> [recurse].</param>
+		/// <param name="useRegex">if set to <c>true</c> [use regex].</param>
+		private void RecurseDirectories(string path, string pattern, bool recurse, bool useRegex)
+		{
+			try
+			{
+				string[] files;
+
+				if(!useRegex)
+				{
+					files = Directory.GetFiles(path, pattern);
+					if(files != null)
+					{
+						string fileTemp;
+						foreach (string file in files)
+						{
+							if (file.Substring(0,2) == "./" || file.Substring(0,2) == ".\\")
+							{
+								fileTemp = file.Substring(2);
+							}
+							else
+							{
+								fileTemp = file;
+							}
+							
+							m_Files.Add(fileTemp);
+						}
+					}
+					else
+					{
+						return;
+					}
+				}
+				else
+				{
+					Match match;
+					files = Directory.GetFiles(path);
+					foreach(string file in files)
+					{
+						match = m_Regex.Match(file);
+						if(match.Success)
+						{
+							m_Files.Add(file);
+						}
+					}
+				}
+                
+				if(recurse)
+				{
+					string[] dirs = Directory.GetDirectories(path);
+					if(dirs != null && dirs.Length > 0)
+					{
+						foreach(string str in dirs)
+						{
+							RecurseDirectories(Helper.NormalizePath(str), pattern, recurse, useRegex);
+						}
+					}
+				}
+			}
+			catch(DirectoryNotFoundException)
+			{
+				return;
+			}
+			catch(ArgumentException)
+			{
+				return;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="node"></param>
+		public override void Parse(XmlNode node)
+		{
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+			string path = Helper.AttributeValue(node, "path", ".");
+			string pattern = Helper.AttributeValue(node, "pattern", "*");
+			bool recurse = (bool)Helper.TranslateValue(typeof(bool), Helper.AttributeValue(node, "recurse", "false"));
+			bool useRegex = (bool)Helper.TranslateValue(typeof(bool), Helper.AttributeValue(node, "useRegex", "false"));
+			m_BuildAction = (BuildAction)Enum.Parse(typeof(BuildAction), 
+				Helper.AttributeValue(node, "buildAction", m_BuildAction.ToString()));
+			m_SubType = (SubType)Enum.Parse(typeof(SubType), 
+				Helper.AttributeValue(node, "subType", m_SubType.ToString()));
+			m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName.ToString());
+			this.m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", this.m_CopyToOutput.ToString()));
+			this.m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
+
+
+			if(path != null && path.Length == 0)
+			{
+				path = ".";//use current directory
+			}
+			//throw new WarningException("Match must have a 'path' attribute");
+
+			if(pattern == null)
+			{
+				throw new WarningException("Match must have a 'pattern' attribute");
+			}
+
+			path = Helper.NormalizePath(path);
+			if(!Directory.Exists(path))
+			{
+				throw new WarningException("Match path does not exist: {0}", path);
+			}
+
+			try
+			{
+				if(useRegex)
+				{
+					m_Regex = new Regex(pattern);
+				}
+			}
+			catch(ArgumentException ex)
+			{
+				throw new WarningException("Could not compile regex pattern: {0}", ex.Message);
+			}
+
+			RecurseDirectories(path, pattern, recurse, useRegex);
+
+			foreach(XmlNode child in node.ChildNodes)
+			{
+				IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+				if(dataNode is ExcludeNode)
+				{
+					ExcludeNode excludeNode = (ExcludeNode)dataNode;
+					if (m_Files.Contains(Helper.NormalizePath(excludeNode.Name)))
+					{
+						m_Files.Remove(Helper.NormalizePath(excludeNode.Name));
+					}
+				}
+			}
+
+			if(m_Files.Count < 1)
+			{
+				throw new WarningException("Match returned no files: {0}{1}", Helper.EndPath(path), pattern);
+			}
+			m_Regex = null;
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Nodes/OptionsNode.cs b/Prebuild/src/Core/Nodes/OptionsNode.cs
new file mode 100644
index 0000000..b5a2f60
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/OptionsNode.cs
@@ -0,0 +1,655 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2007-01-08 17:55:40 +0100 (må, 08 jan 2007) $
+ * $Revision: 197 $
+ */
+#endregion
+
+
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("Options")]
+	public class OptionsNode : DataNode
+	{
+		#region Fields
+
+		private static Hashtable m_OptionFields;
+
+		[OptionNode("CompilerDefines")]
+		private string m_CompilerDefines = "";
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string CompilerDefines
+		{
+			get
+			{
+				return m_CompilerDefines;
+			}
+			set
+			{
+				m_CompilerDefines = value;
+			}
+		}
+        
+		[OptionNode("OptimizeCode")]
+		private bool m_OptimizeCode;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool OptimizeCode
+		{
+			get
+			{
+				return m_OptimizeCode;
+			}
+			set
+			{
+				m_OptimizeCode = value;
+			}
+		}
+        
+		[OptionNode("CheckUnderflowOverflow")]
+		private bool m_CheckUnderflowOverflow;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool CheckUnderflowOverflow
+		{
+			get
+			{
+				return m_CheckUnderflowOverflow;
+			}
+			set
+			{
+				m_CheckUnderflowOverflow = value;
+			}
+		}
+        
+		[OptionNode("AllowUnsafe")]
+		private bool m_AllowUnsafe;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool AllowUnsafe
+		{
+			get
+			{
+				return m_AllowUnsafe;
+			}
+			set
+			{
+				m_AllowUnsafe = value;
+			}
+		}
+		
+		[OptionNode("PreBuildEvent")]
+		private string m_PreBuildEvent;
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		public string PreBuildEvent 
+		{
+			get 
+			{
+				return m_PreBuildEvent;
+			}
+			set 
+			{
+				m_PreBuildEvent = value;
+			}
+		}
+		
+		[OptionNode("PostBuildEvent")]
+		private string m_PostBuildEvent;
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		public string PostBuildEvent 
+		{
+			get 
+			{
+				return m_PostBuildEvent;
+			}
+			set 
+			{
+				m_PostBuildEvent = value;
+			}
+		}
+			
+		[OptionNode("PreBuildEventArgs")]
+		private string m_PreBuildEventArgs;
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		public string PreBuildEventArgs
+		{
+			get 
+			{
+				return m_PreBuildEventArgs;
+			}
+			set 
+			{
+				m_PreBuildEventArgs = value;
+			}
+		}
+		
+		[OptionNode("PostBuildEventArgs")]
+		private string m_PostBuildEventArgs;
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		public string PostBuildEventArgs
+		{
+			get 
+			{
+				return m_PostBuildEventArgs;
+			}
+			set 
+			{
+				m_PostBuildEventArgs = value;
+			}
+		}
+		
+		[OptionNode("RunPostBuildEvent")]
+		private string m_RunPostBuildEvent;
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		public string RunPostBuildEvent 
+		{
+			get 
+			{
+				return m_RunPostBuildEvent;
+			}
+			set 
+			{
+				m_RunPostBuildEvent = value;
+			}
+		}
+		
+		[OptionNode("RunScript")]
+		private string m_RunScript;
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		public string RunScript 
+		{
+			get 
+			{
+				return m_RunScript;
+			}
+			set 
+			{
+				m_RunScript = value;
+			}
+		}
+        
+		[OptionNode("WarningLevel")]
+		private int m_WarningLevel = 4;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public int WarningLevel
+		{
+			get
+			{
+				return m_WarningLevel;
+			}
+			set
+			{
+				m_WarningLevel = value;
+			}
+		}
+        
+		[OptionNode("WarningsAsErrors")]
+		private bool m_WarningsAsErrors;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool WarningsAsErrors
+		{
+			get
+			{
+				return m_WarningsAsErrors;
+			}
+			set
+			{
+				m_WarningsAsErrors = value;
+			}
+		}
+
+		[OptionNode("SuppressWarnings")]
+		private string m_SuppressWarnings = "";
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string SuppressWarnings
+		{
+			get
+			{
+				return m_SuppressWarnings;
+			}
+			set
+			{
+				m_SuppressWarnings = value;
+			}
+		}
+        
+		[OptionNode("OutputPath")]
+		private string m_OutputPath = "bin/";
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string OutputPath
+		{
+			get
+			{
+				return m_OutputPath;
+			}
+			set
+			{
+				m_OutputPath = value;
+			}
+		}
+
+        [OptionNode("GenerateDocumentation")]
+        private bool m_GenerateDocumentation;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool GenerateDocumentation
+        {
+            get
+            {
+                return m_GenerateDocumentation;
+            }
+            set
+            {
+                m_GenerateDocumentation = value;
+            }
+        }
+
+		[OptionNode("GenerateXmlDocFile")]
+		private bool m_GenerateXmlDocFile;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool GenerateXmlDocFile
+		{
+			get
+			{
+				return m_GenerateXmlDocFile;
+			}
+			set
+			{
+				m_GenerateXmlDocFile = value;
+			}
+		}
+        
+		[OptionNode("XmlDocFile")]
+		private string m_XmlDocFile = "";
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string XmlDocFile
+		{
+			get
+			{
+				return m_XmlDocFile;
+			}
+			set
+			{
+				m_XmlDocFile = value;
+			}
+		}
+
+		[OptionNode("KeyFile")]
+		private string m_KeyFile = "";
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string KeyFile
+		{
+			get
+			{
+				return m_KeyFile;
+			}
+			set
+			{
+				m_KeyFile = value;
+			}
+		}
+        
+		[OptionNode("DebugInformation")]
+		private bool m_DebugInformation;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool DebugInformation
+		{
+			get
+			{
+				return m_DebugInformation;
+			}
+			set
+			{
+				m_DebugInformation = value;
+			}
+		}
+        
+		[OptionNode("RegisterComInterop")]
+		private bool m_RegisterComInterop;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool RegisterComInterop
+		{
+			get
+			{
+				return m_RegisterComInterop;
+			}
+			set
+			{
+				m_RegisterComInterop = value;
+			}
+		}
+
+		[OptionNode("RemoveIntegerChecks")]
+		private bool m_RemoveIntegerChecks;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool RemoveIntegerChecks
+		{
+			get
+			{
+				return m_RemoveIntegerChecks;
+			}
+			set
+			{
+				m_RemoveIntegerChecks = value;
+			}
+		}
+        
+		[OptionNode("IncrementalBuild")]
+		private bool m_IncrementalBuild;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool IncrementalBuild
+		{
+			get
+			{
+				return m_IncrementalBuild;
+			}
+			set
+			{
+				m_IncrementalBuild = value;
+			}
+		}
+        
+		[OptionNode("BaseAddress")]
+		private string m_BaseAddress = "285212672";
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string BaseAddress
+		{
+			get
+			{
+				return m_BaseAddress;
+			}
+			set
+			{
+				m_BaseAddress = value;
+			}
+		}
+        
+		[OptionNode("FileAlignment")]
+		private int m_FileAlignment = 4096;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public int FileAlignment
+		{
+			get
+			{
+				return m_FileAlignment;
+			}
+			set
+			{
+				m_FileAlignment = value;
+			}
+		}
+        
+		[OptionNode("NoStdLib")]
+		private bool m_NoStdLib;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool NoStdLib
+		{
+			get
+			{
+				return m_NoStdLib;
+			}
+			set
+			{
+				m_NoStdLib = value;
+			}
+		}
+
+		private StringCollection m_FieldsDefined;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes the <see cref="OptionsNode"/> class.
+		/// </summary>
+		static OptionsNode()
+		{
+			Type t = typeof(OptionsNode);
+            
+			m_OptionFields = new Hashtable();
+			foreach(FieldInfo f in t.GetFields(BindingFlags.NonPublic | BindingFlags.Instance))
+			{
+				object[] attrs = f.GetCustomAttributes(typeof(OptionNodeAttribute), false);
+				if(attrs == null || attrs.Length < 1)
+				{
+					continue;
+				}
+
+				OptionNodeAttribute ona = (OptionNodeAttribute)attrs[0];
+				m_OptionFields[ona.NodeName] = f;
+			}
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="OptionsNode"/> class.
+		/// </summary>
+		public OptionsNode()
+		{
+			m_FieldsDefined = new StringCollection();
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the <see cref="Object"/> at the specified index.
+		/// </summary>
+		/// <value></value>
+		public object this[string index]
+		{
+			get
+			{
+				if(!m_OptionFields.ContainsKey(index))
+				{
+					return null;
+				}
+
+				FieldInfo f = (FieldInfo)m_OptionFields[index];
+				return f.GetValue(this);
+			}
+		}
+		
+		/// <summary>
+		/// Gets the <see cref="Object"/> at the specified index.
+		/// </summary>
+		/// <value></value>
+		public object this[string index, object defaultValue]
+		{
+			get
+			{
+				object valueObject = this[index];
+				if(valueObject !=  null && valueObject is string && ((string)valueObject).Length == 0) 
+				{
+					return defaultValue;
+				}
+				return valueObject;
+			}
+		}
+
+
+		#endregion
+
+		#region Private Methods
+
+		private void FlagDefined(string name)
+		{
+			if(!m_FieldsDefined.Contains(name))
+			{
+				m_FieldsDefined.Add(name);
+			}
+		}
+
+		private void SetOption(string nodeName, string val)
+		{
+			lock(m_OptionFields)
+			{
+				if(!m_OptionFields.ContainsKey(nodeName))
+				{
+					return;
+				}
+
+				FieldInfo f = (FieldInfo)m_OptionFields[nodeName];
+				f.SetValue(this, Helper.TranslateValue(f.FieldType, val));
+				FlagDefined(f.Name);
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public override void Parse(XmlNode node)
+		{
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+
+			foreach(XmlNode child in node.ChildNodes)
+			{
+				SetOption(child.Name, Helper.InterpolateForEnvironmentVariables(child.InnerText));
+			}
+		}
+
+		/// <summary>
+		/// Copies to.
+		/// </summary>
+		/// <param name="opt">The opt.</param>
+		public void CopyTo(OptionsNode opt)
+		{
+			if(opt == null)
+			{
+				return;
+			}
+
+			foreach(FieldInfo f in m_OptionFields.Values)
+			{
+				if(m_FieldsDefined.Contains(f.Name))
+				{
+					f.SetValue(opt, f.GetValue(this));
+					opt.m_FieldsDefined.Add(f.Name);
+				}
+			}
+		}
+
+		#endregion        
+	}
+}
diff --git a/Prebuild/src/Core/Nodes/ProcessNode.cs b/Prebuild/src/Core/Nodes/ProcessNode.cs
new file mode 100644
index 0000000..f546a4b
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/ProcessNode.cs
@@ -0,0 +1,119 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("Process")]
+	public class ProcessNode : DataNode
+	{
+		#region Fields
+
+		private string m_Path;
+		private bool m_IsValid = true;
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the path.
+		/// </summary>
+		/// <value>The path.</value>
+		public string Path
+		{
+			get
+			{
+				return m_Path;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether this instance is valid.
+		/// </summary>
+		/// <value><c>true</c> if this instance is valid; otherwise, <c>false</c>.</value>
+		public bool IsValid
+		{
+			get
+			{
+				return m_IsValid;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public override void Parse(XmlNode node)
+		{
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+
+			m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+			if(m_Path == null)
+			{
+				m_Path = "";
+			}
+
+			try
+			{
+				m_Path = Helper.ResolvePath(m_Path);
+			}
+			catch(ArgumentException)
+			{
+				Kernel.Instance.Log.Write(LogType.Warning, "Could not find prebuild file for processing: {0}", m_Path);
+				m_IsValid = false;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
new file mode 100644
index 0000000..c56dacc
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -0,0 +1,510 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-11-11 05:43:20 +0100 (lö, 11 nov 2006) $
+ * $Revision: 192 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum ProjectType
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		Exe,
+		/// <summary>
+		/// 
+		/// </summary>
+		WinExe,
+		/// <summary>
+		/// 
+		/// </summary>
+		Library
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum ClrRuntime
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		Microsoft,
+		/// <summary>
+		/// 
+		/// </summary>
+		Mono
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("Project")]
+	public class ProjectNode : DataNode, IComparable
+	{
+		#region Fields
+
+		private string m_Name = "unknown";
+		private string m_Path = "";
+		private string m_FullPath = "";
+		private string m_AssemblyName;
+		private string m_AppIcon = "";
+		private string m_DesignerFolder = "";
+		private string m_Language = "C#";
+		private ProjectType m_Type = ProjectType.Exe;
+		private ClrRuntime m_Runtime = ClrRuntime.Microsoft;
+		private string m_StartupObject = "";
+		private string m_RootNamespace;
+		private string m_FilterGroups = "";
+		private Guid m_Guid;
+
+		private Hashtable m_Configurations;
+		private ArrayList m_ReferencePaths;
+		private ArrayList m_References;
+		private FilesNode m_Files;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ProjectNode"/> class.
+		/// </summary>
+		public ProjectNode()
+		{
+			m_Configurations = new Hashtable();
+			m_ReferencePaths = new ArrayList();
+			m_References = new ArrayList();
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return m_Name;
+			}
+		}
+
+		/// <summary>
+		/// Gets the path.
+		/// </summary>
+		/// <value>The path.</value>
+		public string Path
+		{
+			get
+			{
+				return m_Path;
+			}
+		}
+
+		/// <summary>
+		/// Gets the filter groups.
+		/// </summary>
+		/// <value>The filter groups.</value>
+		public string FilterGroups 
+		{ 
+			get 
+			{ 
+				return m_FilterGroups; 
+			} 
+		}
+
+		/// <summary>
+		/// Gets the full path.
+		/// </summary>
+		/// <value>The full path.</value>
+		public string FullPath
+		{
+			get
+			{
+				return m_FullPath;
+			}
+		}
+
+		/// <summary>
+		/// Gets the name of the assembly.
+		/// </summary>
+		/// <value>The name of the assembly.</value>
+		public string AssemblyName
+		{
+			get
+			{
+				return m_AssemblyName;
+			}
+		}
+
+		/// <summary>
+		/// Gets the app icon.
+		/// </summary>
+		/// <value>The app icon.</value>
+		public string AppIcon 
+		{
+			get 
+			{
+				return m_AppIcon;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string DesignerFolder 
+		{
+			get 
+			{
+				return m_DesignerFolder;
+			}
+		}
+
+		/// <summary>
+		/// Gets the language.
+		/// </summary>
+		/// <value>The language.</value>
+		public string Language
+		{
+			get
+			{
+				return m_Language;
+			}
+		}
+
+		/// <summary>
+		/// Gets the type.
+		/// </summary>
+		/// <value>The type.</value>
+		public ProjectType Type
+		{
+			get
+			{
+				return m_Type;
+			}
+		}
+
+		/// <summary>
+		/// Gets the runtime.
+		/// </summary>
+		/// <value>The runtime.</value>
+		public ClrRuntime Runtime
+		{
+			get
+			{
+				return m_Runtime;
+			}
+		}
+
+        private bool m_GenerateAssemblyInfoFile = false;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool GenerateAssemblyInfoFile
+        {
+            get
+            {
+                return m_GenerateAssemblyInfoFile;
+            }
+            set
+            {
+                m_GenerateAssemblyInfoFile = value;
+            }
+        }
+
+		/// <summary>
+		/// Gets the startup object.
+		/// </summary>
+		/// <value>The startup object.</value>
+		public string StartupObject
+		{
+			get
+			{
+				return m_StartupObject;
+			}
+		}
+
+		/// <summary>
+		/// Gets the root namespace.
+		/// </summary>
+		/// <value>The root namespace.</value>
+		public string RootNamespace
+		{
+			get
+			{
+				return m_RootNamespace;
+			}
+		}
+
+		/// <summary>
+		/// Gets the configurations.
+		/// </summary>
+		/// <value>The configurations.</value>
+		public ICollection Configurations
+		{
+			get
+			{
+                ArrayList tmp = new ArrayList( ConfigurationsTable.Values);
+			    tmp.Sort();
+				return tmp;
+			}
+		}
+
+		/// <summary>
+		/// Gets the configurations table.
+		/// </summary>
+		/// <value>The configurations table.</value>
+		public Hashtable ConfigurationsTable
+		{
+			get
+			{
+				return m_Configurations;
+			}
+		}
+
+		/// <summary>
+		/// Gets the reference paths.
+		/// </summary>
+		/// <value>The reference paths.</value>
+		public ArrayList ReferencePaths
+		{
+			get
+			{
+                ArrayList tmp = new ArrayList(m_ReferencePaths);
+                tmp.Sort();
+                return tmp;
+            }
+		}
+
+		/// <summary>
+		/// Gets the references.
+		/// </summary>
+		/// <value>The references.</value>
+		public ArrayList References
+		{
+			get
+			{
+                ArrayList tmp = new ArrayList(m_References);
+                tmp.Sort();
+                return tmp;
+			}
+		}
+
+		/// <summary>
+		/// Gets the files.
+		/// </summary>
+		/// <value>The files.</value>
+		public FilesNode Files
+		{
+			get
+			{
+				return m_Files;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the parent.
+		/// </summary>
+		/// <value>The parent.</value>
+		public override IDataNode Parent
+		{
+			get
+			{
+				return base.Parent;
+			}
+			set
+			{
+				base.Parent = value;
+				if(base.Parent is SolutionNode && m_Configurations.Count < 1)
+				{
+					SolutionNode parent = (SolutionNode)base.Parent;
+					foreach(ConfigurationNode conf in parent.Configurations)
+					{
+						m_Configurations[conf.Name] = conf.Clone();
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the GUID.
+		/// </summary>
+		/// <value>The GUID.</value>
+		public Guid Guid
+		{
+			get
+			{
+				return m_Guid;
+			}
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		private void HandleConfiguration(ConfigurationNode conf)
+		{
+			if(String.Compare(conf.Name, "all", true) == 0) //apply changes to all, this may not always be applied first,
+				//so it *may* override changes to the same properties for configurations defines at the project level
+			{
+				foreach(ConfigurationNode confNode in this.m_Configurations.Values) 
+				{
+					conf.CopyTo(confNode);//update the config templates defines at the project level with the overrides
+				}
+			}
+			if(m_Configurations.ContainsKey(conf.Name))
+			{
+				ConfigurationNode parentConf = (ConfigurationNode)m_Configurations[conf.Name];
+				conf.CopyTo(parentConf);//update the config templates defines at the project level with the overrides
+			} 
+			else
+			{
+				m_Configurations[conf.Name] = conf;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public override void Parse(XmlNode node)
+		{
+			m_Name = Helper.AttributeValue(node, "name", m_Name);
+			m_Path = Helper.AttributeValue(node, "path", m_Path);
+			m_FilterGroups = Helper.AttributeValue(node, "filterGroups", m_FilterGroups);
+			m_AppIcon = Helper.AttributeValue(node, "icon", m_AppIcon);
+			m_DesignerFolder = Helper.AttributeValue(node, "designerFolder", m_DesignerFolder);
+			m_AssemblyName = Helper.AttributeValue(node, "assemblyName", m_AssemblyName);
+			m_Language = Helper.AttributeValue(node, "language", m_Language);
+			m_Type = (ProjectType)Helper.EnumAttributeValue(node, "type", typeof(ProjectType), m_Type);
+			m_Runtime = (ClrRuntime)Helper.EnumAttributeValue(node, "runtime", typeof(ClrRuntime), m_Runtime);
+			m_StartupObject = Helper.AttributeValue(node, "startupObject", m_StartupObject);
+			m_RootNamespace = Helper.AttributeValue(node, "rootNamespace", m_RootNamespace);
+		    
+            int hash = m_Name.GetHashCode();
+
+		    m_Guid = new Guid( hash, 0, 0, 0, 0, 0, 0,0,0,0,0 );
+		    
+            m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false);
+            
+			if(m_AssemblyName == null || m_AssemblyName.Length < 1)
+			{
+				m_AssemblyName = m_Name;
+			}
+
+			if(m_RootNamespace == null || m_RootNamespace.Length < 1)
+			{
+				m_RootNamespace = m_Name;
+			}
+
+			m_FullPath = m_Path;
+			try
+			{
+				m_FullPath = Helper.ResolvePath(m_FullPath);
+			}
+			catch
+			{
+				throw new WarningException("Could not resolve Solution path: {0}", m_Path);
+			}
+
+			Kernel.Instance.CurrentWorkingDirectory.Push();
+			try
+			{
+				Helper.SetCurrentDir(m_FullPath);
+
+				if( node == null )
+				{
+					throw new ArgumentNullException("node");
+				}
+
+				foreach(XmlNode child in node.ChildNodes)
+				{
+					IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+					if(dataNode is ConfigurationNode)
+					{
+						HandleConfiguration((ConfigurationNode)dataNode);
+					}
+					else if(dataNode is ReferencePathNode)
+					{
+						m_ReferencePaths.Add(dataNode);
+					}
+					else if(dataNode is ReferenceNode)
+					{
+						m_References.Add(dataNode);
+					}
+					else if(dataNode is FilesNode)
+					{
+						m_Files = (FilesNode)dataNode;
+					}
+				}
+			}
+			finally
+			{
+				Kernel.Instance.CurrentWorkingDirectory.Pop();
+			}
+		}
+
+
+		#endregion
+
+        #region IComparable Members
+
+        public int CompareTo(object obj)
+        {
+            ProjectNode that = (ProjectNode)obj;
+            return this.m_Name.CompareTo(that.m_Name);
+        }
+
+        #endregion
+    }
+}
diff --git a/Prebuild/src/Core/Nodes/ReferenceNode.cs b/Prebuild/src/Core/Nodes/ReferenceNode.cs
new file mode 100644
index 0000000..a2880c0
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/ReferenceNode.cs
@@ -0,0 +1,153 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-07-25 18:56:49 +0200 (ti, 25 jul 2006) $
+ * $Revision: 132 $
+ */
+#endregion
+
+using System;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("Reference")]
+	public class ReferenceNode : DataNode, IComparable
+	{
+		#region Fields
+
+		private string m_Name = "unknown";
+		private string m_Path;
+		private string m_LocalCopy;
+		private string m_Version;
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return m_Name;
+			}
+		}
+
+		/// <summary>
+		/// Gets the path.
+		/// </summary>
+		/// <value>The path.</value>
+		public string Path
+		{
+			get
+			{
+				return m_Path;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether [local copy specified].
+		/// </summary>
+		/// <value><c>true</c> if [local copy specified]; otherwise, <c>false</c>.</value>
+		public bool LocalCopySpecified 
+		{
+			get 
+			{
+				return ( m_LocalCopy != null && m_LocalCopy.Length == 0);
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether [local copy].
+		/// </summary>
+		/// <value><c>true</c> if [local copy]; otherwise, <c>false</c>.</value>
+		public bool LocalCopy
+		{
+			get
+			{
+				if( m_LocalCopy == null)
+				{
+					return false;
+				}
+				return bool.Parse(m_LocalCopy);
+			}
+		}
+
+		/// <summary>
+		/// Gets the version.
+		/// </summary>
+		/// <value>The version.</value>
+		public string Version
+		{
+			get
+			{
+				return m_Version;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public override void Parse(XmlNode node)
+		{
+			m_Name = Helper.AttributeValue(node, "name", m_Name);
+			m_Path = Helper.AttributeValue(node, "path", m_Path);
+			m_LocalCopy = Helper.AttributeValue(node, "localCopy", m_LocalCopy);
+			m_Version = Helper.AttributeValue(node, "version", m_Version);
+		}
+
+		#endregion
+
+        #region IComparable Members
+
+        public int CompareTo(object obj)
+        {
+            ReferenceNode that = (ReferenceNode)obj;
+            return this.m_Name.CompareTo(that.m_Name);
+        }
+
+        #endregion
+    }
+}
diff --git a/Prebuild/src/Core/Nodes/ReferencePathNode.cs b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
new file mode 100644
index 0000000..0563c1b
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
@@ -0,0 +1,108 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("ReferencePath")]
+	public class ReferencePathNode : DataNode, IComparable
+	{
+		#region Fields
+
+		private string m_Path;
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the path.
+		/// </summary>
+		/// <value>The path.</value>
+		public string Path
+		{
+			get
+			{
+				return m_Path;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public override void Parse(XmlNode node)
+		{
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+
+			m_Path = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+			if(m_Path == null)
+			{
+				m_Path = "";
+			}
+
+			m_Path = m_Path.Trim();
+		}
+
+		#endregion
+
+        #region IComparable Members
+
+        public int CompareTo(object obj)
+        {
+            ReferencePathNode that = (ReferencePathNode)obj;
+            return this.m_Path.CompareTo(that.m_Path);
+        }
+
+        #endregion
+    }
+}
diff --git a/Prebuild/src/Core/Nodes/SolutionNode.cs b/Prebuild/src/Core/Nodes/SolutionNode.cs
new file mode 100644
index 0000000..c777fa4
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/SolutionNode.cs
@@ -0,0 +1,288 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-02-28 17:15:42 +0100 (ti, 28 feb 2006) $
+ * $Revision: 92 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[DataNode("Solution")]
+	public class SolutionNode : DataNode
+	{
+		#region Fields
+        
+		private string m_Name = "unknown";
+		private string m_Path = "";
+		private string m_FullPath = "";
+		private string m_ActiveConfig = "Debug";
+        
+		private OptionsNode m_Options;
+		private FilesNode m_Files;
+		private Hashtable m_Configurations;
+		private Hashtable m_Projects;
+		private ArrayList m_ProjectsOrder;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SolutionNode"/> class.
+		/// </summary>
+		public SolutionNode()
+		{
+			m_Configurations = new Hashtable();
+			m_Projects = new Hashtable();
+			m_ProjectsOrder = new ArrayList();
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets the active config.
+		/// </summary>
+		/// <value>The active config.</value>
+		public string ActiveConfig 
+		{ 
+			get 
+			{ 
+				return m_ActiveConfig; 
+			} 
+			set 
+			{ 
+				m_ActiveConfig = value; 
+			} 
+		}
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name 
+		{
+			get 
+			{
+				return m_Name;
+			}
+		}
+
+		/// <summary>
+		/// Gets the path.
+		/// </summary>
+		/// <value>The path.</value>
+		public string Path 
+		{
+			get 
+			{
+				return m_Path;
+			}
+		}
+
+		/// <summary>
+		/// Gets the full path.
+		/// </summary>
+		/// <value>The full path.</value>
+		public string FullPath
+		{
+			get
+			{
+				return m_FullPath;
+			}
+		}
+
+		/// <summary>
+		/// Gets the options.
+		/// </summary>
+		/// <value>The options.</value>
+		public OptionsNode Options
+		{
+			get
+			{
+				return m_Options;
+			}
+		}
+
+		/// <summary>
+		/// Gets the files.
+		/// </summary>
+		/// <value>The files.</value>
+		public FilesNode Files
+		{
+			get
+			{
+				return m_Files;
+			}
+		}
+
+		/// <summary>
+		/// Gets the configurations.
+		/// </summary>
+		/// <value>The configurations.</value>
+		public ICollection Configurations
+		{
+			get
+			{
+                ArrayList tmp = new ArrayList(ConfigurationsTable.Values);
+                tmp.Sort();
+                return tmp;
+            }
+		}
+
+		/// <summary>
+		/// Gets the configurations table.
+		/// </summary>
+		/// <value>The configurations table.</value>
+		public Hashtable ConfigurationsTable
+		{
+			get
+			{
+				return m_Configurations;
+			}
+		}
+        
+		/// <summary>
+		/// Gets the projects.
+		/// </summary>
+		/// <value>The projects.</value>
+		public ICollection Projects
+		{
+			get
+			{
+                ArrayList tmp = new ArrayList(m_Projects.Values);
+                tmp.Sort();
+                return tmp;
+			}
+		}
+
+		/// <summary>
+		/// Gets the projects table.
+		/// </summary>
+		/// <value>The projects table.</value>
+		public Hashtable ProjectsTable
+		{
+			get
+			{
+				return m_Projects;
+			}
+		}
+
+		/// <summary>
+		/// Gets the projects table.
+		/// </summary>
+		/// <value>The projects table.</value>
+		public ArrayList ProjectsTableOrder
+		{
+			get
+			{
+				return m_ProjectsOrder;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Parses the specified node.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		public override void Parse(XmlNode node)
+		{
+			m_Name = Helper.AttributeValue(node, "name", m_Name);
+			m_ActiveConfig = Helper.AttributeValue(node, "activeConfig", m_ActiveConfig);
+			m_Path = Helper.AttributeValue(node, "path", m_Path);
+
+			m_FullPath = m_Path;
+			try
+			{
+				m_FullPath = Helper.ResolvePath(m_FullPath);
+			}
+			catch
+			{
+				throw new WarningException("Could not resolve solution path: {0}", m_Path);
+			}
+
+			Kernel.Instance.CurrentWorkingDirectory.Push();
+			try
+			{
+				Helper.SetCurrentDir(m_FullPath);
+
+				if( node == null )
+				{
+					throw new ArgumentNullException("node");
+				}
+
+				foreach(XmlNode child in node.ChildNodes)
+				{
+					IDataNode dataNode = Kernel.Instance.ParseNode(child, this);
+					if(dataNode is OptionsNode)
+					{
+						m_Options = (OptionsNode)dataNode;
+					}
+					else if(dataNode is FilesNode)
+					{
+						m_Files = (FilesNode)dataNode;
+					}
+					else if(dataNode is ConfigurationNode)
+					{
+						m_Configurations[((ConfigurationNode)dataNode).Name] = dataNode;
+					}
+					else if(dataNode is ProjectNode)
+					{
+						m_Projects[((ProjectNode)dataNode).Name] = dataNode;
+						m_ProjectsOrder.Add(dataNode);
+					}
+				}
+			}
+			finally
+			{
+				Kernel.Instance.CurrentWorkingDirectory.Pop();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Parse/IfContext.cs b/Prebuild/src/Core/Parse/IfContext.cs
new file mode 100644
index 0000000..383049d
--- /dev/null
+++ b/Prebuild/src/Core/Parse/IfContext.cs
@@ -0,0 +1,163 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+
+namespace Prebuild.Core.Parse
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum IfState
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		None,
+		/// <summary>
+		/// 
+		/// </summary>
+		If,
+		/// <summary>
+		/// 
+		/// </summary>
+		ElseIf,
+		/// <summary>
+		/// 
+		/// </summary>
+		Else
+	}
+
+	/// <summary>
+	/// Summary description for IfContext.
+	/// </summary>
+	// Inspired by the equivalent WiX class (see www.sourceforge.net/projects/wix/)
+	public class IfContext
+	{
+		#region Properties
+
+		bool m_Active;
+		bool m_Keep;
+		bool m_EverKept;
+		IfState m_State = IfState.None;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="IfContext"/> class.
+		/// </summary>
+		/// <param name="active">if set to <c>true</c> [active].</param>
+		/// <param name="keep">if set to <c>true</c> [keep].</param>
+		/// <param name="state">The state.</param>
+		public IfContext(bool active, bool keep, IfState state)
+		{
+			m_Active = active;
+			m_Keep = keep;
+			m_EverKept = keep;
+			m_State = state;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets a value indicating whether this <see cref="IfContext"/> is active.
+		/// </summary>
+		/// <value><c>true</c> if active; otherwise, <c>false</c>.</value>
+		public bool Active
+		{
+			get
+			{
+				return m_Active;
+			}
+			set
+			{
+				m_Active = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether this <see cref="IfContext"/> is keep.
+		/// </summary>
+		/// <value><c>true</c> if keep; otherwise, <c>false</c>.</value>
+		public bool Keep
+		{
+			get
+			{
+				return m_Keep;
+			}
+			set
+			{
+				m_Keep = value;
+				if(m_Keep)
+				{
+					m_EverKept = true;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether [ever kept].
+		/// </summary>
+		/// <value><c>true</c> if [ever kept]; otherwise, <c>false</c>.</value>
+		public bool EverKept
+		{
+			get
+			{
+				return m_EverKept;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the state.
+		/// </summary>
+		/// <value>The state.</value>
+		public IfState State
+		{
+			get
+			{
+				return m_State;
+			}
+			set
+			{
+				m_State = value;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Parse/Preprocessor.cs b/Prebuild/src/Core/Parse/Preprocessor.cs
new file mode 100644
index 0000000..85e92c3
--- /dev/null
+++ b/Prebuild/src/Core/Parse/Preprocessor.cs
@@ -0,0 +1,519 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-09-01 19:55:06 +0200 (fr, 01 sep 2006) $
+ * $Revision: 147 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Xml;
+
+namespace Prebuild.Core.Parse
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum OperatorSymbol
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		None,
+		/// <summary>
+		/// 
+		/// </summary>
+		Equal,
+		/// <summary>
+		/// 
+		/// </summary>
+		NotEqual,
+		/// <summary>
+		/// 
+		/// </summary>
+		LessThan,
+		/// <summary>
+		/// 
+		/// </summary>
+		GreaterThan,
+		/// <summary>
+		/// 
+		/// </summary>
+		LessThanEqual,
+		/// <summary>
+		/// 
+		/// </summary>
+		GreaterThanEqual
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class Preprocessor
+	{
+		#region Fields
+
+		XmlDocument m_OutDoc;
+		Stack m_IfStack;
+		Hashtable m_Variables;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Preprocessor"/> class.
+		/// </summary>
+		public Preprocessor()
+		{
+			m_OutDoc = new XmlDocument();
+			m_IfStack = new Stack();
+			m_Variables = new Hashtable();
+
+			RegisterVariable("OS", GetOS());
+			RegisterVariable("RuntimeVersion", Environment.Version.Major);
+			RegisterVariable("RuntimeMajor", Environment.Version.Major);
+			RegisterVariable("RuntimeMinor", Environment.Version.Minor);
+			RegisterVariable("RuntimeRevision", Environment.Version.Revision);
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the processed doc.
+		/// </summary>
+		/// <value>The processed doc.</value>
+		public XmlDocument ProcessedDoc
+		{
+			get
+			{
+				return m_OutDoc;
+			}
+		}
+
+		#endregion
+
+		#region Private Methods
+		 
+		/// <summary>
+		/// Parts of this code were taken from NAnt and is subject to the GPL
+		/// as per NAnt's license. Thanks to the NAnt guys for this little gem.
+		/// </summary>
+		/// <returns></returns>
+		public static string GetOS()
+		{
+			PlatformID platId = Environment.OSVersion.Platform;
+			if(platId == PlatformID.Win32NT || platId == PlatformID.Win32Windows)
+			{
+				return "Win32";
+			}
+
+			/*
+			 * .NET 1.x, under Mono, the UNIX code is 128. Under
+			 * .NET 2.x, Mono or MS, the UNIX code is 4
+			 */
+			if(Environment.Version.Major == 1)
+			{
+				if((int)platId == 128)
+				{
+					return "UNIX";
+				}
+			}
+			else if((int)platId == 4)
+			{
+				return "UNIX";
+			}
+
+			return "Unknown";
+		}
+
+		private static bool CompareNum(OperatorSymbol oper, int val1, int val2)
+		{
+			switch(oper)
+			{
+				case OperatorSymbol.Equal:
+					return (val1 == val2);
+				case OperatorSymbol.NotEqual:
+					return (val1 != val2);
+				case OperatorSymbol.LessThan:
+					return (val1 < val2);
+				case OperatorSymbol.LessThanEqual:
+					return (val1 <= val2);
+				case OperatorSymbol.GreaterThan:
+					return (val1 > val2);
+				case OperatorSymbol.GreaterThanEqual:
+					return (val1 >= val2);
+			}
+
+			throw new WarningException("Unknown operator type");
+		}
+
+		private static bool CompareStr(OperatorSymbol oper, string val1, string val2)
+		{
+			switch(oper)
+			{
+				case OperatorSymbol.Equal:
+					return (val1 == val2);
+				case OperatorSymbol.NotEqual:
+					return (val1 != val2);
+				case OperatorSymbol.LessThan:
+					return (val1.CompareTo(val2) < 0);
+				case OperatorSymbol.LessThanEqual:
+					return (val1.CompareTo(val2) <= 0);
+				case OperatorSymbol.GreaterThan:
+					return (val1.CompareTo(val2) > 0);
+				case OperatorSymbol.GreaterThanEqual:
+					return (val1.CompareTo(val2) >= 0);
+			}
+
+			throw new WarningException("Unknown operator type");
+		}
+
+		private static char NextChar(int idx, string str)
+		{
+			if((idx + 1) >= str.Length)
+			{
+				return Char.MaxValue;
+			}
+
+			return str[idx + 1];
+		}
+		// Very very simple expression parser. Can only match expressions of the form
+		// <var> <op> <value>:
+		// OS = Windows
+		// OS != Linux
+		// RuntimeMinor > 0
+		private bool ParseExpression(string exp)
+		{
+			if(exp == null)
+			{
+				throw new ArgumentException("Invalid expression, cannot be null");
+			}
+
+			exp = exp.Trim();
+			if(exp.Length < 1)
+			{
+				throw new ArgumentException("Invalid expression, cannot be 0 length");
+			}
+
+			string id = "";
+			string str = "";
+			OperatorSymbol oper = OperatorSymbol.None;
+			bool inStr = false;
+			char c;
+            
+			for(int i = 0; i < exp.Length; i++)
+			{
+				c = exp[i];
+				if(Char.IsWhiteSpace(c))
+				{
+					continue;
+				}
+
+				if(Char.IsLetterOrDigit(c) || c == '_')
+				{
+					if(inStr)
+					{
+						str += c;
+					}
+					else
+					{
+						id += c;
+					}
+				}
+				else if(c == '\"')
+				{
+					inStr = !inStr;
+					if(inStr)
+					{
+						str = "";
+					}
+				}
+				else
+				{
+					if(inStr)
+					{
+						str += c;
+					}
+					else
+					{
+						switch(c)
+						{
+							case '=':
+								oper = OperatorSymbol.Equal;
+								break;
+
+							case '!':
+								if(NextChar(i, exp) == '=')
+								{
+									oper = OperatorSymbol.NotEqual;
+								}
+                                
+								break;
+
+							case '<':
+								if(NextChar(i, exp) == '=')
+								{
+									oper = OperatorSymbol.LessThanEqual;
+								}
+								else
+								{
+									oper = OperatorSymbol.LessThan;
+								}
+                                
+								break;
+
+							case '>':
+								if(NextChar(i, exp) == '=')
+								{
+									oper = OperatorSymbol.GreaterThanEqual;
+								}
+								else
+								{
+									oper = OperatorSymbol.GreaterThan;
+								}
+
+								break;
+						}
+					}
+				}
+			}
+
+            
+			if(inStr)
+			{
+				throw new WarningException("Expected end of string in expression");
+			}
+
+			if(oper == OperatorSymbol.None)
+			{
+				throw new WarningException("Expected operator in expression");
+			}
+			else if(id.Length < 1)
+			{
+				throw new WarningException("Expected identifier in expression");
+			}
+			else if(str.Length < 1)
+			{
+				throw new WarningException("Expected value in expression");
+			}
+
+			bool ret = false;
+			try
+			{
+				object val = m_Variables[id.ToLower()];
+				if(val == null)
+				{
+					throw new WarningException("Unknown identifier '{0}'", id);
+				}
+
+				int numVal, numVal2;
+				string strVal, strVal2;
+				Type t = val.GetType();
+				if(t.IsAssignableFrom(typeof(int)))
+				{
+					numVal = (int)val;
+					numVal2 = Int32.Parse(str);
+					ret = CompareNum(oper, numVal, numVal2);
+				}
+				else
+				{
+					strVal = val.ToString();
+					strVal2 = str;
+					ret = CompareStr(oper, strVal, strVal2);
+				}
+			}
+			catch(ArgumentException ex)
+			{
+				ex.ToString();
+				throw new WarningException("Invalid value type for system variable '{0}', expected int", id);
+			}
+
+			return ret;
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="name"></param>
+		/// <param name="variableValue"></param>
+		public void RegisterVariable(string name, object variableValue)
+		{
+			if(name == null || variableValue == null)
+			{
+				return;
+			}
+
+			m_Variables[name.ToLower()] = variableValue;
+		}
+
+		/// <summary>
+		/// Performs validation on the xml source as well as evaluates conditional and flow expresions
+		/// </summary>
+		/// <exception cref="ArgumentException">For invalid use of conditional expressions or for invalid XML syntax.  If a XmlValidatingReader is passed, then will also throw exceptions for non-schema-conforming xml</exception>
+		/// <param name="reader"></param>
+		/// <returns>the output xml </returns>
+		public string Process(XmlReader reader)
+		{
+			if(reader == null)
+			{
+				throw new ArgumentException("Invalid XML reader to pre-process");
+			}
+
+			IfContext context = new IfContext(true, true, IfState.None);
+			StringWriter xmlText = new StringWriter();
+			XmlTextWriter writer = new XmlTextWriter(xmlText);
+			writer.Formatting = Formatting.Indented;
+			while(reader.Read())
+			{
+				if(reader.NodeType == XmlNodeType.ProcessingInstruction)
+				{
+					bool ignore = false;
+					switch(reader.LocalName)
+					{
+						case "if":
+							m_IfStack.Push(context);
+							context = new IfContext(context.Keep & context.Active, ParseExpression(reader.Value), IfState.If);
+							ignore = true;
+							break;
+
+						case "elseif":
+							if(m_IfStack.Count == 0)
+							{
+								throw new WarningException("Unexpected 'elseif' outside of 'if'");
+							}
+							else if(context.State != IfState.If && context.State != IfState.ElseIf)
+							{
+								throw new WarningException("Unexpected 'elseif' outside of 'if'");
+							}
+
+							context.State = IfState.ElseIf;
+							if(!context.EverKept)
+							{
+								context.Keep = ParseExpression(reader.Value);
+							}
+							else
+							{
+								context.Keep = false;
+							}
+
+							ignore = true;
+							break;
+
+						case "else":
+							if(m_IfStack.Count == 0)
+							{
+								throw new WarningException("Unexpected 'else' outside of 'if'");
+							}
+							else if(context.State != IfState.If && context.State != IfState.ElseIf)
+							{
+								throw new WarningException("Unexpected 'else' outside of 'if'");
+							}
+
+							context.State = IfState.Else;
+							context.Keep = !context.EverKept;
+							ignore = true;
+							break;
+
+						case "endif":
+							if(m_IfStack.Count == 0)
+							{
+								throw new WarningException("Unexpected 'endif' outside of 'if'");
+							}
+
+							context = (IfContext)m_IfStack.Pop();
+							ignore = true;
+							break;
+					}
+
+					if(ignore)
+					{
+						continue;
+					}
+				}//end pre-proc instruction
+
+				if(!context.Active || !context.Keep)
+				{
+					continue;
+				}
+
+				switch(reader.NodeType)
+				{
+					case XmlNodeType.Element:
+						bool empty = reader.IsEmptyElement;
+						writer.WriteStartElement(reader.Name);
+
+						while (reader.MoveToNextAttribute())
+						{
+							writer.WriteAttributeString(reader.Name, reader.Value);
+						}
+
+						if(empty)
+						{
+							writer.WriteEndElement();
+						}
+                        
+						break;
+
+					case XmlNodeType.EndElement:
+						writer.WriteEndElement();
+						break;
+
+					case XmlNodeType.Text:
+						writer.WriteString(reader.Value);
+						break;
+
+					case XmlNodeType.CDATA:
+						writer.WriteCData(reader.Value);
+						break;
+
+					default:
+						break;
+				}
+			}
+
+			if(m_IfStack.Count != 0)
+			{
+				throw new WarningException("Mismatched 'if', 'endif' pair");
+			}
+            
+			return xmlText.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Targets/AutotoolsTarget.cs b/Prebuild/src/Core/Targets/AutotoolsTarget.cs
new file mode 100644
index 0000000..2b4a678
--- /dev/null
+++ b/Prebuild/src/Core/Targets/AutotoolsTarget.cs
@@ -0,0 +1,926 @@
+#region BSD License
+/*
+
+Copyright (c) 2004 - 2006
+Matthew Holmes        (matthew@wildfiregames.com),
+Dan     Moorehead     (dan05a@gmail.com),
+Dave    Hudson        (jendave@yahoo.com),
+C.J.    Adams-Collier (cjcollier@colliertech.org),
+
+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.
+
+* The name of the author may not be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-07-28 22:43:24 -0700 (Fri, 28 Jul 2006) $
+ * $Revision: 136 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Nodes;
+using Prebuild.Core.Parse;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Targets
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[Target("autotools")]
+	public class AutotoolsTarget : ITarget
+	{
+		#region Fields
+
+		private Kernel m_Kernel;
+
+		#endregion
+
+		#region Private Methods
+
+		private static string PrependPath(string path)
+		{
+			string tmpPath = Helper.NormalizePath(path, '/');
+			Regex regex = new Regex(@"(\w):/(\w+)");
+			Match match = regex.Match(tmpPath);
+			if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
+			{
+				tmpPath = Helper.NormalizePath(tmpPath);
+			}
+			else
+			{
+				tmpPath = Helper.NormalizePath("./" + tmpPath);
+			}
+
+			return tmpPath;
+		}
+
+		private static string BuildReference(SolutionNode solution, ReferenceNode refr)
+		{
+			string ret = "";
+			if(solution.ProjectsTable.ContainsKey(refr.Name))
+			{
+				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];				
+				string fileRef = FindFileReference(refr.Name, project);
+				string finalPath = Helper.NormalizePath(Helper.MakeFilePath(project.FullPath + "/$(BUILD_DIR)/$(CONFIG)/", refr.Name, "dll"), '/');
+				ret += finalPath;
+				return ret;
+			}
+			else
+			{
+				ProjectNode project = (ProjectNode)refr.Parent;
+				string fileRef = FindFileReference(refr.Name, project);
+
+				if(refr.Path != null || fileRef != null)
+				{
+					string finalPath = (refr.Path != null) ? Helper.NormalizePath(refr.Path + "/" + refr.Name + ".dll", '/') : fileRef;
+					ret += Path.Combine(project.Path, finalPath);					
+					return ret;
+				}
+
+				try
+				{
+					//Assembly assem = Assembly.Load(refr.Name);
+                    //if (assem != null)
+                    //{
+                    //    int index = refr.Name.IndexOf(",");
+                    //    if ( index > 0)
+                    //    {
+                    //        ret += assem.Location;
+                    //        //Console.WriteLine("Location1: " + assem.Location);
+                    //    }
+                    //    else
+                    //    {
+                    //        ret += (refr.Name + ".dll");
+                    //        //Console.WriteLine("Location2: " + assem.Location);
+                    //    }
+                    //}
+                    //else
+                    //{
+						int index = refr.Name.IndexOf(",");
+						if ( index > 0)
+						{
+							ret += refr.Name.Substring(0, index) + ".dll";
+							//Console.WriteLine("Location3: " + assem.Location);
+						}
+						else
+						{
+							ret += (refr.Name + ".dll");
+							//Console.WriteLine("Location4: " + assem.Location);
+						}
+					//}
+				}
+				catch (System.NullReferenceException e)
+				{
+					e.ToString();
+					int index = refr.Name.IndexOf(",");
+					if ( index > 0)
+					{
+						ret += refr.Name.Substring(0, index) + ".dll";
+						//Console.WriteLine("Location5: " + assem.Location);
+					}
+					else
+					{
+						ret += (refr.Name + ".dll");
+						//Console.WriteLine("Location6: " + assem.Location);
+					}
+				}
+			}
+			return ret;
+		}
+
+		private static string BuildReferencePath(SolutionNode solution, ReferenceNode refr)
+		{
+			string ret = "";
+			if(solution.ProjectsTable.ContainsKey(refr.Name))
+			{
+				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];	
+				string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/');
+				ret += finalPath;
+				return ret;
+			}
+			else
+			{
+				ProjectNode project = (ProjectNode)refr.Parent;
+				string fileRef = FindFileReference(refr.Name, project);
+
+				
+				if(refr.Path != null || fileRef != null)
+				{
+					string finalPath = (refr.Path != null) ? Helper.NormalizePath(refr.Path, '/') : fileRef;
+					ret += finalPath;
+					return ret;
+				}
+
+				try
+				{
+					Assembly assem = Assembly.Load(refr.Name);
+					if (assem != null)
+					{
+						ret += "";
+					}
+					else
+					{
+						ret += "";
+					}
+				}
+				catch (System.NullReferenceException e)
+				{
+					e.ToString();
+					ret += "";
+				}
+			}
+			return ret;
+		}
+
+		private static string FindFileReference(string refName, ProjectNode project) 
+		{
+			foreach(ReferencePathNode refPath in project.ReferencePaths) 
+			{
+				string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
+
+				if(File.Exists(fullPath)) 
+				{
+					return fullPath;
+				}
+			}
+
+			return null;
+		}
+
+		/// <summary>
+		/// Gets the XML doc file.
+		/// </summary>
+		/// <param name="project">The project.</param>
+		/// <param name="conf">The conf.</param>
+		/// <returns></returns>
+		public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf) 
+		{
+			if( conf == null )
+			{
+				throw new ArgumentNullException("conf");
+			}
+			if( project == null )
+			{
+				throw new ArgumentNullException("project");
+			}
+			string docFile = (string)conf.Options["XmlDocFile"];
+			//			if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
+			//			{
+			//				return Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
+			//			}
+			return docFile;
+		}
+
+		/// <summary>
+		/// Normalizes the path.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		/// <returns></returns>
+		public static string NormalizePath(string path)
+		{
+			if(path == null)
+			{
+				return "";
+			}
+
+			StringBuilder tmpPath;
+
+			if (Core.Parse.Preprocessor.GetOS() == "Win32")
+			{
+				tmpPath = new StringBuilder(path.Replace('\\', '/'));
+				tmpPath.Replace("/", @"\\");
+			}
+			else
+			{
+				tmpPath = new StringBuilder(path.Replace('\\', '/'));
+				tmpPath = tmpPath.Replace('/', Path.DirectorySeparatorChar);
+			}
+			return tmpPath.ToString();
+		}
+
+		private void WriteProject(SolutionNode solution, ProjectNode project)
+		{
+			string projFile = Helper.MakeFilePath(project.FullPath, "Include", "am");
+			StreamWriter ss = new StreamWriter(projFile);
+			ss.NewLine = "\n";
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
+
+			using(ss)
+			{
+				ss.WriteLine(Helper.AssemblyFullName(project.AssemblyName, project.Type) + ":");
+				ss.WriteLine("\tmkdir -p " + Helper.MakePathRelativeTo(solution.FullPath, project.Path) + "/$(BUILD_DIR)/$(CONFIG)/");
+				foreach(string file in project.Files)
+				{
+					if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
+					{
+						ss.Write("\tresgen ");
+						ss.Write(Helper.NormalizePath(Path.Combine(project.Path, file.Substring(0, file.LastIndexOf('.')) + ".resx "), '/'));
+						if (project.Files.GetResourceName(file) != "")
+						{
+							ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + project.Files.GetResourceName(file) + ".resources"), '/'));
+						}
+						else
+						{
+							ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + file.Substring(0, file.LastIndexOf('.')) + ".resources"), '/'));
+						}
+					}
+				}
+				ss.WriteLine("\t$(CSC)\t/out:" + Helper.MakePathRelativeTo(solution.FullPath, project.Path) + "/$(BUILD_DIR)/$(CONFIG)/" + Helper.AssemblyFullName(project.AssemblyName, project.Type) + " \\");
+				ss.WriteLine("\t\t/target:" + project.Type.ToString().ToLower() + " \\");
+				if (project.References.Count > 0)
+				{
+					ss.Write("\t\t/reference:");
+					bool firstref = true;
+					foreach(ReferenceNode refr in project.References)
+					{
+						if (firstref)
+						{
+							firstref = false;
+						}
+						else
+						{
+							ss.Write(",");
+						}
+						ss.Write("{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(solution.FullPath, BuildReference(solution, refr)), '/'));
+					}
+					ss.WriteLine(" \\");
+				}
+				//ss.WriteLine("\t\tProperties/AssemblyInfo.cs \\");
+
+				foreach(string file in project.Files)
+				{
+					switch(project.Files.GetBuildAction(file))
+					{
+						case BuildAction.EmbeddedResource:
+							ss.Write("\t\t/resource:");
+							ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, file), '/') + " \\");
+							break;
+						default:
+							if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
+							{
+								ss.Write("\t\t/resource:");
+								if (project.Files.GetResourceName(file) != "")
+								{
+									ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + project.Files.GetResourceName(file) + ".resources"), '/') + "," + project.RootNamespace + "." + project.Files.GetResourceName(file) + ".resources" + " \\");
+								}
+								else
+								{
+									ss.WriteLine(Helper.NormalizePath(Path.Combine(project.Path, project.RootNamespace + "." + file.Substring(0, file.LastIndexOf('.')) + ".resources"), '/') + "," + project.RootNamespace + "." + file.Substring(0, file.LastIndexOf('.')) + ".resources" + " \\");
+								}
+							}
+							break;
+					}
+				}
+				
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					if (conf.Options.KeyFile !="")
+					{
+						ss.WriteLine("\t\t/keyfile:" + Helper.NormalizePath(Path.Combine(project.Path, conf.Options.KeyFile), '/') + " \\");	
+						break;
+					}
+				}
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					if (conf.Options.AllowUnsafe)
+					{
+						ss.WriteLine("\t\t/unsafe \\");
+						break;
+					}
+				}
+				if (project.AppIcon != "")
+				{
+					ss.WriteLine("\t\t/win32icon:" + Helper.NormalizePath(Path.Combine(project.Path, project.AppIcon), '/') + " \\");
+				}
+
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					ss.WriteLine("\t\t/define:{0}", conf.Options.CompilerDefines.Replace(';', ',') + " \\");
+					break;
+				}
+				
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					if (GetXmlDocFile(project, conf) !="")
+					{
+						ss.WriteLine("\t\t/doc:" + Helper.MakePathRelativeTo(solution.FullPath, project.Path) + "/$(BUILD_DIR)/$(CONFIG)/" + project.Name + ".xml \\");
+						break;
+					}
+				}
+				foreach(string file in project.Files)
+				{
+					switch(project.Files.GetBuildAction(file))
+					{
+						case BuildAction.Compile:
+							ss.WriteLine("\t\t\\");
+							ss.Write("\t\t" + NormalizePath(Path.Combine(Helper.MakePathRelativeTo(solution.FullPath, project.Path), file)));
+							break;
+						default:
+							break;
+					}
+				}
+				ss.WriteLine();
+				ss.WriteLine();
+
+				if (project.Type == ProjectType.Library)
+				{
+					ss.WriteLine("install-data-local:");
+					ss.WriteLine("	echo \"$(GACUTIL) /i bin/Release/" + project.Name + ".dll /f $(GACUTIL_FLAGS)\";  \\");
+					ss.WriteLine("	$(GACUTIL) /i bin/Release/" + project.Name + ".dll /f $(GACUTIL_FLAGS) || exit 1;");
+					ss.WriteLine();
+					ss.WriteLine("uninstall-local:");
+					ss.WriteLine("	echo \"$(GACUTIL) /u " + project.Name + " $(GACUTIL_FLAGS)\"; \\");
+					ss.WriteLine("	$(GACUTIL) /u " + project.Name + " $(GACUTIL_FLAGS) || exit 1;");
+					ss.WriteLine();
+				}
+				ss.WriteLine("CLEANFILES = $(BUILD_DIR)/$(CONFIG)/" + Helper.AssemblyFullName(project.AssemblyName, project.Type) + " $(BUILD_DIR)/$(CONFIG)/" + project.AssemblyName + ".mdb $(BUILD_DIR)/$(CONFIG)/" + project.AssemblyName + ".pdb " + project.AssemblyName + ".xml");
+				ss.WriteLine("EXTRA_DIST = \\");
+				ss.Write("	$(FILES)");
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					if (conf.Options.KeyFile != "")
+					{
+						ss.Write(" \\");
+						ss.WriteLine("\t" + conf.Options.KeyFile);
+					}
+					break;
+				}
+			}                
+			m_Kernel.CurrentWorkingDirectory.Pop();
+		}
+		bool hasLibrary = false;
+
+		private void WriteCombine(SolutionNode solution)
+		{
+		
+			/* TODO: These vars should be pulled from the prebuild.xml file */
+			string releaseVersion  = "2.0.0";
+			string assemblyVersion = "2.1.0.0";
+			string description     = 
+			  "Tao Framework " + solution.Name + " Binding For .NET";
+		
+			hasLibrary = false;
+			m_Kernel.Log.Write("Creating Autotools make files");
+			foreach(ProjectNode project in solution.Projects)
+			{
+				if(m_Kernel.AllowProject(project.FilterGroups)) 
+				{
+					m_Kernel.Log.Write("...Creating makefile: {0}", project.Name);
+					WriteProject(solution, project);
+				}
+			}
+
+			m_Kernel.Log.Write("");
+			string combFile = Helper.MakeFilePath(solution.FullPath, "Makefile", "am");
+			StreamWriter ss = new StreamWriter(combFile);
+			ss.NewLine = "\n";
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
+            
+			using(ss)
+			{
+				foreach(ProjectNode project in solution.ProjectsTableOrder)
+				{
+					if (project.Type == ProjectType.Library)
+					{
+						hasLibrary = true;
+						break;
+					}
+				}
+
+				if (hasLibrary)
+				{
+					ss.Write("pkgconfig_in_files = ");
+					foreach(ProjectNode project in solution.ProjectsTableOrder)
+					{
+						if (project.Type == ProjectType.Library)
+						{
+							string combFilepc = Helper.MakeFilePath(solution.FullPath, project.Name, "pc.in");
+							ss.Write(" " + project.Name + ".pc.in ");
+							StreamWriter sspc = new StreamWriter(combFilepc);
+							sspc.NewLine = "\n";
+							using(sspc)
+							{
+								sspc.WriteLine("prefix=@prefix@");
+								sspc.WriteLine("exec_prefix=${prefix}");
+								sspc.WriteLine("libdir=${exec_prefix}/lib");
+								sspc.WriteLine();
+								sspc.WriteLine("Name: @PACKAGE_NAME@");
+								sspc.WriteLine("Description: @DESCRIPTION@");
+								sspc.WriteLine("Version: @ASSEMBLY_VERSION@");
+								sspc.WriteLine("Libs:  -r:${libdir}/mono/gac/@PACKAGE_NAME@/@ASSEMBLY_VERSION@__@PUBKEY@/@PACKAGE_NAME@.dll");
+							}
+						}
+					}
+				
+					ss.WriteLine();
+					ss.WriteLine("pkgconfigdir=$(prefix)/lib/pkgconfig");
+					ss.WriteLine("pkgconfig_DATA=$(pkgconfig_in_files:.pc.in=.pc)");
+				}
+				ss.WriteLine();
+				foreach(ProjectNode project in solution.ProjectsTableOrder)
+				{
+					string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+					ss.WriteLine("-include x {0}",
+						Helper.NormalizePath(Helper.MakeFilePath(path, "Include", "am"),'/'));
+				}
+				ss.WriteLine();
+				ss.WriteLine("all: \\");
+				ss.Write("\t");
+				foreach(ProjectNode project in solution.ProjectsTableOrder)
+				{
+					string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+					ss.Write(Helper.AssemblyFullName(project.AssemblyName, project.Type) + " ");
+						
+				}
+				ss.WriteLine();
+				if (hasLibrary)
+				{
+					ss.WriteLine("EXTRA_DIST = \\");
+					ss.WriteLine("\t$(pkgconfig_in_files)");
+				}
+				else
+				{
+					ss.WriteLine("EXTRA_DIST = ");
+				}
+				ss.WriteLine();
+				ss.WriteLine("DISTCLEANFILES = \\");
+				ss.WriteLine("\tconfigure \\");
+				ss.WriteLine("\tMakefile.in  \\");
+				ss.WriteLine("\taclocal.m4");
+			}
+			combFile = Helper.MakeFilePath(solution.FullPath, "configure", "ac");
+			StreamWriter ts = new StreamWriter(combFile);
+			ts.NewLine = "\n";
+			using(ts)
+			{
+				if (this.hasLibrary)
+				{
+					foreach(ProjectNode project in solution.ProjectsTableOrder)
+					{
+						if (project.Type == ProjectType.Library)
+						{
+							ts.WriteLine("AC_INIT(" + project.Name + ".pc.in)");
+							break;
+						}
+					}
+				}
+				else
+				{
+					ts.WriteLine("AC_INIT(Makefile.am)");
+				}
+				ts.WriteLine("AC_PREREQ(2.53)");
+				ts.WriteLine("AC_CANONICAL_SYSTEM");
+				
+				ts.WriteLine("PACKAGE_NAME={0}", solution.Name);
+				ts.WriteLine("PACKAGE_VERSION={0}", releaseVersion);
+				ts.WriteLine("DESCRIPTION=\"{0}\"", description);
+				ts.WriteLine("AC_SUBST(DESCRIPTION)");
+				ts.WriteLine("AM_INIT_AUTOMAKE([$PACKAGE_NAME],[$PACKAGE_VERSION],[$DESCRIPTION])");
+				
+				ts.WriteLine("ASSEMBLY_VERSION={0}", assemblyVersion);
+				ts.WriteLine("AC_SUBST(ASSEMBLY_VERSION)");
+				
+				ts.WriteLine("PUBKEY=`sn -t $PACKAGE_NAME.snk | grep 'Public Key Token' | awk -F: '{print $2}' | sed -e 's/^ //'`");
+				ts.WriteLine("AC_SUBST(PUBKEY)");
+				
+				ts.WriteLine();
+				ts.WriteLine("AM_MAINTAINER_MODE");
+				ts.WriteLine();
+				ts.WriteLine("dnl AC_PROG_INTLTOOL([0.25])");
+				ts.WriteLine();
+				ts.WriteLine("AC_PROG_INSTALL");
+				ts.WriteLine();
+				ts.WriteLine("MONO_REQUIRED_VERSION=1.1");
+				ts.WriteLine();
+				ts.WriteLine("AC_MSG_CHECKING([whether we're compiling from CVS])");
+				ts.WriteLine("if test -f \"$srcdir/.cvs_version\" ; then");
+				ts.WriteLine("        from_cvs=yes");
+				ts.WriteLine("else");
+				ts.WriteLine("  if test -f \"$srcdir/.svn\" ; then");
+				ts.WriteLine("        from_cvs=yes");
+				ts.WriteLine("  else");
+				ts.WriteLine("        from_cvs=no");
+				ts.WriteLine("  fi");
+				ts.WriteLine("fi");
+				ts.WriteLine();
+				ts.WriteLine("AC_MSG_RESULT($from_cvs)");
+				ts.WriteLine();
+				ts.WriteLine("AC_PATH_PROG(MONO, mono)");
+				ts.WriteLine("AC_PATH_PROG(GMCS, gmcs)");
+				ts.WriteLine("AC_PATH_PROG(GACUTIL, gacutil)");
+				ts.WriteLine();
+				ts.WriteLine("AC_MSG_CHECKING([for mono])");
+				ts.WriteLine("dnl if test \"x$MONO\" = \"x\" ; then");
+				ts.WriteLine("dnl  AC_MSG_ERROR([Can't find \"mono\" in your PATH])");
+				ts.WriteLine("dnl else");
+				ts.WriteLine("  AC_MSG_RESULT([found])");
+				ts.WriteLine("dnl fi");
+				ts.WriteLine();
+				ts.WriteLine("AC_MSG_CHECKING([for gmcs])");
+				ts.WriteLine("dnl if test \"x$GMCS\" = \"x\" ; then");
+				ts.WriteLine("dnl  AC_MSG_ERROR([Can't find \"gmcs\" in your PATH])");
+				ts.WriteLine("dnl else");
+				ts.WriteLine("  AC_MSG_RESULT([found])");
+				ts.WriteLine("dnl fi");
+				ts.WriteLine();
+                //ts.WriteLine("AC_MSG_CHECKING([for gacutil])");
+                //ts.WriteLine("if test \"x$GACUTIL\" = \"x\" ; then");
+                //ts.WriteLine("  AC_MSG_ERROR([Can't find \"gacutil\" in your PATH])");
+                //ts.WriteLine("else");
+                //ts.WriteLine("  AC_MSG_RESULT([found])");
+                //ts.WriteLine("fi");
+				ts.WriteLine();
+				ts.WriteLine("AC_SUBST(PATH)");
+				ts.WriteLine("AC_SUBST(LD_LIBRARY_PATH)");
+				ts.WriteLine();
+				ts.WriteLine("dnl CSFLAGS=\"-debug -nowarn:1574\"");
+				ts.WriteLine("CSFLAGS=\"\"");
+				ts.WriteLine("AC_SUBST(CSFLAGS)");
+				ts.WriteLine();
+				//				ts.WriteLine("AC_MSG_CHECKING(--disable-sdl argument)");
+				//				ts.WriteLine("AC_ARG_ENABLE(sdl,");
+				//				ts.WriteLine("    [  --disable-sdl         Disable Sdl interface.],");
+				//				ts.WriteLine("    [disable_sdl=$disableval],");
+				//				ts.WriteLine("    [disable_sdl=\"no\"])");
+				//				ts.WriteLine("AC_MSG_RESULT($disable_sdl)");
+				//				ts.WriteLine("if test \"$disable_sdl\" = \"yes\"; then");
+				//				ts.WriteLine("  AC_DEFINE(FEAT_SDL)");
+				//				ts.WriteLine("fi");
+				ts.WriteLine();
+				ts.WriteLine("dnl Find pkg-config");
+				ts.WriteLine("AC_PATH_PROG(PKGCONFIG, pkg-config, no)");
+				ts.WriteLine("if test \"x$PKG_CONFIG\" = \"xno\"; then");
+				ts.WriteLine("        AC_MSG_ERROR([You need to install pkg-config])");
+				ts.WriteLine("fi");
+				ts.WriteLine();
+				ts.WriteLine("PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)");
+				ts.WriteLine("BUILD_DIR=\"bin\"");
+				ts.WriteLine("AC_SUBST(BUILD_DIR)");
+				ts.WriteLine("CONFIG=\"Release\"");
+				ts.WriteLine("AC_SUBST(CONFIG)");
+				ts.WriteLine();
+				ts.WriteLine("if test \"x$has_mono\" = \"xtrue\"; then");
+				ts.WriteLine("  AC_PATH_PROG(RUNTIME, mono, no)");
+				ts.WriteLine("  AC_PATH_PROG(CSC, gmcs, no)");
+				ts.WriteLine("  if test `uname -s` = \"Darwin\"; then");
+				ts.WriteLine("        LIB_PREFIX=");
+				ts.WriteLine("        LIB_SUFFIX=.dylib");
+				ts.WriteLine("  else");
+				ts.WriteLine("        LIB_PREFIX=.so");
+				ts.WriteLine("        LIB_SUFFIX=");
+				ts.WriteLine("  fi");
+				ts.WriteLine("else");
+				ts.WriteLine("  AC_PATH_PROG(CSC, csc.exe, no)");
+				ts.WriteLine("  if test x$CSC = \"xno\"; then");
+				ts.WriteLine("        AC_MSG_ERROR([You need to install either mono or .Net])");
+				ts.WriteLine("  else");
+				ts.WriteLine("    RUNTIME=");
+				ts.WriteLine("    LIB_PREFIX=");
+				ts.WriteLine("    LIB_SUFFIX=.dylib");
+				ts.WriteLine("  fi");
+				ts.WriteLine("fi");
+				ts.WriteLine();
+				ts.WriteLine("AC_SUBST(LIB_PREFIX)");
+				ts.WriteLine("AC_SUBST(LIB_SUFFIX)");
+				ts.WriteLine();
+				ts.WriteLine("AC_SUBST(BASE_DEPENDENCIES_CFLAGS)");
+				ts.WriteLine("AC_SUBST(BASE_DEPENDENCIES_LIBS)");
+				ts.WriteLine();
+				ts.WriteLine("dnl Find monodoc");
+				ts.WriteLine("MONODOC_REQUIRED_VERSION=1.0");
+				ts.WriteLine("AC_SUBST(MONODOC_REQUIRED_VERSION)");
+				ts.WriteLine("PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no)");
+				ts.WriteLine();
+				ts.WriteLine("if test \"x$enable_monodoc\" = \"xyes\"; then");
+				ts.WriteLine("        AC_PATH_PROG(MONODOC, monodoc, no)");
+				ts.WriteLine("        if test x$MONODOC = xno; then");
+				ts.WriteLine("           enable_monodoc=no");
+				ts.WriteLine("        fi");
+				ts.WriteLine("else");
+				ts.WriteLine("        MONODOC=");
+				ts.WriteLine("fi");
+				ts.WriteLine();
+				ts.WriteLine("AC_SUBST(MONODOC)");
+				ts.WriteLine("AM_CONDITIONAL(ENABLE_MONODOC, test \"x$enable_monodoc\" = \"xyes\")");
+				ts.WriteLine();
+				ts.WriteLine("AC_PATH_PROG(GACUTIL, gacutil, no)");
+				ts.WriteLine("if test \"x$GACUTIL\" = \"xno\" ; then");
+				ts.WriteLine("        AC_MSG_ERROR([No gacutil tool found])");
+				ts.WriteLine("fi");
+				ts.WriteLine();
+				//				foreach(ProjectNode project in solution.ProjectsTableOrder)
+				//				{
+				//					if (project.Type == ProjectType.Library)
+				//					{
+				//					}
+				//				}
+				ts.WriteLine("GACUTIL_FLAGS='/package $(PACKAGE_NAME) /gacdir $(DESTDIR)$(prefix)'");
+				ts.WriteLine("AC_SUBST(GACUTIL_FLAGS)");
+				ts.WriteLine();
+				ts.WriteLine("winbuild=no");
+				ts.WriteLine("case \"$host\" in");
+				ts.WriteLine("       *-*-mingw*|*-*-cygwin*)");
+				ts.WriteLine("               winbuild=yes");
+				ts.WriteLine("               ;;");
+				ts.WriteLine("esac");
+				ts.WriteLine("AM_CONDITIONAL(WINBUILD, test x$winbuild = xyes)");
+				ts.WriteLine();
+				//				ts.WriteLine("dnl Check for SDL");
+				//				ts.WriteLine();
+				//				ts.WriteLine("AC_PATH_PROG([SDL_CONFIG], [sdl-config])");
+				//				ts.WriteLine("have_sdl=no");
+				//				ts.WriteLine("if test -n \"${SDL_CONFIG}\"; then");
+				//				ts.WriteLine("    have_sdl=yes");
+				//				ts.WriteLine("    SDL_CFLAGS=`$SDL_CONFIG --cflags`");
+				//				ts.WriteLine("    SDL_LIBS=`$SDL_CONFIG --libs`");
+				//				ts.WriteLine("    #");
+				//				ts.WriteLine("    # sdl-config sometimes emits an rpath flag pointing at its library");
+				//				ts.WriteLine("    # installation directory.  We don't want this, as it prevents users from");
+				//				ts.WriteLine("    # linking sdl-viewer against, for example, a locally compiled libGL when a");
+				//				ts.WriteLine("    # version of the library also exists in SDL's library installation");
+				//				ts.WriteLine("    # directory, typically /usr/lib.");
+				//				ts.WriteLine("    #");
+				//				ts.WriteLine("    SDL_LIBS=`echo $SDL_LIBS | sed 's/-Wl,-rpath,[[^ ]]* //'`");
+				//				ts.WriteLine("fi");
+				//				ts.WriteLine("AC_SUBST([SDL_CFLAGS])");
+				//				ts.WriteLine("AC_SUBST([SDL_LIBS])");
+				ts.WriteLine();
+				ts.WriteLine("AC_OUTPUT([");
+				ts.WriteLine("Makefile");
+                // TODO: this does not work quite right.
+				//ts.WriteLine("Properties/AssemblyInfo.cs");
+				foreach(ProjectNode project in solution.ProjectsTableOrder)
+				{
+					if (project.Type == ProjectType.Library)
+					{
+						ts.WriteLine(project.Name + ".pc");
+					}
+					//					string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+					//					ts.WriteLine(Helper.NormalizePath(Helper.MakeFilePath(path, "Include"),'/'));
+				}
+				ts.WriteLine("])");
+				ts.WriteLine();
+				ts.WriteLine("#po/Makefile.in");
+				ts.WriteLine();
+				ts.WriteLine("echo \"---\"");
+				ts.WriteLine("echo \"Configuration summary\"");
+				ts.WriteLine("echo \"\"");
+				ts.WriteLine("echo \"   * Installation prefix: $prefix\"");
+				ts.WriteLine("echo \"   * compiler:            $CSC\"");
+				ts.WriteLine("echo \"   * Documentation:       $enable_monodoc ($MONODOC)\"");
+				ts.WriteLine("echo \"   * Package Name:        $PACKAGE_NAME\"");
+				ts.WriteLine("echo \"   * Version:             $PACKAGE_VERSION\"");
+				ts.WriteLine("echo \"   * Public Key:          $PUBKEY\"");
+				ts.WriteLine("echo \"\"");
+				ts.WriteLine("echo \"---\"");
+				ts.WriteLine();
+			}
+
+            ts.NewLine = "\n";
+            foreach (ProjectNode project in solution.ProjectsTableOrder)
+            {
+                if (project.GenerateAssemblyInfoFile)
+                {
+                    GenerateAssemblyInfoFile(solution, combFile);
+                }
+            }
+		}
+
+        private static void GenerateAssemblyInfoFile(SolutionNode solution, string combFile)
+        {
+            System.IO.Directory.CreateDirectory(Helper.MakePathRelativeTo(solution.FullPath, "Properties"));
+            combFile = Helper.MakeFilePath(solution.FullPath + "/Properties/", "AssemblyInfo.cs", "in");
+            StreamWriter ai = new StreamWriter(combFile);
+            
+            using (ai)
+            {
+                ai.WriteLine("#region License");
+                ai.WriteLine("/*");
+                ai.WriteLine("MIT License");
+                ai.WriteLine("Copyright (c)2003-2006 Tao Framework Team");
+                ai.WriteLine("http://www.taoframework.com");
+                ai.WriteLine("All rights reserved.");
+                ai.WriteLine("");
+                ai.WriteLine("Permission is hereby granted, free of charge, to any person obtaining a copy");
+                ai.WriteLine("of this software and associated documentation files (the \"Software\"), to deal");
+                ai.WriteLine("in the Software without restriction, including without limitation the rights");
+                ai.WriteLine("to use, copy, modify, merge, publish, distribute, sublicense, and/or sell");
+                ai.WriteLine("copies of the Software, and to permit persons to whom the Software is");
+                ai.WriteLine("furnished to do so, subject to the following conditions:");
+                ai.WriteLine("");
+                ai.WriteLine("The above copyright notice and this permission notice shall be included in all");
+                ai.WriteLine("copies or substantial portions of the Software.");
+                ai.WriteLine("");
+                ai.WriteLine("THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR");
+                ai.WriteLine("IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,");
+                ai.WriteLine("FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE");
+                ai.WriteLine("AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER");
+                ai.WriteLine("LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,");
+                ai.WriteLine("OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE");
+                ai.WriteLine("SOFTWARE.");
+                ai.WriteLine("*/");
+                ai.WriteLine("#endregion License");
+                ai.WriteLine("");
+                ai.WriteLine("using System;");
+                ai.WriteLine("using System.Reflection;");
+                ai.WriteLine("using System.Runtime.InteropServices;");
+                ai.WriteLine("using System.Security;");
+                ai.WriteLine("using System.Security.Permissions;");
+                ai.WriteLine("");
+                ai.WriteLine("[assembly: AllowPartiallyTrustedCallers]");
+                ai.WriteLine("[assembly: AssemblyCompany(\"Tao Framework -- http://www.taoframework.com\")]");
+                ai.WriteLine("[assembly: AssemblyConfiguration(\"Retail\")]");
+                ai.WriteLine("[assembly: AssemblyCopyright(\"Copyright (c)2003-2006 Tao Framework Team.  All rights reserved.\")]");
+                ai.WriteLine("[assembly: AssemblyCulture(\"\")]");
+                ai.WriteLine("[assembly: AssemblyDefaultAlias(\"@PACKAGE_NAME@\")]");
+                ai.WriteLine("[assembly: AssemblyDelaySign(false)]");
+                ai.WriteLine("[assembly: AssemblyDescription(\"@DESCRIPTION@\")]");
+                ai.WriteLine("[assembly: AssemblyFileVersion(\"@ASSEMBLY_VERSION@\")]");
+                ai.WriteLine("[assembly: AssemblyInformationalVersion(\"@ASSEMBLY_VERSION@\")]");
+                ai.WriteLine("[assembly: AssemblyKeyName(\"\")]");
+                ai.WriteLine("[assembly: AssemblyProduct(\"@PACKAGE_NAME@.dll\")]");
+                ai.WriteLine("[assembly: AssemblyTitle(\"@DESCRIPTION@\")]");
+                ai.WriteLine("[assembly: AssemblyTrademark(\"Tao Framework -- http://www.taoframework.com\")]");
+                ai.WriteLine("[assembly: AssemblyVersion(\"@ASSEMBLY_VERSION@\")]");
+                ai.WriteLine("[assembly: CLSCompliant(true)]");
+                ai.WriteLine("[assembly: ComVisible(false)]");
+                ai.WriteLine("[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.Execution)]");
+                ai.WriteLine("[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.SkipVerification)]");
+                ai.WriteLine("[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.UnmanagedCode)]");
+
+            }
+            //return combFile;
+        }
+
+		private void CleanProject(ProjectNode project)
+		{
+			m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
+			string projectFile = Helper.MakeFilePath(project.FullPath, "Include", "am");
+			Helper.DeleteIfExists(projectFile);
+		}
+
+		private void CleanSolution(SolutionNode solution)
+		{
+			m_Kernel.Log.Write("Cleaning Autotools make files for", solution.Name);
+
+			string slnFile = Helper.MakeFilePath(solution.FullPath, "Makefile", "am");
+			Helper.DeleteIfExists(slnFile);
+
+			slnFile = Helper.MakeFilePath(solution.FullPath, "Makefile", "in");
+			Helper.DeleteIfExists(slnFile);
+
+			slnFile = Helper.MakeFilePath(solution.FullPath, "configure", "ac");
+			Helper.DeleteIfExists(slnFile);
+
+			slnFile = Helper.MakeFilePath(solution.FullPath, "configure");
+			Helper.DeleteIfExists(slnFile);
+
+			slnFile = Helper.MakeFilePath(solution.FullPath, "Makefile");
+			Helper.DeleteIfExists(slnFile);
+
+			foreach(ProjectNode project in solution.Projects)
+			{
+				CleanProject(project);
+			}
+            
+			m_Kernel.Log.Write("");
+		}
+
+		#endregion
+
+		#region ITarget Members
+
+		/// <summary>
+		/// Writes the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public void Write(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode solution in kern.Solutions)
+			{
+				WriteCombine(solution);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Cleans the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public virtual void Clean(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode sol in kern.Solutions)
+			{
+				CleanSolution(sol);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return "autotools";
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Targets/DebugTarget.cs b/Prebuild/src/Core/Targets/DebugTarget.cs
new file mode 100644
index 0000000..6baa623
--- /dev/null
+++ b/Prebuild/src/Core/Targets/DebugTarget.cs
@@ -0,0 +1,102 @@
+#region	BSD	License
+/*
+Copyright (c) 2004-2005	Matthew	Holmes (matthew@wildfiregames.com),	Dan	Moorehead (dan05a@gmail.com)
+
+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.	
+* The name of the author may not be	used to	endorse	or promote products	derived	from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR	``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 AUTHOR 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.
+*/
+#endregion
+
+#region	CVS	Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-09-20 09:42:51 +0200 (on, 20 sep 2006) $
+ * $Revision: 164 $
+ */
+#endregion
+
+using System;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Nodes;
+
+#if	(DEBUG && _DEBUG_TARGET)
+namespace Prebuild.Core.Targets
+{
+	[Target("debug")]
+	public class DebugTarget : ITarget
+	{
+#region	Fields
+
+		private	Kernel m_Kernel	= null;
+
+#endregion
+
+#region	ITarget	Members
+
+		public void	Write()
+		{
+			foreach(SolutionNode s in m_Kernel.Solutions)
+			{
+				Console.WriteLine("Solution	[ {0}, {1} ]", s.Name, s.Path);
+				foreach(string file	in s.Files)
+{
+					Console.WriteLine("\tFile [	{0}	]",	file);
+}
+
+				foreach(ProjectNode	proj in	s.Projects)
+				{
+					Console.WriteLine("\tProject [ {0},	{1}. {2} ]", proj.Name,	proj.Path, proj.Language);
+					foreach(string file	in proj.Files)
+						Console.WriteLine("\t\tFile	[ {0} ]", file);
+				}
+			}
+		}
+
+		public void	Clean()
+		{
+			Console.WriteLine("Not implemented");
+		}
+
+		public string Name
+		{
+			get
+			{
+				return "debug";
+			}
+		}
+
+		public Kernel Kernel
+		{
+			get
+			{
+				return m_Kernel;
+			}
+			set
+			{
+				m_Kernel = value;
+			}
+		}
+
+#endregion
+	}
+}
+#endif
diff --git a/Prebuild/src/Core/Targets/MonoDevelopTarget.cs b/Prebuild/src/Core/Targets/MonoDevelopTarget.cs
new file mode 100644
index 0000000..8620e4b
--- /dev/null
+++ b/Prebuild/src/Core/Targets/MonoDevelopTarget.cs
@@ -0,0 +1,458 @@
+#region BSD License
+/*
+Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2007-02-13 22:07:07 +0100 (ti, 13 feb 2007) $
+ * $Revision: 206 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Nodes;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Targets
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[Target("monodev")]
+	public class MonoDevelopTarget : ITarget
+	{
+		#region Fields
+
+		private Kernel m_Kernel;
+
+		#endregion
+
+		#region Private Methods
+
+		private static string PrependPath(string path)
+		{
+			string tmpPath = Helper.NormalizePath(path, '/');
+			Regex regex = new Regex(@"(\w):/(\w+)");
+			Match match = regex.Match(tmpPath);
+			if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
+			{
+				tmpPath = Helper.NormalizePath(tmpPath);
+			}
+			else
+			{
+				tmpPath = Helper.NormalizePath("./" + tmpPath);
+			}
+
+			return tmpPath;
+		}
+
+		private static string BuildReference(SolutionNode solution, ReferenceNode refr)
+		{
+			string ret = "<ProjectReference type=\"";
+			if(solution.ProjectsTable.ContainsKey(refr.Name))
+			{
+				ret += "Project\"";
+				ret += " localcopy=\"" + refr.LocalCopy.ToString() +  "\" refto=\"" + refr.Name + "\" />";
+			}
+			else
+			{
+				ProjectNode project = (ProjectNode)refr.Parent;
+				string fileRef = FindFileReference(refr.Name, project);
+
+				if(refr.Path != null || fileRef != null)
+				{
+					ret += "Assembly\" refto=\"";
+
+					string finalPath = (refr.Path != null) ? Helper.MakeFilePath(refr.Path, refr.Name, "dll") : fileRef;
+
+					ret += finalPath;
+					ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
+					return ret;
+				}
+
+				ret += "Gac\"";
+				ret += " localcopy=\"" + refr.LocalCopy.ToString() + "\"";
+				ret += " refto=\"";
+				try
+				{
+					//Assembly assem = Assembly.Load(refr.Name);
+					//ret += assem.FullName;
+                    ret += refr.Name;
+				}
+				catch (System.NullReferenceException e)
+				{
+					e.ToString();
+					ret += refr.Name;
+				}
+				ret += "\" />";
+			}
+
+			return ret;
+		}
+
+		private static string FindFileReference(string refName, ProjectNode project) 
+		{
+			foreach(ReferencePathNode refPath in project.ReferencePaths) 
+			{
+				string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
+
+				if(File.Exists(fullPath)) 
+				{
+					return fullPath;
+				}
+			}
+
+			return null;
+		}
+
+		/// <summary>
+		/// Gets the XML doc file.
+		/// </summary>
+		/// <param name="project">The project.</param>
+		/// <param name="conf">The conf.</param>
+		/// <returns></returns>
+		public static string GenerateXmlDocFile(ProjectNode project, ConfigurationNode conf) 
+		{
+			if( conf == null )
+			{
+				throw new ArgumentNullException("conf");
+			}
+			if( project == null )
+			{
+				throw new ArgumentNullException("project");
+			}
+			string docFile = (string)conf.Options["XmlDocFile"];
+			if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
+			{
+				return "False";
+			}
+			return "True";
+		}
+
+		private void WriteProject(SolutionNode solution, ProjectNode project)
+		{
+			string csComp = "Mcs";
+			string netRuntime = "Mono";
+			if(project.Runtime == ClrRuntime.Microsoft)
+			{
+				csComp = "Csc";
+				netRuntime = "MsNet";
+			}
+
+			string projFile = Helper.MakeFilePath(project.FullPath, project.Name, "mdp");
+			StreamWriter ss = new StreamWriter(projFile);
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
+
+			using(ss)
+			{
+				ss.WriteLine(
+					"<Project name=\"{0}\" description=\"\" standardNamespace=\"{1}\" newfilesearch=\"None\" enableviewstate=\"True\" fileversion=\"2.0\" language=\"C#\" clr-version=\"Net_2_0\" ctype=\"DotNetProject\">",
+					project.Name,
+					project.RootNamespace
+					);
+				
+								int count = 0;
+				
+				ss.WriteLine("  <Configurations active=\"{0}\">", solution.ActiveConfig);
+
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					ss.WriteLine("    <Configuration name=\"{0}\" ctype=\"DotNetProjectConfiguration\">", conf.Name);
+					ss.Write("      <Output");
+					ss.Write(" directory=\"{0}\"", Helper.EndPath(Helper.NormalizePath(".\\" + conf.Options["OutputPath"].ToString())));
+					ss.Write(" assembly=\"{0}\"", project.AssemblyName);
+					ss.Write(" executeScript=\"{0}\"", conf.Options["RunScript"]);
+					//ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
+					//ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
+					if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
+					{
+						ss.Write(" executeBeforeBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
+					}
+					else
+					{
+						ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
+					}
+					if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
+					{
+						ss.Write(" executeAfterBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
+					}
+					else
+					{
+						ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
+					}
+					ss.Write(" executeBeforeBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
+					ss.Write(" executeAfterBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
+					ss.WriteLine(" />");
+					
+					ss.Write("      <Build");
+					ss.Write(" debugmode=\"True\"");
+					if (project.Type == ProjectType.WinExe)
+					{
+						ss.Write(" target=\"{0}\"", ProjectType.Exe.ToString());
+					}
+					else
+					{
+						ss.Write(" target=\"{0}\"", project.Type);
+					}
+					ss.WriteLine(" />");
+					
+					ss.Write("      <Execution");
+					ss.Write(" runwithwarnings=\"True\"");
+					ss.Write(" consolepause=\"True\"");
+					ss.Write(" runtime=\"{0}\"", netRuntime);
+                    ss.Write(" clr-version=\"Net_2_0\"");
+					ss.WriteLine(" />");
+					
+					ss.Write("      <CodeGeneration");
+					ss.Write(" compiler=\"{0}\"", csComp);
+					ss.Write(" warninglevel=\"{0}\"", conf.Options["WarningLevel"]);
+					ss.Write(" nowarn=\"{0}\"", conf.Options["SuppressWarnings"]);
+					ss.Write(" includedebuginformation=\"{0}\"", conf.Options["DebugInformation"]);
+					ss.Write(" optimize=\"{0}\"", conf.Options["OptimizeCode"]);
+					ss.Write(" unsafecodeallowed=\"{0}\"", conf.Options["AllowUnsafe"]);
+					ss.Write(" generateoverflowchecks=\"{0}\"", conf.Options["CheckUnderflowOverflow"]);
+					ss.Write(" mainclass=\"{0}\"", project.StartupObject);
+					ss.Write(" target=\"{0}\"", project.Type);
+					ss.Write(" definesymbols=\"{0}\"", conf.Options["CompilerDefines"]);
+					ss.Write(" generatexmldocumentation=\"{0}\"", GenerateXmlDocFile(project, conf));
+					ss.Write(" win32Icon=\"{0}\"", project.AppIcon);
+					ss.Write(" ctype=\"CSharpCompilerParameters\"");
+					ss.WriteLine(" />");
+					ss.WriteLine("    </Configuration>");
+
+					count++;
+				}                
+				ss.WriteLine("  </Configurations>");
+
+				ss.Write("  <DeploymentInformation");
+				ss.Write(" target=\"\"");
+				ss.Write(" script=\"\"");
+				ss.Write(" strategy=\"File\"");
+				ss.WriteLine(">");
+				ss.WriteLine("    <excludeFiles />");
+				ss.WriteLine("  </DeploymentInformation>");
+				
+				ss.WriteLine("  <Contents>");
+				foreach(string file in project.Files)
+				{
+					string buildAction = "Compile";
+					switch(project.Files.GetBuildAction(file))
+					{
+						case BuildAction.None:
+							buildAction = "Nothing";
+							break;
+
+						case BuildAction.Content:
+							buildAction = "Exclude";
+							break;
+
+						case BuildAction.EmbeddedResource:
+							buildAction = "EmbedAsResource";
+							break;
+
+						default:
+							buildAction = "Compile";
+							break;
+					}
+
+					// Sort of a hack, we try and resolve the path and make it relative, if we can.
+					string filePath = PrependPath(file);
+					ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\" dependson=\"\" data=\"\" />", filePath, buildAction);
+				}
+				ss.WriteLine("  </Contents>");
+
+				ss.WriteLine("  <References>");
+				foreach(ReferenceNode refr in project.References)
+				{
+					ss.WriteLine("    {0}", BuildReference(solution, refr));
+				}
+				ss.WriteLine("  </References>");
+
+
+				ss.WriteLine("</Project>");
+			}
+
+			m_Kernel.CurrentWorkingDirectory.Pop();
+		}
+
+		private void WriteCombine(SolutionNode solution)
+		{
+			m_Kernel.Log.Write("Creating MonoDevelop combine and project files");
+			foreach(ProjectNode project in solution.Projects)
+			{
+				if(m_Kernel.AllowProject(project.FilterGroups)) 
+				{
+					m_Kernel.Log.Write("...Creating project: {0}", project.Name);
+					WriteProject(solution, project);
+				}
+			}
+
+			m_Kernel.Log.Write("");
+			string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "mds");
+			StreamWriter ss = new StreamWriter(combFile);
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
+            
+            int count = 0;
+            
+			using(ss)
+			{
+				ss.WriteLine("<Combine name=\"{0}\" fileversion=\"2.0\" description=\"\">", solution.Name);
+
+				count = 0;
+				foreach(ConfigurationNode conf in solution.Configurations)
+				{
+					if(count == 0)
+					{
+						ss.WriteLine("  <Configurations active=\"{0}\">", conf.Name);
+					}
+
+					ss.WriteLine("    <Configuration name=\"{0}\" ctype=\"CombineConfiguration\">", conf.Name);
+					foreach(ProjectNode project in solution.Projects)
+					{
+						ss.WriteLine("      <Entry configuration=\"{1}\" build=\"True\" name=\"{0}\" />", project.Name, conf.Name);
+					}
+					ss.WriteLine("    </Configuration>");
+
+					count++;
+				}
+				ss.WriteLine("  </Configurations>");
+				
+				count = 0;
+				
+				foreach(ProjectNode project in solution.Projects)
+				{                    
+					if(count == 0)
+						ss.WriteLine("  <StartMode startupentry=\"{0}\" single=\"True\">", project.Name);
+
+					ss.WriteLine("    <Execute type=\"None\" entry=\"{0}\" />", project.Name);
+					count++;
+				}
+				ss.WriteLine("  </StartMode>");
+				
+				ss.WriteLine("  <Entries>");
+				foreach(ProjectNode project in solution.Projects)
+				{
+					string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+					ss.WriteLine("    <Entry filename=\"{0}\" />",
+						Helper.MakeFilePath(path, project.Name, "mdp"));
+				}
+				ss.WriteLine("  </Entries>");
+				
+				ss.WriteLine("</Combine>");
+			}
+
+			m_Kernel.CurrentWorkingDirectory.Pop();
+		}
+
+		private void CleanProject(ProjectNode project)
+		{
+			m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
+			string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "mdp");
+			Helper.DeleteIfExists(projectFile);
+		}
+
+		private void CleanSolution(SolutionNode solution)
+		{
+			m_Kernel.Log.Write("Cleaning MonoDevelop combine and project files for", solution.Name);
+
+			string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "mds");
+			Helper.DeleteIfExists(slnFile);
+
+			foreach(ProjectNode project in solution.Projects)
+			{
+				CleanProject(project);
+			}
+            
+			m_Kernel.Log.Write("");
+		}
+
+		#endregion
+
+		#region ITarget Members
+
+		/// <summary>
+		/// Writes the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public void Write(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode solution in kern.Solutions)
+			{
+				WriteCombine(solution);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Cleans the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public virtual void Clean(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode sol in kern.Solutions)
+			{
+				CleanSolution(sol);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return "sharpdev";
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
new file mode 100644
index 0000000..0f0deb2
--- /dev/null
+++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -0,0 +1,621 @@
+#region BSD License
+/*
+Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2007-02-13 21:58:03 +0100 (ti, 13 feb 2007) $
+ * $Revision: 205 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Nodes;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Targets
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[Target("nant")]
+	public class NAntTarget : ITarget
+	{
+		#region Fields
+
+		private Kernel m_Kernel;
+
+		#endregion
+
+		#region Private Methods
+
+		private static string PrependPath(string path)
+		{
+			string tmpPath = Helper.NormalizePath(path, '/');
+			Regex regex = new Regex(@"(\w):/(\w+)");
+			Match match = regex.Match(tmpPath);
+			//if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
+			//{
+				tmpPath = Helper.NormalizePath(tmpPath);
+			//}
+//			else
+//			{
+//				tmpPath = Helper.NormalizePath("./" + tmpPath);
+//			}
+
+			return tmpPath;
+		}
+
+		private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr)
+		{
+			string ret = "";
+			if(solution.ProjectsTable.ContainsKey(refr.Name))
+			{
+				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
+
+                string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
+				
+				return finalPath;
+			}
+			else
+			{
+				ProjectNode project = (ProjectNode)refr.Parent;
+				string fileRef = FindFileReference(refr.Name, project);
+
+				if(refr.Path != null || fileRef != null)
+				{
+					string finalPath = (refr.Path != null) ? Helper.NormalizePath(refr.Path + "/" + refr.Name + ".dll", '/') : fileRef;
+					ret += finalPath;
+					return ret;
+				}
+
+				try
+				{
+                    //Assembly assem = Assembly.Load(refr.Name);
+                    //if (assem != null)
+                    //{
+						//ret += (refr.Name + ".dll");
+					//}
+					//else
+					//{
+						ret += (refr.Name + ".dll");
+					//}
+				}
+				catch (System.NullReferenceException e)
+				{
+					e.ToString();
+					ret += refr.Name + ".dll";
+				}
+			}
+			return ret;
+		}
+
+		private static string BuildReferencePath(SolutionNode solution, ReferenceNode refr)
+		{
+			string ret = "";
+			if(solution.ProjectsTable.ContainsKey(refr.Name))
+			{
+				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
+                string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/');
+
+                return finalPath;
+            }
+			else
+			{
+				ProjectNode project = (ProjectNode)refr.Parent;
+				string fileRef = FindFileReference(refr.Name, project);
+
+				if(refr.Path != null || fileRef != null)
+				{
+					string finalPath = (refr.Path != null) ? Helper.NormalizePath(refr.Path, '/') : fileRef;
+					ret += finalPath;
+					return ret;
+				}
+
+				try
+				{
+					Assembly assem = Assembly.Load(refr.Name);
+					if (assem != null)
+					{
+						ret += "";
+					}
+					else
+					{
+						ret += "";
+					}
+				}
+				catch (System.NullReferenceException e)
+				{
+					e.ToString();
+					ret += "";
+				}
+			}
+			return ret;
+		}
+
+		private static string FindFileReference(string refName, ProjectNode project) 
+		{
+			foreach(ReferencePathNode refPath in project.ReferencePaths) 
+			{
+				string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
+
+				if(File.Exists(fullPath)) 
+				{
+					return fullPath;
+				}
+			}
+
+			return null;
+		}
+
+		/// <summary>
+		/// Gets the XML doc file.
+		/// </summary>
+		/// <param name="project">The project.</param>
+		/// <param name="conf">The conf.</param>
+		/// <returns></returns>
+		public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf) 
+		{
+			if( conf == null )
+			{
+				throw new ArgumentNullException("conf");
+			}
+			if( project == null )
+			{
+				throw new ArgumentNullException("project");
+			}
+			string docFile = (string)conf.Options["XmlDocFile"];
+			//			if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
+			//			{
+			//				return Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
+			//			}
+			return docFile;
+		}
+
+		private void WriteProject(SolutionNode solution, ProjectNode project)
+		{
+			string projFile = Helper.MakeFilePath(project.FullPath, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build");
+			StreamWriter ss = new StreamWriter(projFile);
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
+			bool hasDoc = false;
+
+			using(ss)
+			{
+				ss.WriteLine("<?xml version=\"1.0\" ?>");
+				ss.WriteLine("<project name=\"{0}\" default=\"build\">", project.Name);
+				ss.WriteLine("    <target name=\"{0}\">", "build");
+				ss.WriteLine("        <echo message=\"Build Directory is ${project::get-base-directory()}/${build.dir}\" />");
+				ss.WriteLine("        <mkdir dir=\"${project::get-base-directory()}/${build.dir}\" />");				
+				ss.WriteLine("        <copy todir=\"${project::get-base-directory()}/${build.dir}\">");
+				ss.WriteLine("            <fileset basedir=\"${project::get-base-directory()}\">");
+				foreach(ReferenceNode refr in project.References)
+				{
+					if (refr.LocalCopy)
+					{
+						ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr))+"\" />", '/'));
+					}
+				}
+				ss.WriteLine("            </fileset>");
+				ss.WriteLine("        </copy>");
+				ss.Write("        <csc");
+				ss.Write(" target=\"{0}\"", project.Type.ToString().ToLower());
+				ss.Write(" debug=\"{0}\"", "${build.debug}");
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					if (conf.Options.KeyFile !="")
+					{
+						ss.Write(" keyfile=\"{0}\"", conf.Options.KeyFile);
+						break;
+					}
+				}
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					ss.Write(" unsafe=\"{0}\"", conf.Options.AllowUnsafe);
+					break;
+				}
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					ss.Write(" define=\"{0}\"", conf.Options.CompilerDefines);
+					break;
+				}
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					if (GetXmlDocFile(project, conf) !="")
+					{
+						ss.Write(" doc=\"{0}\"", "${project::get-base-directory()}/${build.dir}/" + GetXmlDocFile(project, conf));
+						hasDoc = true;
+					}
+					break;
+				}
+				ss.Write(" output=\"{0}", "${project::get-base-directory()}/${build.dir}/${project::get-name()}");
+				if (project.Type == ProjectType.Library)
+				{
+					ss.Write(".dll\"");
+				}
+				else
+				{
+					ss.Write(".exe\"");
+				}
+				if(project.AppIcon != null && project.AppIcon.Length != 0)
+				{
+					ss.Write(" win32icon=\"{0}\"", Helper.NormalizePath(project.AppIcon,'/'));
+				}
+				ss.WriteLine(">");
+                ss.WriteLine("            <resources prefix=\"{0}\" dynamicprefix=\"true\" >", project.RootNamespace);
+                foreach (string file in project.Files)
+                {
+                    switch (project.Files.GetBuildAction(file))
+                    {
+                        case BuildAction.EmbeddedResource:
+                            ss.WriteLine("                {0}", "<include name=\"" + Helper.NormalizePath(PrependPath(file), '/') + "\" />");
+                            break;
+                        default:
+                            if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
+                            {
+                                ss.WriteLine("                <include name=\"{0}\" />", file.Substring(0, file.LastIndexOf('.')) + ".resx");
+                            }
+                            break;
+                    }
+                }
+                //if (project.Files.GetSubType(file).ToString() != "Code")
+                //{
+                //	ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");                 
+
+                ss.WriteLine("            </resources>");
+				ss.WriteLine("            <sources failonempty=\"true\">");
+				foreach(string file in project.Files)
+				{
+					switch(project.Files.GetBuildAction(file))
+					{
+						case BuildAction.Compile:
+							ss.WriteLine("                <include name=\"" + Helper.NormalizePath(PrependPath(file), '/') + "\" />");
+							break;
+						default:
+							break;
+					}
+				}
+				ss.WriteLine("            </sources>");
+				ss.WriteLine("            <references basedir=\"${project::get-base-directory()}\">");
+				ss.WriteLine("                <lib>");
+				ss.WriteLine("                    <include name=\"${project::get-base-directory()}\" />");
+				ss.WriteLine("                    <include name=\"${project::get-base-directory()}/${build.dir}\" />");
+				ss.WriteLine("                </lib>");
+				foreach(ReferenceNode refr in project.References)
+				{
+				    string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');
+					ss.WriteLine("                <include name=\""+ path + "\" />" );
+				}
+				ss.WriteLine("            </references>");
+                
+				ss.WriteLine("        </csc>");
+
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    if (!String.IsNullOrEmpty(conf.Options.OutputPath))
+                    {
+                        string targetDir = Helper.NormalizePath(conf.Options.OutputPath, '/');
+                        
+                        ss.WriteLine("        <echo message=\"Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/" + targetDir + "\" />");
+
+                        ss.WriteLine("        <mkdir dir=\"${project::get-base-directory()}/" + targetDir + "\"/>");
+
+                        ss.WriteLine("        <copy todir=\"${project::get-base-directory()}/" + targetDir + "\">");
+                        ss.WriteLine("            <fileset basedir=\"${project::get-base-directory()}/${build.dir}/\" >");
+                        ss.WriteLine("                <include name=\"*.dll\"/>");
+                        ss.WriteLine("                <include name=\"*.exe\"/>");
+                        ss.WriteLine("            </fileset>");
+                        ss.WriteLine("        </copy>");
+                        break;
+                    }
+                }
+			    
+				ss.WriteLine("    </target>");
+
+				ss.WriteLine("    <target name=\"clean\">");
+				ss.WriteLine("        <delete dir=\"${bin.dir}\" failonerror=\"false\" />");
+				ss.WriteLine("        <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
+				ss.WriteLine("    </target>");
+
+				ss.WriteLine("    <target name=\"doc\" description=\"Creates documentation.\">");
+				if (hasDoc)
+				{
+					ss.WriteLine("        <property name=\"doc.target\" value=\"\" />");
+					ss.WriteLine("        <if test=\"${platform::is-unix()}\">");
+					ss.WriteLine("            <property name=\"doc.target\" value=\"Web\" />");
+					ss.WriteLine("        </if>");
+					ss.WriteLine("        <ndoc failonerror=\"false\" verbose=\"true\">");
+					ss.WriteLine("            <assemblies basedir=\"${project::get-base-directory()}\">");
+					ss.Write("                <include name=\"${build.dir}/${project::get-name()}");
+					if (project.Type == ProjectType.Library)
+					{
+						ss.WriteLine(".dll\" />");
+					}
+					else
+					{
+						ss.WriteLine(".exe\" />");
+					}
+
+					ss.WriteLine("            </assemblies>");
+					ss.WriteLine("            <summaries basedir=\"${project::get-base-directory()}\">");
+					ss.WriteLine("                <include name=\"${build.dir}/${project::get-name()}.xml\"/>");
+					ss.WriteLine("            </summaries>");
+					ss.WriteLine("            <referencepaths basedir=\"${project::get-base-directory()}\">");
+					ss.WriteLine("                <include name=\"${build.dir}\" />");
+					//					foreach(ReferenceNode refr in project.References)
+					//					{
+					//						string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReferencePath(solution, refr)), '/');
+					//						if (path != "")
+					//						{
+					//							ss.WriteLine("                <include name=\"{0}\" />", path);
+					//						}
+					//					}
+					ss.WriteLine("            </referencepaths>");
+					ss.WriteLine("            <documenters>");
+					ss.WriteLine("                <documenter name=\"MSDN\">");
+                    ss.WriteLine("                    <property name=\"OutputDirectory\" value=\"${project::get-base-directory()}/${build.dir}/doc/${project::get-name()}\" />");
+					ss.WriteLine("                    <property name=\"OutputTarget\" value=\"${doc.target}\" />");
+					ss.WriteLine("                    <property name=\"HtmlHelpName\" value=\"${project::get-name()}\" />");
+					ss.WriteLine("                    <property name=\"IncludeFavorites\" value=\"False\" />");
+					ss.WriteLine("                    <property name=\"Title\" value=\"${project::get-name()} SDK Documentation\" />");
+					ss.WriteLine("                    <property name=\"SplitTOCs\" value=\"False\" />");
+					ss.WriteLine("                    <property name=\"DefaulTOC\" value=\"\" />");
+					ss.WriteLine("                    <property name=\"ShowVisualBasic\" value=\"True\" />");
+					ss.WriteLine("                    <property name=\"AutoDocumentConstructors\" value=\"True\" />");
+					ss.WriteLine("                    <property name=\"ShowMissingSummaries\" value=\"${build.debug}\" />");
+					ss.WriteLine("                    <property name=\"ShowMissingRemarks\" value=\"${build.debug}\" />");
+					ss.WriteLine("                    <property name=\"ShowMissingParams\" value=\"${build.debug}\" />");
+					ss.WriteLine("                    <property name=\"ShowMissingReturns\" value=\"${build.debug}\" />");
+					ss.WriteLine("                    <property name=\"ShowMissingValues\" value=\"${build.debug}\" />");
+					ss.WriteLine("                    <property name=\"DocumentInternals\" value=\"False\" />");
+					ss.WriteLine("                    <property name=\"DocumentPrivates\" value=\"False\" />");
+					ss.WriteLine("                    <property name=\"DocumentProtected\" value=\"True\" />");
+					ss.WriteLine("                    <property name=\"DocumentEmptyNamespaces\" value=\"${build.debug}\" />");
+					ss.WriteLine("                    <property name=\"IncludeAssemblyVersion\" value=\"True\" />");
+					ss.WriteLine("                </documenter>");
+					ss.WriteLine("            </documenters>");
+					ss.WriteLine("        </ndoc>");
+				}
+				ss.WriteLine("    </target>");
+				ss.WriteLine("</project>");
+			}                
+			m_Kernel.CurrentWorkingDirectory.Pop();
+		}
+
+		private void WriteCombine(SolutionNode solution)
+		{
+			m_Kernel.Log.Write("Creating NAnt build files");
+			foreach(ProjectNode project in solution.Projects)
+			{
+				if(m_Kernel.AllowProject(project.FilterGroups)) 
+				{
+					m_Kernel.Log.Write("...Creating project: {0}", project.Name);
+					WriteProject(solution, project);
+				}
+			}
+
+			m_Kernel.Log.Write("");
+			string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "build");
+			StreamWriter ss = new StreamWriter(combFile);
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
+            
+			using(ss)
+			{
+				ss.WriteLine("<?xml version=\"1.0\" ?>");
+				ss.WriteLine("<project name=\"{0}\" default=\"build\">", solution.Name);
+				ss.WriteLine("    <echo message=\"Using '${nant.settings.currentframework}' Framework\"/>");
+				ss.WriteLine();
+
+				//ss.WriteLine("    <property name=\"dist.dir\" value=\"dist\" />");
+				//ss.WriteLine("    <property name=\"source.dir\" value=\"source\" />");
+				ss.WriteLine("    <property name=\"bin.dir\" value=\"bin\" />");
+				ss.WriteLine("    <property name=\"obj.dir\" value=\"obj\" />");
+				ss.WriteLine("    <property name=\"doc.dir\" value=\"doc\" />");
+				ss.WriteLine("    <property name=\"project.main.dir\" value=\"${project::get-base-directory()}\" />");
+
+				foreach(ConfigurationNode conf in solution.Configurations)
+				{
+					// Set the project.config to a non-debug configuration
+					if( conf.Options["DebugInformation"].ToString().ToLower() != "true" )
+					{
+						ss.WriteLine("    <property name=\"project.config\" value=\"{0}\" />", conf.Name);
+					}
+					ss.WriteLine();
+					ss.WriteLine("    <target name=\"{0}\" description=\"\">", conf.Name);
+					ss.WriteLine("        <property name=\"project.config\" value=\"{0}\" />", conf.Name);
+					ss.WriteLine("        <property name=\"build.debug\" value=\"{0}\" />", conf.Options["DebugInformation"].ToString().ToLower());
+					ss.WriteLine("    </target>");
+					ss.WriteLine();
+				}
+
+				ss.WriteLine("    <target name=\"net-1.1\" description=\"Sets framework to .NET 1.1\">");
+				ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"net-1.1\" />");
+				ss.WriteLine("    </target>");
+				ss.WriteLine();
+    
+				ss.WriteLine("    <target name=\"net-2.0\" description=\"Sets framework to .NET 2.0\">");
+				ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"net-2.0\" />");
+				ss.WriteLine("    </target>");
+				ss.WriteLine();
+
+				ss.WriteLine("    <target name=\"mono-2.0\" description=\"Sets framework to mono 2.0\">");
+				ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"mono-2.0\" />");
+				ss.WriteLine("    </target>");
+				ss.WriteLine();
+
+				ss.WriteLine("    <target name=\"mono-1.0\" description=\"Sets framework to mono 1.0\">");
+				ss.WriteLine("        <property name=\"nant.settings.currentframework\" value=\"mono-1.0\" />");
+				ss.WriteLine("    </target>");
+				ss.WriteLine();
+
+				ss.WriteLine("    <target name=\"init\" description=\"\">");
+				ss.WriteLine("        <call target=\"${project.config}\" />");
+				ss.WriteLine("        <sysinfo />");
+				ss.WriteLine("        <echo message=\"Platform ${sys.os.platform}\" />");
+				ss.WriteLine("        <property name=\"build.dir\" value=\"${bin.dir}/${project.config}\" />");
+				ss.WriteLine("    </target>");
+				ss.WriteLine();
+				
+				ss.WriteLine("    <target name=\"clean\" description=\"\">");
+				ss.WriteLine("        <echo message=\"Deleting all builds from all configurations\" />");
+				//ss.WriteLine("        <delete dir=\"${dist.dir}\" failonerror=\"false\" />");
+				ss.WriteLine("        <delete dir=\"${bin.dir}\" failonerror=\"false\" />");
+				ss.WriteLine("        <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
+				foreach(ProjectNode project in solution.Projects)
+				{
+					string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+					ss.Write("        <nant buildfile=\"{0}\"",
+						Helper.NormalizePath(Helper.MakeFilePath(path, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build"),'/'));
+					ss.WriteLine(" target=\"clean\" />");
+				}
+				ss.WriteLine("    </target>");
+				ss.WriteLine();
+
+				ss.WriteLine("    <target name=\"build\" depends=\"init\" description=\"\">");
+				
+				foreach(ProjectNode project in solution.ProjectsTableOrder)
+				{
+					string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+					ss.Write("        <nant buildfile=\"{0}\"",
+						Helper.NormalizePath(Helper.MakeFilePath(path, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build"),'/'));
+					ss.WriteLine(" target=\"build\" />");
+				}
+				ss.WriteLine("    </target>");
+				ss.WriteLine();
+
+				ss.WriteLine("    <target name=\"build-release\" depends=\"Release, init, build\" description=\"Builds in Release mode\" />");
+				ss.WriteLine();
+				ss.WriteLine("    <target name=\"build-debug\" depends=\"Debug, init, build\" description=\"Builds in Debug mode\" />");
+				ss.WriteLine();
+				//ss.WriteLine("    <target name=\"package\" depends=\"clean, doc, copyfiles, zip\" description=\"Builds in Release mode\" />");
+				ss.WriteLine("    <target name=\"package\" depends=\"clean, doc\" description=\"Builds all\" />");
+				ss.WriteLine();
+
+                ss.WriteLine("    <target name=\"doc\" depends=\"build-release\">");
+                ss.WriteLine("        <echo message=\"Generating all documentation from all builds\" />");
+                foreach (ProjectNode project in solution.Projects)
+                {
+                    string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+                    ss.Write("        <nant buildfile=\"{0}\"",
+                        Helper.NormalizePath(Helper.MakeFilePath(path, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build"), '/'));
+                    ss.WriteLine(" target=\"doc\" />");
+                }
+				ss.WriteLine("    </target>");
+				ss.WriteLine();    
+				ss.WriteLine("</project>");
+			}
+
+			m_Kernel.CurrentWorkingDirectory.Pop();
+		}
+
+		private void CleanProject(ProjectNode project)
+		{
+			m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
+			string projectFile = Helper.MakeFilePath(project.FullPath, project.Name + (project.Type == ProjectType.Library ? ".dll" : ".exe"), "build");
+			Helper.DeleteIfExists(projectFile);
+		}
+
+		private void CleanSolution(SolutionNode solution)
+		{
+			m_Kernel.Log.Write("Cleaning NAnt build files for", solution.Name);
+
+			string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "build");
+			Helper.DeleteIfExists(slnFile);
+
+			foreach(ProjectNode project in solution.Projects)
+			{
+				CleanProject(project);
+			}
+            
+			m_Kernel.Log.Write("");
+		}
+
+		#endregion
+
+		#region ITarget Members
+
+		/// <summary>
+		/// Writes the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public void Write(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode solution in kern.Solutions)
+			{
+				WriteCombine(solution);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Cleans the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public virtual void Clean(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode sol in kern.Solutions)
+			{
+				CleanSolution(sol);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return "nant";
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Targets/SharpDevelop2Target.cs b/Prebuild/src/Core/Targets/SharpDevelop2Target.cs
new file mode 100644
index 0000000..bc84b96
--- /dev/null
+++ b/Prebuild/src/Core/Targets/SharpDevelop2Target.cs
@@ -0,0 +1,90 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-27 16:49:58 -0800 (Fri, 27 Jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+
+using Prebuild.Core.Attributes;
+
+namespace Prebuild.Core.Targets
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[Target("sharpdev2")]
+	public class SharpDevelop2Target : VS2005Target
+	{
+		#region Private Methods
+		private void SetSharpDevelop2()
+		{
+			this.VersionName = "SharpDevelop2";
+		}
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Writes the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public override void Write(Kernel kern)
+		{
+			SetSharpDevelop2();
+			base.Write(kern);
+		}
+
+		/// <summary>
+		/// Cleans the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public override void Clean(Kernel kern)
+		{
+			SetSharpDevelop2();
+			base.Clean(kern);
+		}
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public override string Name
+		{
+			get
+			{
+				return "sharpdev2";
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Targets/SharpDevelopTarget.cs b/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
new file mode 100644
index 0000000..c725730
--- /dev/null
+++ b/Prebuild/src/Core/Targets/SharpDevelopTarget.cs
@@ -0,0 +1,437 @@
+#region BSD License
+/*
+Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2007-02-13 21:58:03 +0100 (ti, 13 feb 2007) $
+ * $Revision: 205 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Reflection;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Nodes;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Targets
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[Target("sharpdev")]
+	public class SharpDevelopTarget : ITarget
+	{
+		#region Fields
+
+		private Kernel m_Kernel;
+
+		#endregion
+
+		#region Private Methods
+
+		private static string PrependPath(string path)
+		{
+			string tmpPath = Helper.NormalizePath(path, '/');
+			Regex regex = new Regex(@"(\w):/(\w+)");
+			Match match = regex.Match(tmpPath);
+			if(match.Success || tmpPath[0] == '.' || tmpPath[0] == '/')
+			{
+				tmpPath = Helper.NormalizePath(tmpPath);
+			}
+			else
+			{
+				tmpPath = Helper.NormalizePath("./" + tmpPath);
+			}
+
+			return tmpPath;
+		}
+
+		private static string BuildReference(SolutionNode solution, ReferenceNode refr)
+		{
+			string ret = "<Reference type=\"";
+			if(solution.ProjectsTable.ContainsKey(refr.Name))
+			{
+				ret += "Project\" refto=\"" + refr.Name;
+				ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
+			}
+			else
+			{
+				ProjectNode project = (ProjectNode)refr.Parent;
+				string fileRef = FindFileReference(refr.Name, project);
+
+				if(refr.Path != null || fileRef != null)
+				{
+					ret += "Assembly\" refto=\"";
+
+					string finalPath = (refr.Path != null) ? Helper.MakeFilePath(refr.Path, refr.Name, "dll") : fileRef;
+
+					ret += finalPath;
+					ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
+					return ret;
+				}
+
+				ret += "Gac\" refto=\"";
+				try
+				{
+					//Assembly assem = Assembly.Load(refr.Name);
+                    ret += refr.Name;// assem.FullName;
+				}
+				catch (System.NullReferenceException e)
+				{
+					e.ToString();
+					ret += refr.Name;
+				}
+				ret += "\" localcopy=\"" + refr.LocalCopy.ToString() + "\" />";
+			}
+
+			return ret;
+		}
+
+		private static string FindFileReference(string refName, ProjectNode project) 
+		{
+			foreach(ReferencePathNode refPath in project.ReferencePaths) 
+			{
+				string fullPath = Helper.MakeFilePath(refPath.Path, refName, "dll");
+
+				if(File.Exists(fullPath)) 
+				{
+					return fullPath;
+				}
+			}
+
+			return null;
+		}
+
+		/// <summary>
+		/// Gets the XML doc file.
+		/// </summary>
+		/// <param name="project">The project.</param>
+		/// <param name="conf">The conf.</param>
+		/// <returns></returns>
+		public static string GenerateXmlDocFile(ProjectNode project, ConfigurationNode conf) 
+		{
+			if( conf == null )
+			{
+				throw new ArgumentNullException("conf");
+			}
+			if( project == null )
+			{
+				throw new ArgumentNullException("project");
+			}
+			string docFile = (string)conf.Options["XmlDocFile"];
+			if(docFile != null && docFile.Length == 0)//default to assembly name if not specified
+			{
+				return "False";
+			}
+			return "True";
+		}
+
+		private void WriteProject(SolutionNode solution, ProjectNode project)
+		{
+			string csComp = "Csc";
+			string netRuntime = "MsNet";
+			if(project.Runtime == ClrRuntime.Mono)
+			{
+				csComp = "Mcs";
+				netRuntime = "Mono";
+			}
+
+			string projFile = Helper.MakeFilePath(project.FullPath, project.Name, "prjx");
+			StreamWriter ss = new StreamWriter(projFile);
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(projFile));
+
+			using(ss)
+			{
+				ss.WriteLine(
+					"<Project name=\"{0}\" standardNamespace=\"{1}\" description=\"\" newfilesearch=\"None\" enableviewstate=\"True\" version=\"1.1\" projecttype=\"C#\">",
+					project.Name,
+					project.RootNamespace
+					);
+
+				ss.WriteLine("  <Contents>");
+				foreach(string file in project.Files)
+				{
+					string buildAction = "Compile";
+					switch(project.Files.GetBuildAction(file))
+					{
+						case BuildAction.None:
+							buildAction = "Nothing";
+							break;
+
+						case BuildAction.Content:
+							buildAction = "Exclude";
+							break;
+
+						case BuildAction.EmbeddedResource:
+							buildAction = "EmbedAsResource";
+							break;
+
+						default:
+							buildAction = "Compile";
+							break;
+					}
+
+					// Sort of a hack, we try and resolve the path and make it relative, if we can.
+					string filePath = PrependPath(file);
+					ss.WriteLine("    <File name=\"{0}\" subtype=\"Code\" buildaction=\"{1}\" dependson=\"\" data=\"\" />", filePath, buildAction);
+				}
+				ss.WriteLine("  </Contents>");
+
+				ss.WriteLine("  <References>");
+				foreach(ReferenceNode refr in project.References)
+				{
+					ss.WriteLine("    {0}", BuildReference(solution, refr));
+				}
+				ss.WriteLine("  </References>");
+
+				ss.Write("  <DeploymentInformation");
+				ss.Write(" target=\"\"");
+				ss.Write(" script=\"\"");
+				ss.Write(" strategy=\"File\"");
+				ss.WriteLine(" />");
+
+				int count = 0;
+				
+				ss.WriteLine("  <Configurations active=\"{0}\">", solution.ActiveConfig);
+
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					ss.Write("    <Configuration");
+					ss.Write(" runwithwarnings=\"True\"");
+					ss.Write(" name=\"{0}\"", conf.Name);
+					ss.WriteLine(">");
+					ss.Write("      <CodeGeneration");
+					ss.Write(" runtime=\"{0}\"", netRuntime);
+					ss.Write(" compiler=\"{0}\"", csComp);
+					ss.Write(" compilerversion=\"\"");
+					ss.Write(" warninglevel=\"{0}\"", conf.Options["WarningLevel"]);
+					ss.Write(" nowarn=\"{0}\"", conf.Options["SuppressWarnings"]);
+					ss.Write(" includedebuginformation=\"{0}\"", conf.Options["DebugInformation"]);
+					ss.Write(" optimize=\"{0}\"", conf.Options["OptimizeCode"]);
+					ss.Write(" unsafecodeallowed=\"{0}\"", conf.Options["AllowUnsafe"]);
+					ss.Write(" generateoverflowchecks=\"{0}\"", conf.Options["CheckUnderflowOverflow"]);
+					ss.Write(" mainclass=\"{0}\"", project.StartupObject);
+					ss.Write(" target=\"{0}\"", project.Type);
+					ss.Write(" definesymbols=\"{0}\"", conf.Options["CompilerDefines"]);
+					ss.Write(" generatexmldocumentation=\"{0}\"", GenerateXmlDocFile(project, conf));
+					ss.Write(" win32Icon=\"{0}\"", Helper.NormalizePath(".\\" + project.AppIcon));
+					ss.Write(" noconfig=\"{0}\"", "False");
+					ss.Write(" nostdlib=\"{0}\"", conf.Options["NoStdLib"]);
+					ss.WriteLine(" />");
+
+					ss.Write("      <Execution");
+					ss.Write(" commandlineparameters=\"\"");
+					ss.Write(" consolepause=\"True\"");
+					ss.WriteLine(" />");
+
+					ss.Write("      <Output");
+					ss.Write(" directory=\".\\{0}\"", Helper.NormalizePath(conf.Options["OutputPath"].ToString()));
+					ss.Write(" assembly=\"{0}\"", project.AssemblyName);
+					ss.Write(" executeScript=\"{0}\"", conf.Options["RunScript"]);
+					if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
+					{
+						ss.Write(" executeBeforeBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
+					}
+					else
+					{
+						ss.Write(" executeBeforeBuild=\"{0}\"", conf.Options["PreBuildEvent"]);
+					}
+					if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
+					{
+						ss.Write(" executeAfterBuild=\"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
+					}
+					else
+					{
+						ss.Write(" executeAfterBuild=\"{0}\"", conf.Options["PostBuildEvent"]);
+					}
+					ss.Write(" executeBeforeBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
+					ss.Write(" executeAfterBuildArguments=\"{0}\"", conf.Options["PreBuildEventArgs"]);
+					ss.WriteLine(" />");
+					ss.WriteLine("    </Configuration>");
+
+					count++;
+				}  
+				ss.WriteLine("  </Configurations>");
+				ss.WriteLine("</Project>");
+			}
+
+			m_Kernel.CurrentWorkingDirectory.Pop();
+		}
+
+		private void WriteCombine(SolutionNode solution)
+		{
+			m_Kernel.Log.Write("Creating SharpDevelop combine and project files");
+			foreach(ProjectNode project in solution.Projects)
+			{
+				if(m_Kernel.AllowProject(project.FilterGroups)) 
+				{
+					m_Kernel.Log.Write("...Creating project: {0}", project.Name);
+					WriteProject(solution, project);
+				}
+			}
+
+			m_Kernel.Log.Write("");
+			string combFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "cmbx");
+			StreamWriter ss = new StreamWriter(combFile);
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(combFile));
+            
+			using(ss)
+			{
+				ss.WriteLine("<Combine fileversion=\"1.0\" name=\"{0}\" description=\"\">", solution.Name);
+                
+				int count = 0;
+				foreach(ProjectNode project in solution.Projects)
+				{                    
+					if(count == 0)
+						ss.WriteLine("  <StartMode startupentry=\"{0}\" single=\"True\">", project.Name);
+
+					ss.WriteLine("    <Execute entry=\"{0}\" type=\"None\" />", project.Name);
+					count++;
+				}
+				ss.WriteLine("  </StartMode>");
+                
+				ss.WriteLine("  <Entries>");
+				foreach(ProjectNode project in solution.Projects)
+				{
+					string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+					ss.WriteLine("    <Entry filename=\"{0}\" />",
+						Helper.MakeFilePath(path, project.Name, "prjx"));
+				}
+				ss.WriteLine("  </Entries>");
+
+				count = 0;
+				foreach(ConfigurationNode conf in solution.Configurations)
+				{
+					if(count == 0)
+					{
+						ss.WriteLine("  <Configurations active=\"{0}\">", conf.Name);
+					}
+
+					ss.WriteLine("    <Configuration name=\"{0}\">", conf.Name);
+					foreach(ProjectNode project in solution.Projects)
+					{
+						ss.WriteLine("      <Entry name=\"{0}\" configurationname=\"{1}\" build=\"True\" />", project.Name, conf.Name);
+					}
+					ss.WriteLine("    </Configuration>");
+
+					count++;
+				}
+				ss.WriteLine("  </Configurations>");
+				ss.WriteLine("</Combine>");
+			}
+
+			m_Kernel.CurrentWorkingDirectory.Pop();
+		}
+
+		private void CleanProject(ProjectNode project)
+		{
+			m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
+			string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, "prjx");
+			Helper.DeleteIfExists(projectFile);
+		}
+
+		private void CleanSolution(SolutionNode solution)
+		{
+			m_Kernel.Log.Write("Cleaning SharpDevelop combine and project files for", solution.Name);
+
+			string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "cmbx");
+			Helper.DeleteIfExists(slnFile);
+
+			foreach(ProjectNode project in solution.Projects)
+			{
+				CleanProject(project);
+			}
+            
+			m_Kernel.Log.Write("");
+		}
+
+		#endregion
+
+		#region ITarget Members
+
+		/// <summary>
+		/// Writes the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public void Write(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode solution in kern.Solutions)
+			{
+				WriteCombine(solution);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Cleans the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public virtual void Clean(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode sol in kern.Solutions)
+			{
+				CleanSolution(sol);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public string Name
+		{
+			get
+			{
+				return "sharpdev";
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Targets/VS2002Target.cs b/Prebuild/src/Core/Targets/VS2002Target.cs
new file mode 100644
index 0000000..66216dc
--- /dev/null
+++ b/Prebuild/src/Core/Targets/VS2002Target.cs
@@ -0,0 +1,96 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+
+using Prebuild.Core.Attributes;
+
+namespace Prebuild.Core.Targets
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[Target("vs2002")]
+	public class VS2002Target : VS2003Target
+	{
+		#region Private Methods
+
+		private void SetVS2002()
+		{
+			this.SolutionVersion = "7.00";
+			this.ProductVersion = "7.0.9254";
+			this.SchemaVersion = "1.0";
+			this.VersionName = "2002";
+			this.Version = VSVersion.VS70;
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Writes the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public override void Write(Kernel kern)
+		{
+			SetVS2002();
+			base.Write(kern);
+		}
+
+		/// <summary>
+		/// Cleans the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public override void Clean(Kernel kern)
+		{
+			SetVS2002();
+			base.Clean(kern);
+		}
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public override string Name
+		{
+			get
+			{
+				return "vs2002";
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Targets/VS2003Target.cs b/Prebuild/src/Core/Targets/VS2003Target.cs
new file mode 100644
index 0000000..b3236a8
--- /dev/null
+++ b/Prebuild/src/Core/Targets/VS2003Target.cs
@@ -0,0 +1,633 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-09-29 21:11:40 +0200 (fr, 29 sep 2006) $
+ * $Revision: 177 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Nodes;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Targets
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum VSVersion
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		VS70,
+		/// <summary>
+		/// 
+		/// </summary>
+		VS71,
+		/// <summary>
+		/// 
+		/// </summary>
+		VS80
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	[Target("vs2003")]
+	public class VS2003Target : ITarget
+	{
+
+		#region Fields
+
+		string solutionVersion = "8.00";
+		string productVersion = "7.10.3077";
+		string schemaVersion = "2.0";
+		string versionName = "2003";
+		VSVersion version = VSVersion.VS71;
+
+		Hashtable m_Tools;
+		Kernel m_Kernel;
+
+		/// <summary>
+		/// Gets or sets the solution version.
+		/// </summary>
+		/// <value>The solution version.</value>
+		protected string SolutionVersion
+		{
+			get
+			{
+				return this.solutionVersion;
+			}
+			set
+			{
+				this.solutionVersion = value;
+			}
+		}
+		/// <summary>
+		/// Gets or sets the product version.
+		/// </summary>
+		/// <value>The product version.</value>
+		protected string ProductVersion
+		{
+			get
+			{
+				return this.productVersion;
+			}
+			set
+			{
+				this.productVersion = value;
+			}
+		}
+		/// <summary>
+		/// Gets or sets the schema version.
+		/// </summary>
+		/// <value>The schema version.</value>
+		protected string SchemaVersion
+		{
+			get
+			{
+				return this.schemaVersion;
+			}
+			set
+			{
+				this.schemaVersion = value;
+			}
+		}
+		/// <summary>
+		/// Gets or sets the name of the version.
+		/// </summary>
+		/// <value>The name of the version.</value>
+		protected string VersionName
+		{
+			get
+			{
+				return this.versionName;
+			}
+			set
+			{
+				this.versionName = value;
+			}
+		}
+		/// <summary>
+		/// Gets or sets the version.
+		/// </summary>
+		/// <value>The version.</value>
+		protected VSVersion Version
+		{
+			get
+			{
+				return this.version;
+			}
+			set
+			{
+				this.version = value;
+			}
+		}
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="VS2003Target"/> class.
+		/// </summary>
+		public VS2003Target()
+		{
+			m_Tools = new Hashtable();
+
+			m_Tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP");
+			m_Tools["VB.NET"] = new ToolInfo("VB.NET", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic");
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		private string MakeRefPath(ProjectNode project)
+		{
+			string ret = "";
+			foreach(ReferencePathNode node in project.ReferencePaths)
+			{
+				try
+				{
+					string fullPath = Helper.ResolvePath(node.Path);
+					if(ret.Length < 1)
+					{
+						ret = fullPath;
+					}
+					else
+					{
+						ret += ";" + fullPath;
+					}
+				}
+				catch(ArgumentException)
+				{
+					m_Kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
+				}
+			}
+
+			return ret;
+		}
+
+		private void WriteProject(SolutionNode solution, ProjectNode project)
+		{
+			if(!m_Tools.ContainsKey(project.Language))
+			{
+				throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
+			}
+
+			ToolInfo toolInfo = (ToolInfo)m_Tools[project.Language];
+			string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
+			StreamWriter ps = new StreamWriter(projectFile);
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
+
+			IEnumerator enumerator;
+			//ConfigurationNode scripts;
+
+			using(ps)
+			{
+				ps.WriteLine("<VisualStudioProject>");
+				ps.WriteLine("    <{0}", toolInfo.XmlTag);
+				ps.WriteLine("\t\t\t\tProjectType = \"Local\"");
+				ps.WriteLine("\t\t\t\tProductVersion = \"{0}\"", this.ProductVersion);
+				ps.WriteLine("\t\t\t\tSchemaVersion = \"{0}\"", this.SchemaVersion);
+				ps.WriteLine("\t\t\t\tProjectGuid = \"{{{0}}}\"", project.Guid.ToString().ToUpper());
+				ps.WriteLine("\t\t>");
+
+				ps.WriteLine("\t\t\t\t<Build>");
+				ps.WriteLine("            <Settings");
+				ps.WriteLine("\t\t\t\t  ApplicationIcon = \"{0}\"",project.AppIcon);
+				ps.WriteLine("\t\t\t\t  AssemblyKeyContainerName = \"\"");
+				ps.WriteLine("\t\t\t\t  AssemblyName = \"{0}\"", project.AssemblyName);
+				ps.WriteLine("\t\t\t\t  AssemblyOriginatorKeyFile = \"\"");
+				ps.WriteLine("\t\t\t\t  DefaultClientScript = \"JScript\"");
+				ps.WriteLine("\t\t\t\t  DefaultHTMLPageLayout = \"Grid\"");
+				ps.WriteLine("\t\t\t\t  DefaultTargetSchema = \"IE50\"");
+				ps.WriteLine("\t\t\t\t  DelaySign = \"false\"");
+
+				if(this.Version == VSVersion.VS70)
+				{
+					ps.WriteLine("\t\t\t\t  NoStandardLibraries = \"false\"");
+				}
+
+				ps.WriteLine("\t\t\t\t  OutputType = \"{0}\"", project.Type.ToString());
+
+				enumerator = project.Configurations.GetEnumerator();
+				enumerator.Reset();
+				enumerator.MoveNext();
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					if (conf.Options["PreBuildEvent"] != null && conf.Options["PreBuildEvent"].ToString().Length != 0)
+					{
+						ps.WriteLine("\t\t\t\t  PreBuildEvent = \"{0}\"", Helper.NormalizePath(conf.Options["PreBuildEvent"].ToString()));
+					}
+					else
+					{
+						ps.WriteLine("\t\t\t\t  PreBuildEvent = \"{0}\"", conf.Options["PreBuildEvent"]);
+					}
+					if (conf.Options["PostBuildEvent"] != null && conf.Options["PostBuildEvent"].ToString().Length != 0)
+					{
+						ps.WriteLine("\t\t\t\t  PostBuildEvent = \"{0}\"", Helper.NormalizePath(conf.Options["PostBuildEvent"].ToString()));
+					}
+					else
+					{
+						ps.WriteLine("\t\t\t\t  PostBuildEvent = \"{0}\"", conf.Options["PostBuildEvent"]);
+					}
+					if (conf.Options["RunPostBuildEvent"] == null)
+					{
+						ps.WriteLine("\t\t\t\t  RunPostBuildEvent = \"{0}\"", "OnBuildSuccess");
+					}
+					else
+					{
+						ps.WriteLine("\t\t\t\t  RunPostBuildEvent = \"{0}\"", conf.Options["RunPostBuildEvent"]);
+					}
+					break;
+				}
+				
+				ps.WriteLine("\t\t\t\t  RootNamespace = \"{0}\"", project.RootNamespace);
+				ps.WriteLine("\t\t\t\t  StartupObject = \"{0}\"", project.StartupObject);
+				ps.WriteLine("\t\t     >");
+
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					ps.WriteLine("\t\t\t\t  <Config");
+					ps.WriteLine("\t\t\t\t      Name = \"{0}\"", conf.Name);
+					ps.WriteLine("\t\t\t\t      AllowUnsafeBlocks = \"{0}\"", conf.Options["AllowUnsafe"].ToString().ToLower());
+					ps.WriteLine("\t\t\t\t      BaseAddress = \"{0}\"", conf.Options["BaseAddress"]);
+					ps.WriteLine("\t\t\t\t      CheckForOverflowUnderflow = \"{0}\"", conf.Options["CheckUnderflowOverflow"].ToString().ToLower());
+					ps.WriteLine("\t\t\t\t      ConfigurationOverrideFile = \"\"");
+					ps.WriteLine("\t\t\t\t      DefineConstants = \"{0}\"", conf.Options["CompilerDefines"]);
+					ps.WriteLine("\t\t\t\t      DocumentationFile = \"{0}\"", GetXmlDocFile(project, conf));//default to the assembly name
+					ps.WriteLine("\t\t\t\t      DebugSymbols = \"{0}\"", conf.Options["DebugInformation"].ToString().ToLower());
+					ps.WriteLine("\t\t\t\t      FileAlignment = \"{0}\"", conf.Options["FileAlignment"]);
+					ps.WriteLine("\t\t\t\t      IncrementalBuild = \"{0}\"", conf.Options["IncrementalBuild"].ToString().ToLower());
+                    
+					if(this.Version == VSVersion.VS71)
+					{
+						ps.WriteLine("\t\t\t\t      NoStdLib = \"{0}\"", conf.Options["NoStdLib"].ToString().ToLower());
+						ps.WriteLine("\t\t\t\t      NoWarn = \"{0}\"", conf.Options["SuppressWarnings"].ToString().ToLower());
+					}
+
+					ps.WriteLine("\t\t\t\t      Optimize = \"{0}\"", conf.Options["OptimizeCode"].ToString().ToLower());       
+					ps.WriteLine("                    OutputPath = \"{0}\"", 
+						Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
+					ps.WriteLine("                    RegisterForComInterop = \"{0}\"", conf.Options["RegisterComInterop"].ToString().ToLower());
+					ps.WriteLine("                    RemoveIntegerChecks = \"{0}\"", conf.Options["RemoveIntegerChecks"].ToString().ToLower());
+					ps.WriteLine("                    TreatWarningsAsErrors = \"{0}\"", conf.Options["WarningsAsErrors"].ToString().ToLower());
+					ps.WriteLine("                    WarningLevel = \"{0}\"", conf.Options["WarningLevel"]);
+					ps.WriteLine("                />");
+				}
+
+				ps.WriteLine("            </Settings>");
+
+				ps.WriteLine("            <References>");
+				foreach(ReferenceNode refr in project.References)
+				{
+					ps.WriteLine("                <Reference");
+					ps.WriteLine("                    Name = \"{0}\"", refr.Name);
+					ps.WriteLine("                    AssemblyName = \"{0}\"", refr.Name);
+
+					if(solution.ProjectsTable.ContainsKey(refr.Name))
+					{
+						ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
+						ps.WriteLine("                    Project = \"{{{0}}}\"", refProject.Guid.ToString().ToUpper());
+						ps.WriteLine("                    Package = \"{0}\"", toolInfo.Guid.ToString().ToUpper());
+					}
+					else
+					{
+						if(refr.Path != null)
+						{
+							ps.WriteLine("                    HintPath = \"{0}\"", Helper.MakeFilePath(refr.Path, refr.Name, "dll"));
+						}
+
+					}
+                    
+					if(refr.LocalCopySpecified)
+					{
+						ps.WriteLine("                    Private = \"{0}\"",refr.LocalCopy);
+					}
+
+					ps.WriteLine("                />");
+				}
+				ps.WriteLine("            </References>");
+
+				ps.WriteLine("        </Build>");
+				ps.WriteLine("        <Files>");
+                
+				ps.WriteLine("            <Include>");
+
+				foreach(string file in project.Files)
+				{
+					string fileName = file.Replace(".\\", "");
+					ps.WriteLine("                <File");
+					ps.WriteLine("                    RelPath = \"{0}\"", fileName);
+					ps.WriteLine("                    SubType = \"{0}\"", project.Files.GetSubType(file));
+					ps.WriteLine("                    BuildAction = \"{0}\"", project.Files.GetBuildAction(file));
+					ps.WriteLine("                />");
+
+					if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings)
+					{
+						ps.WriteLine("                <File");
+						ps.WriteLine("                    RelPath = \"{0}\"", fileName.Substring(0, fileName.LastIndexOf('.')) + ".resx");
+						int slash = fileName.LastIndexOf('\\');
+						if (slash == -1)
+						{
+							ps.WriteLine("                    DependentUpon = \"{0}\"", fileName);
+						}
+						else
+						{
+							ps.WriteLine("                    DependentUpon = \"{0}\"", fileName.Substring(slash + 1, fileName.Length - slash - 1));
+						}
+						ps.WriteLine("                    BuildAction = \"{0}\"", "EmbeddedResource");
+						ps.WriteLine("                />");
+
+					}
+				}
+				ps.WriteLine("            </Include>");
+                
+				ps.WriteLine("        </Files>");
+				ps.WriteLine("    </{0}>", toolInfo.XmlTag);
+				ps.WriteLine("</VisualStudioProject>");
+			}
+
+			ps = new StreamWriter(projectFile + ".user");
+			using(ps)
+			{
+				ps.WriteLine("<VisualStudioProject>");
+				ps.WriteLine("    <{0}>", toolInfo.XmlTag);
+				ps.WriteLine("        <Build>");
+
+				ps.WriteLine("            <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
+				foreach(ConfigurationNode conf in project.Configurations)
+				{
+					ps.WriteLine("                <Config");
+					ps.WriteLine("                    Name = \"{0}\"", conf.Name);
+					ps.WriteLine("                />");
+				}
+				ps.WriteLine("            </Settings>");
+
+				ps.WriteLine("        </Build>");
+				ps.WriteLine("    </{0}>", toolInfo.XmlTag);
+				ps.WriteLine("</VisualStudioProject>");
+			}
+
+			m_Kernel.CurrentWorkingDirectory.Pop();
+		}
+
+		/// <summary>
+		/// Gets the XML doc file.
+		/// </summary>
+		/// <param name="project">The project.</param>
+		/// <param name="conf">The conf.</param>
+		/// <returns></returns>
+		public static string GetXmlDocFile(ProjectNode project, ConfigurationNode conf) 
+		{
+			if( conf == null )
+			{
+				throw new ArgumentNullException("conf");
+			}
+			if( project == null )
+			{
+				throw new ArgumentNullException("project");
+			}
+			//			if(!(bool)conf.Options["GenerateXmlDocFile"]) //default to none, if the generate option is false
+			//			{
+			//				return string.Empty;
+			//			}
+
+			//default to "AssemblyName.xml"
+			//string defaultValue = Path.GetFileNameWithoutExtension(project.AssemblyName) + ".xml";
+			//return (string)conf.Options["XmlDocFile", defaultValue];
+
+			//default to no XmlDocFile file
+			return (string)conf.Options["XmlDocFile", ""];
+		}
+
+		private void WriteSolution(SolutionNode solution)
+		{
+			m_Kernel.Log.Write("Creating Visual Studio {0} solution and project files", this.VersionName);
+
+			foreach(ProjectNode project in solution.Projects)
+			{
+				if(m_Kernel.AllowProject(project.FilterGroups)) 
+				{
+					m_Kernel.Log.Write("...Creating project: {0}", project.Name);
+					WriteProject(solution, project);
+				}
+			}
+
+			m_Kernel.Log.Write("");
+			string solutionFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
+			StreamWriter ss = new StreamWriter(solutionFile);
+
+			m_Kernel.CurrentWorkingDirectory.Push();
+			Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
+            
+			using(ss)
+			{
+				ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", this.SolutionVersion);
+				foreach(ProjectNode project in solution.Projects)
+				{
+					if(!m_Tools.ContainsKey(project.Language))
+					{
+						throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
+					}
+
+					ToolInfo toolInfo = (ToolInfo)m_Tools[project.Language];
+                
+					string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+					ss.WriteLine("Project(\"{0}\") = \"{1}\", \"{2}\", \"{{{3}}}\"",
+						toolInfo.Guid, project.Name, Helper.MakeFilePath(path, project.Name,
+						toolInfo.FileExtension), project.Guid.ToString().ToUpper());
+
+					ss.WriteLine("\tProjectSection(ProjectDependencies) = postProject");
+					ss.WriteLine("\tEndProjectSection");
+
+					ss.WriteLine("EndProject");
+				}
+
+				ss.WriteLine("Global");
+
+				ss.WriteLine("\tGlobalSection(SolutionConfiguration) = preSolution");
+				foreach(ConfigurationNode conf in solution.Configurations)
+				{
+					ss.WriteLine("\t\t{0} = {0}", conf.Name);
+				}
+				ss.WriteLine("\tEndGlobalSection");
+
+				ss.WriteLine("\tGlobalSection(ProjectDependencies) = postSolution");
+				foreach(ProjectNode project in solution.Projects)
+				{
+					for(int i = 0; i < project.References.Count; i++)
+					{
+						ReferenceNode refr = (ReferenceNode)project.References[i];
+						if(solution.ProjectsTable.ContainsKey(refr.Name))
+						{
+							ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
+							ss.WriteLine("\t\t({{{0}}}).{1} = ({{{2}}})", 
+								project.Guid.ToString().ToUpper()
+								, i, 
+								refProject.Guid.ToString().ToUpper()
+								);
+						}
+					}
+				}
+				ss.WriteLine("\tEndGlobalSection");
+
+				ss.WriteLine("\tGlobalSection(ProjectConfiguration) = postSolution");
+				foreach(ProjectNode project in solution.Projects)
+				{
+					foreach(ConfigurationNode conf in solution.Configurations)
+					{
+						ss.WriteLine("\t\t{{{0}}}.{1}.ActiveCfg = {1}|.NET",
+							project.Guid.ToString().ToUpper(),
+							conf.Name);
+
+						ss.WriteLine("\t\t{{{0}}}.{1}.Build.0 = {1}|.NET",
+							project.Guid.ToString().ToUpper(),
+							conf.Name);
+					}
+				}
+				ss.WriteLine("\tEndGlobalSection");
+
+				if(solution.Files != null)
+				{
+					ss.WriteLine("\tGlobalSection(SolutionItems) = postSolution");
+					foreach(string file in solution.Files)
+					{
+						ss.WriteLine("\t\t{0} = {0}", file);
+					}
+					ss.WriteLine("\tEndGlobalSection");
+				}
+
+				ss.WriteLine("\tGlobalSection(ExtensibilityGlobals) = postSolution");
+				ss.WriteLine("\tEndGlobalSection");
+				ss.WriteLine("\tGlobalSection(ExtensibilityAddIns) = postSolution");
+				ss.WriteLine("\tEndGlobalSection");
+
+				ss.WriteLine("EndGlobal");
+			}
+
+			m_Kernel.CurrentWorkingDirectory.Pop();
+		}
+
+		private void CleanProject(ProjectNode project)
+		{
+			m_Kernel.Log.Write("...Cleaning project: {0}", project.Name);
+
+			ToolInfo toolInfo = (ToolInfo)m_Tools[project.Language];
+			string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
+			string userFile = projectFile + ".user";
+            
+			Helper.DeleteIfExists(projectFile);
+			Helper.DeleteIfExists(userFile);
+		}
+
+		private void CleanSolution(SolutionNode solution)
+		{
+			m_Kernel.Log.Write("Cleaning Visual Studio {0} solution and project files", this.VersionName, solution.Name);
+
+			string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
+			string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
+            
+			Helper.DeleteIfExists(slnFile);
+			Helper.DeleteIfExists(suoFile);
+
+			foreach(ProjectNode project in solution.Projects)
+			{
+				CleanProject(project);
+			}
+
+			m_Kernel.Log.Write("");
+		}
+
+		#endregion
+
+		#region ITarget Members
+
+		/// <summary>
+		/// Writes the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public virtual void Write(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode sol in m_Kernel.Solutions)
+			{
+				WriteSolution(sol);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Cleans the specified kern.
+		/// </summary>
+		/// <param name="kern">The kern.</param>
+		public virtual void Clean(Kernel kern)
+		{
+			if( kern == null )
+			{
+				throw new ArgumentNullException("kern");
+			}
+			m_Kernel = kern;
+			foreach(SolutionNode sol in m_Kernel.Solutions)
+			{
+				CleanSolution(sol);
+			}
+			m_Kernel = null;
+		}
+
+		/// <summary>
+		/// Gets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		public virtual string Name
+		{
+			get
+			{
+				return "vs2003";
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Targets/VS2005Target.cs b/Prebuild/src/Core/Targets/VS2005Target.cs
new file mode 100644
index 0000000..23b6116
--- /dev/null
+++ b/Prebuild/src/Core/Targets/VS2005Target.cs
@@ -0,0 +1,883 @@
+#region BSD License
+/*
+Copyright (c) 2004 Matthew Holmes (matthew@wildfiregames.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: robloach $
+ * $Date: 2007-02-27 19:52:34 +0100 (ti, 27 feb 2007) $
+ * $Revision: 207 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Nodes;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Targets
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public struct ToolInfo
+    {
+        string name;
+        string guid;
+        string fileExtension;
+        string xmlTag;
+        string importProject;
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return name;
+            }
+            set
+            {
+                name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the GUID.
+        /// </summary>
+        /// <value>The GUID.</value>
+        public string Guid
+        {
+            get
+            {
+                return guid;
+            }
+            set
+            {
+                guid = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the file extension.
+        /// </summary>
+        /// <value>The file extension.</value>
+        public string FileExtension
+        {
+            get
+            {
+                return fileExtension;
+            }
+            set
+            {
+                fileExtension = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the XML tag.
+        /// </summary>
+        /// <value>The XML tag.</value>
+        public string XmlTag
+        {
+            get
+            {
+                return xmlTag;
+            }
+            set
+            {
+                xmlTag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the import project property.
+        /// </summary>
+        /// <value>The ImportProject tag.</value>
+        public string ImportProject
+        {
+            get
+            {
+                return importProject;
+            }
+            set
+            {
+                importProject = value;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ToolInfo"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="guid">The GUID.</param>
+        /// <param name="fileExtension">The file extension.</param>
+        /// <param name="xml">The XML.</param>
+        /// <param name="importProject">The import project.</param>
+        public ToolInfo(string name, string guid, string fileExtension, string xml, string importProject)
+        {
+            this.name = name;
+            this.guid = guid;
+            this.fileExtension = fileExtension;
+            this.xmlTag = xml;
+            this.importProject = importProject;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ToolInfo"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="guid">The GUID.</param>
+        /// <param name="fileExtension">The file extension.</param>
+        /// <param name="xml">The XML.</param>
+        public ToolInfo(string name, string guid, string fileExtension, string xml)
+        {
+            this.name = name;
+            this.guid = guid;
+            this.fileExtension = fileExtension;
+            this.xmlTag = xml;
+            this.importProject = "$(MSBuildBinPath)\\Microsoft." + xml + ".Targets";
+        }
+
+        /// <summary>
+        /// Equals operator
+        /// </summary>
+        /// <param name="obj">ToolInfo to compare</param>
+        /// <returns>true if toolInfos are equal</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                throw new ArgumentNullException("obj");
+            }
+            if (obj.GetType() != typeof(ToolInfo))
+                return false;
+
+            ToolInfo c = (ToolInfo)obj;
+            return ((this.name == c.name) && (this.guid == c.guid) && (this.fileExtension == c.fileExtension) && (this.importProject == c.importProject));
+        }
+
+        /// <summary>
+        /// Equals operator
+        /// </summary>
+        /// <param name="c1">ToolInfo to compare</param>
+        /// <param name="c2">ToolInfo to compare</param>
+        /// <returns>True if toolInfos are equal</returns>
+        public static bool operator ==(ToolInfo c1, ToolInfo c2)
+        {
+            return ((c1.name == c2.name) && (c1.guid == c2.guid) && (c1.fileExtension == c2.fileExtension) && (c1.importProject == c2.importProject) && (c1.xmlTag == c2.xmlTag));
+        }
+
+        /// <summary>
+        /// Not equals operator
+        /// </summary>
+        /// <param name="c1">ToolInfo to compare</param>
+        /// <param name="c2">ToolInfo to compare</param>
+        /// <returns>True if toolInfos are not equal</returns>
+        public static bool operator !=(ToolInfo c1, ToolInfo c2)
+        {
+            return !(c1 == c2);
+        }
+
+        /// <summary>
+        /// Hash Code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            return name.GetHashCode() ^ guid.GetHashCode() ^ this.fileExtension.GetHashCode() ^ this.importProject.GetHashCode() ^ this.xmlTag.GetHashCode();
+
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [Target("vs2005")]
+    public class VS2005Target : ITarget
+    {
+        #region Inner Classes
+
+        #endregion
+
+        #region Fields
+
+        string solutionVersion = "9.00";
+        string productVersion = "8.0.50727";
+        string schemaVersion = "2.0";
+        string versionName = "Visual C# 2005";
+        VSVersion version = VSVersion.VS80;
+
+        Hashtable tools;
+        Kernel kernel;
+
+        /// <summary>
+        /// Gets or sets the solution version.
+        /// </summary>
+        /// <value>The solution version.</value>
+        protected string SolutionVersion
+        {
+            get
+            {
+                return this.solutionVersion;
+            }
+            set
+            {
+                this.solutionVersion = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the product version.
+        /// </summary>
+        /// <value>The product version.</value>
+        protected string ProductVersion
+        {
+            get
+            {
+                return this.productVersion;
+            }
+            set
+            {
+                this.productVersion = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the schema version.
+        /// </summary>
+        /// <value>The schema version.</value>
+        protected string SchemaVersion
+        {
+            get
+            {
+                return this.schemaVersion;
+            }
+            set
+            {
+                this.schemaVersion = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the name of the version.
+        /// </summary>
+        /// <value>The name of the version.</value>
+        protected string VersionName
+        {
+            get
+            {
+                return this.versionName;
+            }
+            set
+            {
+                this.versionName = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        protected VSVersion Version
+        {
+            get
+            {
+                return this.version;
+            }
+            set
+            {
+                this.version = value;
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VS2005Target"/> class.
+        /// </summary>
+        public VS2005Target()
+        {
+            this.tools = new Hashtable();
+
+            this.tools["C#"] = new ToolInfo("C#", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}", "csproj", "CSHARP", "$(MSBuildBinPath)\\Microsoft.CSHARP.Targets");
+            this.tools["Boo"] = new ToolInfo("Boo", "{45CEA7DC-C2ED-48A6-ACE0-E16144C02365}", "booproj", "Boo", "$(BooBinPath)\\Boo.Microsoft.Build.targets");
+            this.tools["VisualBasic"] = new ToolInfo("VisualBasic", "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}", "vbproj", "VisualBasic", "$(MSBuildBinPath)\\Microsoft.VisualBasic.Targets");
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private string MakeRefPath(ProjectNode project)
+        {
+            string ret = "";
+            foreach (ReferencePathNode node in project.ReferencePaths)
+            {
+                try
+                {
+                    string fullPath = Helper.ResolvePath(node.Path);
+                    if (ret.Length < 1)
+                    {
+                        ret = fullPath;
+                    }
+                    else
+                    {
+                        ret += ";" + fullPath;
+                    }
+                }
+                catch (ArgumentException)
+                {
+                    this.kernel.Log.Write(LogType.Warning, "Could not resolve reference path: {0}", node.Path);
+                }
+            }
+
+            return ret;
+        }
+
+        private void WriteProject(SolutionNode solution, ProjectNode project)
+        {
+            if (!tools.ContainsKey(project.Language))
+            {
+                throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
+            }
+
+            ToolInfo toolInfo = (ToolInfo)tools[project.Language];
+            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
+            StreamWriter ps = new StreamWriter(projectFile);
+
+            kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(projectFile));
+
+            #region Project File
+            using (ps)
+            {
+                ps.WriteLine("<Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">");
+                //ps.WriteLine("  <{0}", toolInfo.XMLTag);
+                ps.WriteLine("  <PropertyGroup>");
+                ps.WriteLine("    <ProjectType>Local</ProjectType>");
+                ps.WriteLine("    <ProductVersion>{0}</ProductVersion>", this.ProductVersion);
+                ps.WriteLine("    <SchemaVersion>{0}</SchemaVersion>", this.SchemaVersion);
+                ps.WriteLine("    <ProjectGuid>{{{0}}}</ProjectGuid>", project.Guid.ToString().ToUpper());
+
+                ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">Debug</Configuration>");
+                ps.WriteLine("    <Platform Condition=\" '$(Platform)' == '' \">AnyCPU</Platform>");
+                //ps.WriteLine("    <Build>");
+
+                //ps.WriteLine("      <Settings");
+                ps.WriteLine("    <ApplicationIcon>{0}</ApplicationIcon>", project.AppIcon);
+                ps.WriteLine("    <AssemblyKeyContainerName>");
+                ps.WriteLine("    </AssemblyKeyContainerName>");
+                ps.WriteLine("    <AssemblyName>{0}</AssemblyName>", project.AssemblyName);
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    if (conf.Options.KeyFile != "")
+                    {
+                        ps.WriteLine("    <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>", conf.Options.KeyFile);
+                        ps.WriteLine("    <SignAssembly>true</SignAssembly>");
+                        break;
+                    }
+                }
+                ps.WriteLine("    <DefaultClientScript>JScript</DefaultClientScript>");
+                ps.WriteLine("    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>");
+                ps.WriteLine("    <DefaultTargetSchema>IE50</DefaultTargetSchema>");
+                ps.WriteLine("    <DelaySign>false</DelaySign>");
+
+                //if(m_Version == VSVersion.VS70)
+                //    ps.WriteLine("        NoStandardLibraries = \"false\"");
+
+                ps.WriteLine("    <OutputType>{0}</OutputType>", project.Type.ToString());
+                ps.WriteLine("    <AppDesignerFolder>{0}</AppDesignerFolder>", project.DesignerFolder);
+                ps.WriteLine("    <RootNamespace>{0}</RootNamespace>", project.RootNamespace);
+                ps.WriteLine("    <StartupObject>{0}</StartupObject>", project.StartupObject);
+                //ps.WriteLine("      >");
+                ps.WriteLine("    <FileUpgradeFlags>");
+                ps.WriteLine("    </FileUpgradeFlags>");
+
+                ps.WriteLine("  </PropertyGroup>");
+
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    ps.Write("  <PropertyGroup ");
+                    ps.WriteLine("Condition=\" '$(Configuration)|$(Platform)' == '{0}|AnyCPU' \">", conf.Name);
+                    ps.WriteLine("    <AllowUnsafeBlocks>{0}</AllowUnsafeBlocks>", conf.Options["AllowUnsafe"]);
+                    ps.WriteLine("    <BaseAddress>{0}</BaseAddress>", conf.Options["BaseAddress"]);
+                    ps.WriteLine("    <CheckForOverflowUnderflow>{0}</CheckForOverflowUnderflow>", conf.Options["CheckUnderflowOverflow"]);
+                    ps.WriteLine("    <ConfigurationOverrideFile>");
+                    ps.WriteLine("    </ConfigurationOverrideFile>");
+                    ps.WriteLine("    <DefineConstants>{0}</DefineConstants>", conf.Options["CompilerDefines"]);
+                    ps.WriteLine("    <DocumentationFile>{0}</DocumentationFile>", conf.Options["XmlDocFile"]);
+                    ps.WriteLine("    <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
+                    ps.WriteLine("    <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);
+                    //                    ps.WriteLine("    <IncrementalBuild = \"{0}\"", conf.Options["IncrementalBuild"]);
+
+                    //                    if(m_Version == VSVersion.VS71)
+                    //                    {
+                    //                        ps.WriteLine("          NoStdLib = \"{0}\"", conf.Options["NoStdLib"]);
+                    //                        ps.WriteLine("          NoWarn = \"{0}\"", conf.Options["SuppressWarnings"]);
+                    //                    }
+
+                    ps.WriteLine("    <Optimize>{0}</Optimize>", conf.Options["OptimizeCode"]);
+                    ps.WriteLine("    <OutputPath>{0}</OutputPath>",
+                        Helper.EndPath(Helper.NormalizePath(conf.Options["OutputPath"].ToString())));
+                    ps.WriteLine("    <RegisterForComInterop>{0}</RegisterForComInterop>", conf.Options["RegisterComInterop"]);
+                    ps.WriteLine("    <RemoveIntegerChecks>{0}</RemoveIntegerChecks>", conf.Options["RemoveIntegerChecks"]);
+                    ps.WriteLine("    <TreatWarningsAsErrors>{0}</TreatWarningsAsErrors>", conf.Options["WarningsAsErrors"]);
+                    ps.WriteLine("    <WarningLevel>{0}</WarningLevel>", conf.Options["WarningLevel"]);
+                    ps.WriteLine("    <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]);
+                    ps.WriteLine("  </PropertyGroup>");
+                }
+
+                //ps.WriteLine("      </Settings>");
+
+                // Assembly References
+                ps.WriteLine("  <ItemGroup>");
+                string refPath = ((ReferencePathNode) project.ReferencePaths[0]).Path;
+                
+                foreach (ReferenceNode refr in project.References)
+                {
+                    if (!solution.ProjectsTable.ContainsKey(refr.Name))
+                    {
+                        ps.Write("    <Reference");
+                        ps.Write(" Include=\"");
+                        ps.Write(refr.Name);
+
+                        ps.WriteLine("\" >");
+
+                        string path;
+                        
+                        if( refr.Name.EndsWith(".dll", StringComparison.InvariantCultureIgnoreCase ))
+                        {
+                            path = Helper.NormalizePath(Path.Combine( refPath, refr.Name), '\\');
+                        }
+                        else
+                        {
+                            path = refr.Name + ".dll";
+                        }
+                        
+                        // TODO: Allow reference to *.exe files
+                        ps.WriteLine("      <HintPath>{0}</HintPath>", path );
+                        ps.WriteLine("      <Private>{0}</Private>", refr.LocalCopy);
+                        ps.WriteLine("    </Reference>");
+                    }
+                }
+                ps.WriteLine("  </ItemGroup>");
+
+                //Project References
+                ps.WriteLine("  <ItemGroup>");
+                foreach (ReferenceNode refr in project.References)
+                {
+                    if (solution.ProjectsTable.ContainsKey(refr.Name))
+                    {
+                        ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
+                        // TODO: Allow reference to visual basic projects
+                        string path =
+                            Helper.MakePathRelativeTo(project.FullPath,
+                                                      Helper.MakeFilePath(refProject.FullPath, refProject.Name, "csproj"));
+                        ps.WriteLine("    <ProjectReference Include=\"{0}\">", path );
+                        //<ProjectReference Include="..\..\RealmForge\Utility\RealmForge.Utility.csproj">
+                        ps.WriteLine("      <Name>{0}</Name>", refProject.Name);
+                        //  <Name>RealmForge.Utility</Name>
+                        ps.WriteLine("      <Project>{{{0}}}</Project>", refProject.Guid.ToString().ToUpper());
+                        //  <Project>{6880D1D3-69EE-461B-B841-5319845B20D3}</Project>
+                        ps.WriteLine("      <Package>{0}</Package>", toolInfo.Guid.ToString().ToUpper());
+                        //  <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        ps.WriteLine("\t\t\t<Private>{0}</Private>", refr.LocalCopy);
+                        ps.WriteLine("    </ProjectReference>");
+                        //</ProjectReference>
+                    }
+                    else
+                    {
+                    }
+                }
+                ps.WriteLine("  </ItemGroup>");
+
+                //                ps.WriteLine("    </Build>");
+                ps.WriteLine("  <ItemGroup>");
+
+                //                ps.WriteLine("      <Include>");
+                ArrayList list = new ArrayList();
+                foreach (string file in project.Files)
+                {
+                    //					if (file == "Properties\\Bind.Designer.cs")
+                    //					{
+                    //						Console.WriteLine("Wait a minute!");
+                    //						Console.WriteLine(project.Files.GetSubType(file).ToString());
+                    //					}
+
+                    if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) != SubType.Settings && project.Files.GetSubType(file) != SubType.Designer)
+                    {
+                        ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
+
+                        int slash = file.LastIndexOf('\\');
+                        if (slash == -1)
+                        {
+                            ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", file);
+                        }
+                        else
+                        {
+                            ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", file.Substring(slash + 1, file.Length - slash - 1));
+                        }
+                        ps.WriteLine("      <SubType>Designer</SubType>");
+                        ps.WriteLine("    </EmbeddedResource>");
+                        //
+                    }
+                    
+                    if (project.Files.GetSubType(file) != SubType.Code && project.Files.GetSubType(file) == SubType.Designer)
+                    {
+                        ps.WriteLine("    <EmbeddedResource Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".resx");
+                        ps.WriteLine("      <SubType>" + project.Files.GetSubType(file) + "</SubType>");
+                        ps.WriteLine("      <Generator>ResXFileCodeGenerator</Generator>");
+                        ps.WriteLine("      <LastGenOutput>Resources.Designer.cs</LastGenOutput>");
+                        ps.WriteLine("    </EmbeddedResource>");
+                        ps.WriteLine("    <Compile Include=\"{0}\">", file.Substring(0, file.LastIndexOf('.')) + ".Designer.cs");
+                        ps.WriteLine("      <AutoGen>True</AutoGen>");
+                        ps.WriteLine("      <DesignTime>True</DesignTime>");
+                        ps.WriteLine("      <DependentUpon>Resources.resx</DependentUpon>");
+                        ps.WriteLine("    </Compile>");
+                        list.Add(file.Substring(0, file.LastIndexOf('.')) + ".Designer.cs");
+                    }
+                    if (project.Files.GetSubType(file).ToString() == "Settings")
+                    {
+                        //Console.WriteLine("File: " + file);
+                        //Console.WriteLine("Last index: " + file.LastIndexOf('.'));
+                        //Console.WriteLine("Length: " + file.Length);
+                        ps.Write("    <{0} ", project.Files.GetBuildAction(file));
+                        ps.WriteLine("Include=\"{0}\">", file);
+                        int slash = file.LastIndexOf('\\');
+                        string fileName = file.Substring(slash + 1, file.Length - slash - 1);
+                        if (project.Files.GetBuildAction(file) == BuildAction.None)
+                        {
+                            ps.WriteLine("      <Generator>SettingsSingleFileGenerator</Generator>");
+
+                            //Console.WriteLine("FileName: " + fileName);
+                            //Console.WriteLine("FileNameMain: " + fileName.Substring(0, fileName.LastIndexOf('.')));
+                            //Console.WriteLine("FileNameExt: " + fileName.Substring(fileName.LastIndexOf('.'), fileName.Length - fileName.LastIndexOf('.')));
+                            if (slash == -1)
+                            {
+                                ps.WriteLine("      <LastGenOutput>{0}</LastGenOutput>", fileName.Substring(0, fileName.LastIndexOf('.')) + ".Designer.cs");
+                            }
+                            else
+                            {
+                                ps.WriteLine("      <LastGenOutput>{0}</LastGenOutput>", fileName.Substring(0, fileName.LastIndexOf('.')) + ".Designer.cs");
+                            }
+                        }
+                        else
+                        {
+                            ps.WriteLine("      <SubType>Code</SubType>");
+                            ps.WriteLine("      <AutoGen>True</AutoGen>");
+                            ps.WriteLine("      <DesignTimeSharedInput>True</DesignTimeSharedInput>");
+                            string fileNameShort = fileName.Substring(0, fileName.LastIndexOf('.'));
+                            string fileNameShorter = fileNameShort.Substring(0, fileNameShort.LastIndexOf('.'));
+                            ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", fileNameShorter + ".settings");
+                        }
+                        ps.WriteLine("    </{0}>", project.Files.GetBuildAction(file));
+                    }
+                    else if (project.Files.GetSubType(file) != SubType.Designer)
+                    {
+                        if (!list.Contains(file))
+                        {
+                            ps.Write("    <{0} ", project.Files.GetBuildAction(file));
+                            ps.WriteLine("Include=\"{0}\">", file);
+
+
+                            if (file.Contains("Designer.cs"))
+                            {
+                                ps.WriteLine("      <DependentUpon>{0}</DependentUpon>", file.Substring(0, file.IndexOf(".Designer.cs")) + ".cs");
+                            }
+
+                            if (project.Files.GetIsLink(file))
+                            {
+                                ps.WriteLine("      <Link>{0}</Link>", Path.GetFileName(file));
+                            }
+                            else if (project.Files.GetBuildAction(file) != BuildAction.None)
+                            {
+                                if (project.Files.GetBuildAction(file) != BuildAction.EmbeddedResource)
+                                {
+                                    ps.WriteLine("      <SubType>{0}</SubType>", project.Files.GetSubType(file));
+                                }
+                            }
+                            if (project.Files.GetCopyToOutput(file) != CopyToOutput.Never)
+                            {
+                                ps.WriteLine("      <CopyToOutputDirectory>{0}</CopyToOutputDirectory>", project.Files.GetCopyToOutput(file));
+                            }
+
+                            ps.WriteLine("    </{0}>", project.Files.GetBuildAction(file));
+                        }
+                    }
+                }
+                //                ps.WriteLine("      </Include>");
+
+                ps.WriteLine("  </ItemGroup>");
+                ps.WriteLine("  <Import Project=\"" + toolInfo.ImportProject + "\" />");
+                ps.WriteLine("  <PropertyGroup>");
+                ps.WriteLine("    <PreBuildEvent>");
+                ps.WriteLine("    </PreBuildEvent>");
+                ps.WriteLine("    <PostBuildEvent>");
+                ps.WriteLine("    </PostBuildEvent>");
+                ps.WriteLine("  </PropertyGroup>");
+                //                ps.WriteLine("  </{0}>", toolInfo.XMLTag);
+                ps.WriteLine("</Project>");
+            }
+            #endregion
+
+            #region User File
+
+            ps = new StreamWriter(projectFile + ".user");
+            using (ps)
+            {
+                ps.WriteLine("<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">");
+                //ps.WriteLine( "<VisualStudioProject>" );
+                //ps.WriteLine("  <{0}>", toolInfo.XMLTag);
+                //ps.WriteLine("    <Build>");
+                ps.WriteLine("  <PropertyGroup>");
+                //ps.WriteLine("      <Settings ReferencePath=\"{0}\">", MakeRefPath(project));
+
+
+                ps.WriteLine("    <Configuration Condition=\" '$(Configuration)' == '' \">Debug</Configuration>");
+                ps.WriteLine("    <Platform Condition=\" '$(Platform)' == '' \">AnyCPU</Platform>");
+
+                if (projectFile.Contains( "OpenSim.csproj" ))
+                {
+                    ps.WriteLine("    <StartArguments>-loginserver -sandbox -accounts</StartArguments>");
+                }
+
+                ps.WriteLine("    <ReferencePath>{0}</ReferencePath>", MakeRefPath(project));
+                ps.WriteLine("    <LastOpenVersion>{0}</LastOpenVersion>", this.ProductVersion);
+                ps.WriteLine("    <ProjectView>ProjectFiles</ProjectView>");
+                ps.WriteLine("    <ProjectTrust>0</ProjectTrust>");
+                ps.WriteLine("  </PropertyGroup>");
+                foreach (ConfigurationNode conf in project.Configurations)
+                {
+                    ps.Write("  <PropertyGroup");
+                    ps.Write(" Condition = \" '$(Configuration)|$(Platform)' == '{0}|AnyCPU' \"", conf.Name);
+                    ps.WriteLine(" />");
+                }
+                
+                ps.WriteLine("</Project>");
+            }
+            #endregion
+
+            kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private void WriteSolution(SolutionNode solution)
+        {
+            kernel.Log.Write("Creating {0} solution and project files", this.VersionName);
+
+            foreach (ProjectNode project in solution.Projects)
+            {
+                kernel.Log.Write("...Creating project: {0}", project.Name);
+                WriteProject(solution, project);
+            }
+
+            kernel.Log.Write("");
+            string solutionFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
+            StreamWriter ss = new StreamWriter(solutionFile);
+
+            kernel.CurrentWorkingDirectory.Push();
+            Helper.SetCurrentDir(Path.GetDirectoryName(solutionFile));
+
+            using (ss)
+            {
+                ss.WriteLine("Microsoft Visual Studio Solution File, Format Version {0}", this.SolutionVersion);
+                ss.WriteLine("# Visual Studio 2005");
+                foreach (ProjectNode project in solution.Projects)
+                {
+                    if (!tools.ContainsKey(project.Language))
+                    {
+                        throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
+                    }
+
+                    ToolInfo toolInfo = (ToolInfo)tools[project.Language];
+
+                    string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
+                    ss.WriteLine("Project(\"{0}\") = \"{1}\", \"{2}\", \"{{{3}}}\"",
+                        toolInfo.Guid, project.Name, Helper.MakeFilePath(path, project.Name,
+                        toolInfo.FileExtension), project.Guid.ToString().ToUpper());
+
+                    //ss.WriteLine("  ProjectSection(ProjectDependencies) = postProject");
+                    //ss.WriteLine("  EndProjectSection");
+
+                    ss.WriteLine("EndProject");
+                }
+
+                if (solution.Files != null)
+                {
+                    ss.WriteLine("Project(\"{0}\") = \"Solution Items\", \"Solution Items\", \"{1}\"", "{2150E333-8FDC-42A3-9474-1A3956D46DE8}", "{468F1D07-AD17-4CC3-ABD0-2CA268E4E1A6}");
+                    ss.WriteLine("\tProjectSection(SolutionItems) = preProject");
+                    foreach (string file in solution.Files)
+                        ss.WriteLine("\t\t{0} = {0}", file);
+                    ss.WriteLine("\tEndProjectSection");
+                    ss.WriteLine("EndProject");
+                }
+
+                ss.WriteLine("Global");
+
+                ss.WriteLine("  GlobalSection(SolutionConfigurationPlatforms) = preSolution");
+                foreach (ConfigurationNode conf in solution.Configurations)
+                {
+                    ss.WriteLine("    {0}|Any CPU = {0}|Any CPU", conf.Name);
+                }
+                ss.WriteLine("  EndGlobalSection");
+
+                if (solution.Projects.Count > 1)
+                {
+                    ss.WriteLine("  GlobalSection(ProjectDependencies) = postSolution");
+                }
+                foreach (ProjectNode project in solution.Projects)
+                {
+                    for (int i = 0; i < project.References.Count; i++)
+                    {
+                        ReferenceNode refr = (ReferenceNode)project.References[i];
+                        if (solution.ProjectsTable.ContainsKey(refr.Name))
+                        {
+                            ProjectNode refProject = (ProjectNode)solution.ProjectsTable[refr.Name];
+                            ss.WriteLine("    ({{{0}}}).{1} = ({{{2}}})",
+                                project.Guid.ToString().ToUpper()
+                                , i,
+                                refProject.Guid.ToString().ToUpper()
+                                );
+                        }
+                    }
+                }
+                if (solution.Projects.Count > 1)
+                {
+                    ss.WriteLine("  EndGlobalSection");
+                }
+                ss.WriteLine("  GlobalSection(ProjectConfigurationPlatforms) = postSolution");
+                foreach (ProjectNode project in solution.Projects)
+                {
+                    foreach (ConfigurationNode conf in solution.Configurations)
+                    {
+                        ss.WriteLine("    {{{0}}}.{1}|Any CPU.ActiveCfg = {1}|Any CPU",
+                            project.Guid.ToString().ToUpper(),
+                            conf.Name);
+
+                        ss.WriteLine("    {{{0}}}.{1}|Any CPU.Build.0 = {1}|Any CPU",
+                            project.Guid.ToString().ToUpper(),
+                            conf.Name);
+                    }
+                }
+                ss.WriteLine("  EndGlobalSection");
+                ss.WriteLine("  GlobalSection(SolutionProperties) = preSolution");
+                ss.WriteLine("    HideSolutionNode = FALSE");
+                ss.WriteLine("  EndGlobalSection");
+
+                ss.WriteLine("EndGlobal");
+            }
+
+            kernel.CurrentWorkingDirectory.Pop();
+        }
+
+        private void CleanProject(ProjectNode project)
+        {
+            kernel.Log.Write("...Cleaning project: {0}", project.Name);
+
+            ToolInfo toolInfo = (ToolInfo)tools[project.Language];
+            string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
+            string userFile = projectFile + ".user";
+
+            Helper.DeleteIfExists(projectFile);
+            Helper.DeleteIfExists(userFile);
+        }
+
+        private void CleanSolution(SolutionNode solution)
+        {
+            kernel.Log.Write("Cleaning {0} solution and project files", this.VersionName, solution.Name);
+
+            string slnFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "sln");
+            string suoFile = Helper.MakeFilePath(solution.FullPath, solution.Name, "suo");
+
+            Helper.DeleteIfExists(slnFile);
+            Helper.DeleteIfExists(suoFile);
+
+            foreach (ProjectNode project in solution.Projects)
+            {
+                CleanProject(project);
+            }
+
+            kernel.Log.Write("");
+        }
+
+        #endregion
+
+        #region ITarget Members
+
+        /// <summary>
+        /// Writes the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public virtual void Write(Kernel kern)
+        {
+            if (kern == null)
+            {
+                throw new ArgumentNullException("kern");
+            }
+            kernel = kern;
+            foreach (SolutionNode sol in kernel.Solutions)
+            {
+                WriteSolution(sol);
+            }
+            kernel = null;
+        }
+
+        /// <summary>
+        /// Cleans the specified kern.
+        /// </summary>
+        /// <param name="kern">The kern.</param>
+        public virtual void Clean(Kernel kern)
+        {
+            if (kern == null)
+            {
+                throw new ArgumentNullException("kern");
+            }
+            kernel = kern;
+            foreach (SolutionNode sol in kernel.Solutions)
+            {
+                CleanSolution(sol);
+            }
+            kernel = null;
+        }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public virtual string Name
+        {
+            get
+            {
+                return "vs2005";
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Prebuild/src/Core/UnknownLanguageException.cs b/Prebuild/src/Core/UnknownLanguageException.cs
new file mode 100644
index 0000000..cbd1dc1
--- /dev/null
+++ b/Prebuild/src/Core/UnknownLanguageException.cs
@@ -0,0 +1,63 @@
+/*
+ * $RCSfile$
+ * Copyright (C) 2004, 2005 David Hudson (jendave@yahoo.com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Prebuild.Core 
+{
+	/// <summary>
+	/// </summary>
+	[Serializable()]
+	public class UnknownLanguageException : Exception 
+	{
+		/// <summary>
+		/// Basic exception.
+		/// </summary>
+		public UnknownLanguageException() 
+		{
+		}
+
+		/// <summary>
+		/// Exception with specified string
+		/// </summary>
+		/// <param name="message">Exception message</param>
+		public UnknownLanguageException(string message): base(message)
+		{
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="message"></param>
+		/// <param name="exception"></param>
+		public UnknownLanguageException(string message, Exception exception) : base(message, exception)
+		{
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="info"></param>
+		/// <param name="context"></param>
+		protected UnknownLanguageException(SerializationInfo info, StreamingContext context) : base( info, context )
+		{
+		}
+	}
+}
diff --git a/Prebuild/src/Core/Utilities/CommandLineCollection.cs b/Prebuild/src/Core/Utilities/CommandLineCollection.cs
new file mode 100644
index 0000000..496731f
--- /dev/null
+++ b/Prebuild/src/Core/Utilities/CommandLineCollection.cs
@@ -0,0 +1,162 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: robloach $
+ * $Date: 2006-09-26 00:30:53 +0200 (ti, 26 sep 2006) $
+ * $Revision: 165 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Diagnostics;
+
+namespace Prebuild.Core.Utilities
+{    
+	/// <summary>
+	/// The CommandLine class parses and interprets the command-line arguments passed to
+	/// prebuild.
+	/// </summary>
+	public class CommandLineCollection
+	{
+		#region Fields
+
+		// The raw OS arguments
+		private string[] m_RawArgs;
+
+		// Command-line argument storage
+		private Hashtable m_Arguments;
+        
+		#endregion
+        
+		#region Constructors
+        
+		/// <summary>
+		/// Create a new CommandLine instance and set some internal variables.
+		/// </summary>
+		public CommandLineCollection(string[] args) 
+		{
+			m_RawArgs = args;
+			m_Arguments = new Hashtable();
+            
+			Parse();
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		private void Parse() 
+		{
+			if(m_RawArgs.Length < 1)
+				return;
+
+			int idx = 0;
+			string arg = null, lastArg = null;
+
+			while(idx <m_RawArgs.Length) 
+			{
+				arg = m_RawArgs[idx];
+
+				if(arg.Length > 2 && arg[0] == '/') 
+				{
+					arg = arg.Substring(1);
+					lastArg = arg;
+					m_Arguments[arg] = "";
+				} 
+				else 
+				{
+					if(lastArg != null)
+					{
+						m_Arguments[lastArg] = arg;
+						lastArg = null;
+					}
+				}
+
+				idx++;
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Wases the passed.
+		/// </summary>
+		/// <param name="arg">The arg.</param>
+		/// <returns></returns>
+		public bool WasPassed(string arg)
+		{
+			return (m_Arguments.ContainsKey(arg));
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the parameter associated with the command line option
+		/// </summary>
+		/// <remarks>Returns null if option was not specified,
+		/// null string if no parameter was specified, and the value if a parameter was specified</remarks>
+		public string this[string index] 
+		{
+			get 
+			{
+				if(m_Arguments.ContainsKey(index))
+				{
+					return (string)(m_Arguments[index]);
+				}
+				else
+				{
+					return null;
+				}
+			}
+		}
+
+		#endregion
+
+		#region IEnumerable Members
+
+		/// <summary>
+		/// Returns an enumerator that can iterate through a collection.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="T:System.Collections.IDictionaryEnumerator"/>
+		/// that can be used to iterate through the collection.
+		/// </returns>
+		public IDictionaryEnumerator GetEnumerator() 
+		{
+			return m_Arguments.GetEnumerator();
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Utilities/CurrentDirectory.cs b/Prebuild/src/Core/Utilities/CurrentDirectory.cs
new file mode 100644
index 0000000..a76d844
--- /dev/null
+++ b/Prebuild/src/Core/Utilities/CurrentDirectory.cs
@@ -0,0 +1,89 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+
+namespace Prebuild.Core.Utilities
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class CurrentDirectory
+	{
+		#region Fields
+
+		private Stack m_Stack;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="CurrentDirectory"/> class.
+		/// </summary>
+		public CurrentDirectory()
+		{
+			m_Stack = new Stack();
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Pushes this instance.
+		/// </summary>
+		public void Push()
+		{
+			m_Stack.Push(Environment.CurrentDirectory);
+		}
+
+		/// <summary>
+		/// Pops this instance.
+		/// </summary>
+		public void Pop()
+		{
+			if(m_Stack.Count < 1)
+			{
+				return;
+			}
+            
+			string cwd = (string)m_Stack.Pop();
+			Helper.SetCurrentDir(cwd);
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Utilities/Helper.cs b/Prebuild/src/Core/Utilities/Helper.cs
new file mode 100644
index 0000000..33c9618
--- /dev/null
+++ b/Prebuild/src/Core/Utilities/Helper.cs
@@ -0,0 +1,661 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2007-02-13 21:58:03 +0100 (ti, 13 feb 2007) $
+ * $Revision: 205 $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
+using System.Collections.Specialized;
+using System.Xml;
+using Prebuild.Core.Nodes;
+
+namespace Prebuild.Core.Utilities
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class Helper
+	{
+		#region Fields
+
+		private static Stack dirStack;
+		private static Regex varRegex;
+		static bool checkForOSVariables;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public static bool CheckForOSVariables
+		{
+			get
+			{
+				return checkForOSVariables;
+			}
+			set
+			{
+				checkForOSVariables = value;
+			}
+		}
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes the <see cref="Helper"/> class.
+		/// </summary>
+		static Helper()
+		{
+			dirStack = new Stack();
+			//m_VarRegex = new Regex(@"\${(?<var>[\w|_]+)}");
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public static Stack DirStack
+		{
+			get
+			{
+				return dirStack;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public static Regex VarRegex
+		{
+			get
+			{
+				return varRegex;
+			}
+			set
+			{
+				varRegex = value;
+			}
+		}
+
+		#endregion
+        
+		#region Public Methods
+
+		#region String Parsing
+		#region Inner Classes and Delegates
+		/// <summary>
+		/// 
+		/// </summary>
+		public delegate string StringLookup(string key);
+		
+		#endregion
+
+		/// <summary>
+		/// Gets a collection of StringLocationPair objects that represent the matches
+		/// </summary>
+		/// <param name="target">The target.</param>
+		/// <param name="beforeGroup">The before group.</param>
+		/// <param name="afterGroup">The after group.</param>
+		/// <param name="includeDelimitersInSubstrings">if set to <c>true</c> [include delimiters in substrings].</param>
+		/// <returns></returns>
+		public static StringCollection FindGroups(string target, string beforeGroup, string afterGroup, bool includeDelimitersInSubstrings) 
+		{
+			if( beforeGroup == null )
+			{
+				throw new ArgumentNullException("beforeGroup");
+			}
+			if( afterGroup == null )
+			{
+				throw new ArgumentNullException("afterGroup");
+			}
+			StringCollection results = new StringCollection();
+			if(target == null || target.Length == 0)
+			{
+				return results;
+			}
+
+			int beforeMod = 0;
+			int afterMod = 0;
+			if(includeDelimitersInSubstrings) 
+			{
+				//be sure to not exlude the delims
+				beforeMod = beforeGroup.Length;
+				afterMod = afterGroup.Length;
+			}
+			int startIndex = 0;
+			while((startIndex = target.IndexOf(beforeGroup,startIndex)) != -1) {
+				int endIndex = target.IndexOf(afterGroup,startIndex);//the index of the char after it
+				if(endIndex == -1)
+				{
+					break;
+				}
+				int length = endIndex - startIndex - beforeGroup.Length;//move to the first char in the string
+				string substring = substring = target.Substring(startIndex + beforeGroup.Length - beforeMod,
+					length - afterMod);
+
+				results.Add(substring);
+				//results.Add(new StringLocationPair(substring,startIndex));
+				startIndex = endIndex + 1;
+				//the Interpolate*() methods will not work if expressions are expandded inside expression due to an optimization
+				//so start after endIndex
+				
+			}
+			return results;
+		}
+
+		/// <summary>
+		/// Replaces the groups.
+		/// </summary>
+		/// <param name="target">The target.</param>
+		/// <param name="beforeGroup">The before group.</param>
+		/// <param name="afterGroup">The after group.</param>
+		/// <param name="lookup">The lookup.</param>
+		/// <returns></returns>
+		public static string ReplaceGroups(string target, string beforeGroup, string afterGroup, StringLookup lookup) {
+			if( target == null )
+			{
+				throw new ArgumentNullException("target");
+			}
+			//int targetLength = target.Length;
+			StringCollection strings = FindGroups(target,beforeGroup,afterGroup,false);
+			if( lookup == null )
+			{
+				throw new ArgumentNullException("lookup");
+			}
+			foreach(string substring in strings) 
+			{
+				target = target.Replace(beforeGroup + substring + afterGroup, lookup(substring) );
+			}
+			return target;
+		}
+
+		/// <summary>
+		/// Replaces ${var} statements in a string with the corresonding values as detirmined by the lookup delegate
+		/// </summary>
+		/// <param name="target">The target.</param>
+		/// <param name="lookup">The lookup.</param>
+		/// <returns></returns>
+		public static string InterpolateForVariables(string target, StringLookup lookup) 
+		{
+			return ReplaceGroups(target, "${" , "}" , lookup);
+		}
+
+		/// <summary>
+		/// Replaces ${var} statements in a string with the corresonding environment variable with name var
+		/// </summary>
+		/// <param name="target"></param>
+		/// <returns></returns>
+		public static string InterpolateForEnvironmentVariables(string target) 
+		{
+			return InterpolateForVariables(target, new StringLookup(Environment.GetEnvironmentVariable));
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Translates the value.
+		/// </summary>
+		/// <param name="translateType">Type of the translate.</param>
+		/// <param name="translationItem">The translation item.</param>
+		/// <returns></returns>
+		public static object TranslateValue(Type translateType, string translationItem)
+		{
+			if(translationItem == null)
+			{
+				return null;
+			}
+
+			try
+			{
+				string lowerVal = translationItem.ToLower();
+				if(translateType == typeof(bool))
+				{
+					return (lowerVal == "true" || lowerVal == "1" || lowerVal == "y" || lowerVal == "yes" || lowerVal == "on");
+				}
+				else if(translateType == typeof(int))
+				{
+					return (Int32.Parse(translationItem));
+				}
+				else
+				{
+					return translationItem;
+				}
+			}
+			catch(FormatException)
+			{
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Deletes if exists.
+		/// </summary>
+		/// <param name="file">The file.</param>
+		/// <returns></returns>
+		public static bool DeleteIfExists(string file)
+		{
+			string resFile = null;
+			try
+			{
+				resFile = ResolvePath(file);
+			}
+			catch(ArgumentException)
+			{
+				return false;
+			}
+
+			if(!File.Exists(resFile))
+			{
+				return false;
+			}
+
+			File.Delete(resFile);
+			return true;
+		}
+
+		// This little gem was taken from the NeL source, thanks guys!
+		/// <summary>
+		/// Makes a relative path
+		/// </summary>
+		/// <param name="startPath">Path to start from</param>
+		/// <param name="endPath">Path to end at</param>
+		/// <returns>Path that will get from startPath to endPath</returns>
+		public static string MakePathRelativeTo(string startPath, string endPath)
+		{
+			string tmp = NormalizePath(startPath, '/');
+			string src = NormalizePath(endPath, '/');
+			string prefix = "";
+
+			while(true)
+			{
+				if((String.Compare(tmp, 0, src, 0, tmp.Length) == 0))
+				{
+					string ret;
+					int size = tmp.Length;
+					if(size == src.Length)
+					{
+						return "./";
+					}
+					if  ((src.Length > tmp.Length) && src[tmp.Length-1] != '/' && src[tmp.Length-1] != '\\')
+					{
+					}
+					else
+					{
+						ret = prefix + endPath.Substring(size, endPath.Length - size);
+						ret = ret.Trim();
+						if(ret[0] == '/' || ret[0] == '\\')
+						{
+							ret = "." + ret;
+						}
+
+						return NormalizePath(ret);
+					}
+					
+				}
+
+				if(tmp.Length < 2)
+				{
+					break;
+				}
+
+				int lastPos = tmp.LastIndexOf('/', tmp.Length - 2);
+				int prevPos = tmp.IndexOf('/');
+
+				if((lastPos == prevPos) || (lastPos == -1))
+				{
+					break;
+				}
+
+				tmp = tmp.Substring(0, lastPos + 1);
+				prefix += "../";
+			}
+
+			return endPath;
+		}
+
+		/// <summary>
+		/// Resolves the path.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		/// <returns></returns>
+		public static string ResolvePath(string path)
+		{
+			string tmpPath = NormalizePath(path);
+			if(tmpPath.Length < 1)
+			{
+				tmpPath = ".";
+			}
+            
+			tmpPath = Path.GetFullPath(tmpPath);
+			if(!File.Exists(tmpPath) && !Directory.Exists(tmpPath))
+			{
+				throw new ArgumentException("Path could not be resolved: " + tmpPath);
+			}
+
+			return tmpPath;
+		}
+
+		/// <summary>
+		/// Normalizes the path.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		/// <param name="separatorCharacter">The separator character.</param>
+		/// <returns></returns>
+		public static string NormalizePath(string path, char separatorCharacter)
+		{
+			if(path == null || path == "" || path.Length < 1)
+			{
+				return "";
+			}
+
+			string tmpPath = path.Replace('\\', '/');
+			tmpPath = tmpPath.Replace('/', separatorCharacter);
+			return tmpPath;
+		}
+
+		/// <summary>
+		/// Normalizes the path.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		/// <returns></returns>
+		public static string NormalizePath(string path)
+		{
+			return NormalizePath(path, Path.DirectorySeparatorChar);
+		}
+        
+		/// <summary>
+		/// Ends the path.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		/// <param name="separatorCharacter">The separator character.</param>
+		/// <returns></returns>
+		public static string EndPath(string path, char separatorCharacter)
+		{
+			if(path == null || path == "" || path.Length < 1)
+			{
+				return "";
+			}
+
+			if(!path.EndsWith(separatorCharacter.ToString()))
+			{
+				return (path + separatorCharacter);
+			}
+
+			return path;
+		}
+
+		/// <summary>
+		/// Ends the path.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		/// <returns></returns>
+		public static string EndPath(string path)
+		{
+			return EndPath(path, Path.DirectorySeparatorChar);
+		}
+
+		/// <summary>
+		/// Makes the file path.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		/// <param name="name">The name.</param>
+		/// <param name="ext">The ext.</param>
+		/// <returns></returns>
+		public static string MakeFilePath(string path, string name, string ext)
+		{
+			string ret = EndPath(NormalizePath(path));
+            
+			if( name == null )
+			{
+				throw new ArgumentNullException("name");
+			}
+
+			ret += name;
+			if(!name.EndsWith("." + ext))
+			{
+				ret += "." + ext;
+			}
+            
+            //foreach(char c in Path.GetInvalidPathChars())
+            //{
+            //    ret = ret.Replace(c, '_');
+            //}
+
+			return ret;
+		}
+
+		/// <summary>
+		/// Makes the file path.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		/// <param name="name">The name.</param>
+		/// <returns></returns>
+		public static string MakeFilePath(string path, string name)
+		{
+			string ret = EndPath(NormalizePath(path));
+            
+			if( name == null )
+			{
+				throw new ArgumentNullException("name");
+			}
+
+			ret += name;
+
+            //foreach (char c in Path.GetInvalidPathChars())
+            //{
+            //    ret = ret.Replace(c, '_');
+            //}
+
+			return ret;
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="path"></param>
+		/// <returns></returns>
+		public static string MakeReferencePath(string path)
+		{
+			string ret = EndPath(NormalizePath(path));
+
+            //foreach (char c in Path.GetInvalidPathChars())
+            //{
+            //    ret = ret.Replace(c, '_');
+            //}
+
+			return ret;
+		}
+
+		/// <summary>
+		/// Sets the current dir.
+		/// </summary>
+		/// <param name="path">The path.</param>
+		public static void SetCurrentDir(string path)
+		{
+			if( path == null )
+			{
+				throw new ArgumentNullException("path");
+			}
+			if(path.Length < 1)
+			{
+				return;
+			}
+
+			Environment.CurrentDirectory = path;
+		}
+
+		/// <summary>
+		/// Checks the type.
+		/// </summary>
+		/// <param name="typeToCheck">The type to check.</param>
+		/// <param name="attr">The attr.</param>
+		/// <param name="inter">The inter.</param>
+		/// <returns></returns>
+		public static object CheckType(Type typeToCheck, Type attr, Type inter)
+		{
+			if(typeToCheck == null || attr == null)
+			{
+				return null;
+			}
+
+			object[] attrs = typeToCheck.GetCustomAttributes(attr, false);
+			if(attrs == null || attrs.Length < 1)
+			{
+				return null;
+			}
+			if( inter == null )
+			{
+				throw new ArgumentNullException("inter");
+			}
+
+			if(typeToCheck.GetInterface(inter.FullName) == null)
+			{
+				return null;
+			}
+
+			return attrs[0];
+		}
+
+		/* A bit of overhead for simple group parsing, there are problems with Regex in Mono
+		public static string ParseValue(string val)
+		{
+			if(val == null || val.Length < 1 || !CheckForOSVariables)
+				return val;
+
+			string tmp = val;
+			Match m = m_VarRegex.Match(val);
+			while(m.Success)
+			{
+				if(m.Groups["var"] == null)
+					continue;
+
+				Capture c = m.Groups["var"].Captures[0];
+				if(c == null)
+					continue;
+
+				string var = c.Value;
+				string envVal = Environment.GetEnvironmentVariable(var);
+				if(envVal == null)
+					envVal = "";
+
+				tmp = tmp.Replace("${" + var + "}", envVal);
+				m = m.NextMatch();
+			}
+
+			return tmp;
+		}*/
+
+		/// <summary>
+		/// Attributes the value.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		/// <param name="attr">The attr.</param>
+		/// <param name="def">The def.</param>
+		/// <returns></returns>
+		public static string AttributeValue(XmlNode node, string attr, string def)
+		{
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+			if(node.Attributes[attr] == null)
+			{
+				return def;
+			}
+			string val = node.Attributes[attr].Value;
+			if(!CheckForOSVariables)
+			{
+				return val;
+			}
+
+			return InterpolateForEnvironmentVariables(val);
+		}
+
+		/// <summary>
+		/// Parses the boolean.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		/// <param name="attr">The attr.</param>
+		/// <param name="defaultValue">if set to <c>true</c> [default value].</param>
+		/// <returns></returns>
+		public static bool ParseBoolean(XmlNode node, string attr, bool defaultValue) 
+		{
+			if( node == null )
+			{
+				throw new ArgumentNullException("node");
+			}
+			if(node.Attributes[attr] == null)
+			{
+				return defaultValue;
+			}
+			return bool.Parse(node.Attributes[attr].Value);
+		}
+
+		/// <summary>
+		/// Enums the attribute value.
+		/// </summary>
+		/// <param name="node">The node.</param>
+		/// <param name="attr">The attr.</param>
+		/// <param name="enumType">Type of the enum.</param>
+		/// <param name="def">The def.</param>
+		/// <returns></returns>
+		public static object EnumAttributeValue(XmlNode node, string attr, Type enumType, object def)
+		{
+			if( def == null )
+			{
+				throw new ArgumentNullException("def");
+			}
+			string val = AttributeValue(node, attr, def.ToString());
+			return Enum.Parse(enumType, val, true);
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="assemblyName"></param>
+		/// <param name="projectType"></param>
+		/// <returns></returns>
+		public static string AssemblyFullName(string assemblyName, ProjectType projectType)
+		{
+			return assemblyName + (projectType == ProjectType.Library ? ".dll" : ".exe");
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/Utilities/Log.cs b/Prebuild/src/Core/Utilities/Log.cs
new file mode 100644
index 0000000..da2cc96
--- /dev/null
+++ b/Prebuild/src/Core/Utilities/Log.cs
@@ -0,0 +1,279 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.IO;
+
+namespace Prebuild.Core.Utilities
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum LogType
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		None,
+		/// <summary>
+		/// 
+		/// </summary>
+		Info,
+		/// <summary>
+		/// 
+		/// </summary>
+		Warning,
+		/// <summary>
+		/// 
+		/// </summary>
+		Error
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	[Flags]
+	public enum LogTargets
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		None = 0,
+		/// <summary>
+		/// 
+		/// </summary>
+		Null = 1,
+		/// <summary>
+		/// 
+		/// </summary>
+		File = 2,
+		/// <summary>
+		/// 
+		/// </summary>
+		Console = 4
+	}
+
+	/// <summary>
+	/// Summary description for Log.
+	/// </summary>
+	public class Log : IDisposable
+	{
+		#region Fields
+
+		private StreamWriter m_Writer;
+		private LogTargets m_Target = LogTargets.Null;
+		bool disposed;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Log"/> class.
+		/// </summary>
+		/// <param name="target">The target.</param>
+		/// <param name="fileName">Name of the file.</param>
+		public Log(LogTargets target, string fileName)
+		{
+			m_Target = target;
+            
+			if((m_Target & LogTargets.File) != 0)
+			{
+				m_Writer = new StreamWriter(fileName, false);
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Writes this instance.
+		/// </summary>
+		public void Write() 
+		{
+			Write(string.Empty);
+		}
+
+		/// <summary>
+		/// Writes the specified MSG.
+		/// </summary>
+		/// <param name="msg">The MSG.</param>
+		public void Write(string msg) 
+		{
+			if((m_Target & LogTargets.Null) != 0)
+			{
+				return;
+			}
+
+			if((m_Target & LogTargets.Console) != 0)
+			{
+				Console.WriteLine(msg);
+			}
+			if((m_Target & LogTargets.File) != 0 && m_Writer != null)
+			{
+				m_Writer.WriteLine(msg);
+			}
+		}
+
+		/// <summary>
+		/// Writes the specified format.
+		/// </summary>
+		/// <param name="format">The format.</param>
+		/// <param name="args">The args.</param>
+		public void Write(string format, params object[] args)
+		{
+			Write(string.Format(format,args));
+		}
+
+		/// <summary>
+		/// Writes the specified type.
+		/// </summary>
+		/// <param name="type">The type.</param>
+		/// <param name="format">The format.</param>
+		/// <param name="args">The args.</param>
+		public void Write(LogType type, string format, params object[] args)
+		{
+			if((m_Target & LogTargets.Null) != 0)
+			{
+				return;
+			}
+
+			string str = "";
+			switch(type) 
+			{
+				case LogType.Info:
+					str = "[I] "; 
+					break;
+				case LogType.Warning:
+					str = "[!] "; 
+					break;
+				case LogType.Error:
+					str = "[X] "; 
+					break;
+			}
+
+			Write(str + format,args);
+		}
+
+		/// <summary>
+		/// Writes the exception.
+		/// </summary>
+		/// <param name="type">The type.</param>
+		/// <param name="ex">The ex.</param>
+		public void WriteException(LogType type, Exception ex)
+		{
+			if(ex != null)
+			{
+				Write(type, ex.Message);
+				//#if DEBUG
+				m_Writer.WriteLine("Exception @{0} stack trace [[", ex.TargetSite.Name);
+				m_Writer.WriteLine(ex.StackTrace);
+				m_Writer.WriteLine("]]");
+				//#endif
+			}
+		}
+
+		/// <summary>
+		/// Flushes this instance.
+		/// </summary>
+		public void Flush()
+		{
+			if(m_Writer != null)
+			{
+				m_Writer.Flush();
+			}
+		}
+
+		#endregion
+
+		#region IDisposable Members
+
+		/// <summary>
+		/// Performs application-defined tasks associated with freeing, releasing, or
+		/// resetting unmanaged resources.
+		/// </summary>
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
+		/// <summary>
+		/// Dispose objects
+		/// </summary>
+		/// <param name="disposing">
+		/// If true, it will dispose close the handle
+		/// </param>
+		/// <remarks>
+		/// Will dispose managed and unmanaged resources.
+		/// </remarks>
+		protected virtual void Dispose(bool disposing)
+		{
+			if (!this.disposed)
+			{
+				if (disposing)
+				{
+					if (m_Writer != null)
+					{
+						m_Writer.Close();
+						m_Writer = null;
+					}
+				}
+			}
+			this.disposed = true;
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		~Log()
+		{
+			this.Dispose(false);
+		}
+		
+		/// <summary>
+		/// Closes and destroys this object
+		/// </summary>
+		/// <remarks>
+		/// Same as Dispose(true)
+		/// </remarks>
+		public void Close() 
+		{
+			Dispose();
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Core/WarningException.cs b/Prebuild/src/Core/WarningException.cs
new file mode 100644
index 0000000..a200bdc
--- /dev/null
+++ b/Prebuild/src/Core/WarningException.cs
@@ -0,0 +1,93 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Revision: 71 $
+ */
+#endregion
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Prebuild.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[Serializable()]
+	public class WarningException : Exception
+	{
+		#region Constructors
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public WarningException()
+		{
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="format"></param>
+		/// <param name="args"></param>
+		public WarningException(string format, params object[] args)
+			: base(String.Format(format, args))
+		{
+		}
+
+		/// <summary>
+		/// Exception with specified string
+		/// </summary>
+		/// <param name="message">Exception message</param>
+		public WarningException(string message): base(message)
+		{
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="message"></param>
+		/// <param name="exception"></param>
+		public WarningException(string message, Exception exception) : base(message, exception)
+		{
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="info"></param>
+		/// <param name="context"></param>
+		protected WarningException(SerializationInfo info, StreamingContext context) : base( info, context )
+		{
+		}
+
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Prebuild.cs b/Prebuild/src/Prebuild.cs
new file mode 100644
index 0000000..597db68
--- /dev/null
+++ b/Prebuild/src/Prebuild.cs
@@ -0,0 +1,165 @@
+#region	BSD	License
+/*
+Copyright (c) 2004-2005	Matthew	Holmes (matthew@wildfiregames.com),	Dan	Moorehead (dan05a@gmail.com)
+
+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.	
+* The name of the author may not be	used to	endorse	or promote products	derived	from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR	``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 AUTHOR 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.
+*/
+#endregion
+
+#region	CVS	Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2006-09-26 23:43:35 +0200 (ti, 26 sep 2006) $
+ * $Revision: 168 $
+ */
+#endregion
+
+using System;
+using System.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.EnterpriseServices.Internal;
+
+using Prebuild.Core;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild 
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	class Prebuild
+	{
+		#region	Main
+
+		[STAThread]
+		static void	Main(string[] args)	
+		{
+			Kernel	kernel = null;
+			try	
+			{
+				kernel = Kernel.Instance;
+				kernel.Initialize(LogTargets.File | LogTargets.Console, args);
+				bool exit =	false;
+
+				if(kernel.CommandLine.WasPassed("usage")) 
+				{
+					exit = true;
+					OutputUsage();
+				}
+				if(kernel.CommandLine.WasPassed("showtargets"))	
+				{
+					exit = true;
+					OutputTargets(kernel);
+				}
+				if(kernel.CommandLine.WasPassed("install")) 
+				{
+					exit = true;
+					InstallAssembly(kernel);
+				}
+				if(kernel.CommandLine.WasPassed("remove")) 
+				{
+					exit = true;
+					RemoveAssembly(kernel);
+				}
+
+				if(!exit)
+				{
+					kernel.Process();
+				}
+			}
+			catch(Exception	ex)	
+			{
+				Console.WriteLine("Unhandled error:	{0}", ex.Message);
+				//#if DEBUG
+				Console.WriteLine("{0}", ex.StackTrace);
+				//#endif
+			}
+			finally
+			{
+				if(kernel.PauseAfterFinish)	
+				{
+					Console.WriteLine("\nPress enter to continue...");
+					Console.ReadLine();
+				}
+			}
+		}
+
+		#endregion
+
+		#region	Private	Methods
+
+		private static void InstallAssembly(Kernel kernel)
+		{
+			Publish publish = new Publish();
+			string file = kernel.CommandLine["install"];
+            //Console.WriteLine(".."+file+"..");
+			publish.GacInstall(file);
+		}
+
+		private static void RemoveAssembly(Kernel kernel)
+		{
+			Publish publish = new Publish();
+			string file = kernel.CommandLine["remove"];
+			publish.GacRemove(file);
+		}
+
+		private	static void	OutputUsage() 
+		{
+			Console.WriteLine("Usage: prebuild /target <target> [options]");
+			Console.WriteLine("Available command-line switches:");
+			Console.WriteLine();
+			Console.WriteLine("/target          Target for Prebuild");
+			Console.WriteLine("/clean           Clean the build files for the given target");
+			Console.WriteLine("/file            XML file to process");
+			Console.WriteLine("/log             Log file to write to");
+			Console.WriteLine("/ppo             Pre-process the file, but perform no other processing");
+			Console.WriteLine("/pause           Pauses the application after execution to view the output");
+			Console.WriteLine("/yes             Default to yes to any questions asked");
+			Console.WriteLine("/install         Install assembly into the GAC");
+			Console.WriteLine("/remove          Remove assembly from the GAC");
+			Console.WriteLine();
+			Console.WriteLine("See 'prebuild /showtargets for a list of available targets");
+			Console.WriteLine("See readme.txt or check out http://dnpb.sourceforge.net for more information");
+			Console.WriteLine();
+		}
+
+		private	static void	OutputTargets(Kernel kern)
+		{
+			Console.WriteLine("Targets available in Prebuild:");
+			Console.WriteLine("");
+			if(kern.Targets.Keys.Count > 0)
+			{
+				string[] targs = new string[kern.Targets.Keys.Count];
+				kern.Targets.Keys.CopyTo(targs,	0);
+				Array.Sort(targs);
+				foreach(string target in targs)
+				{
+					Console.WriteLine(target);
+				}
+			}
+			Console.WriteLine("");
+		}
+		
+		#endregion
+	}
+}
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
new file mode 100644
index 0000000..c8b859c
--- /dev/null
+++ b/Prebuild/src/Prebuild.csproj
@@ -0,0 +1,205 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{92E80C1C-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>App.ico</ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Prebuild</AssemblyName>
+    <AssemblyOriginatorKeyFile>Prebuild.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>Prebuild</RootNamespace>
+    <StartupObject>Prebuild.Prebuild</StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1595</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1595</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.EnterpriseServices" >
+      <HintPath>System.EnterpriseServices.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="App.ico">
+    </EmbeddedResource>
+    <EmbeddedResource Include="data\prebuild-1.7.xsd">
+    </EmbeddedResource>
+    <Compile Include="Prebuild.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\FatalException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Kernel.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\UnknownLanguageException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\WarningException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Attributes\TargetAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Interfaces\IDataNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Interfaces\ITarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\ConfigurationNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\DataNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\ExcludeNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\FileNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\FilesNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\MatchNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\OptionsNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\ProcessNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\ProjectNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\ReferenceNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\ReferencePathNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Nodes\SolutionNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Parse\IfContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Parse\Preprocessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\AutotoolsTarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\DebugTarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\NAntTarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\SharpDevelop2Target.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\VS2002Target.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\VS2003Target.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Targets\VS2005Target.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Utilities\Helper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Utilities\Log.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/Prebuild/src/Prebuild.csproj.user b/Prebuild/src/Prebuild.csproj.user
new file mode 100644
index 0000000..6841907
--- /dev/null
+++ b/Prebuild/src/Prebuild.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
new file mode 100644
index 0000000..2851125
--- /dev/null
+++ b/Prebuild/src/Prebuild.exe.build
@@ -0,0 +1,80 @@
+<?xml version="1.0" ?>
+<project name="Prebuild" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
+            <resources prefix="Prebuild" dynamicprefix="true" >
+                <include name="App.ico" />
+                <include name="data/prebuild-1.7.xsd" />
+            </resources>
+            <sources failonempty="true">
+                <include name="Prebuild.cs" />
+                <include name="Core/FatalException.cs" />
+                <include name="Core/Kernel.cs" />
+                <include name="Core/UnknownLanguageException.cs" />
+                <include name="Core/WarningException.cs" />
+                <include name="Core/Attributes/DataNodeAttribute.cs" />
+                <include name="Core/Attributes/OptionNodeAttribute.cs" />
+                <include name="Core/Attributes/TargetAttribute.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/Interfaces/ITarget.cs" />
+                <include name="Core/Nodes/ConfigurationNode.cs" />
+                <include name="Core/Nodes/DataNode.cs" />
+                <include name="Core/Nodes/ExcludeNode.cs" />
+                <include name="Core/Nodes/FileNode.cs" />
+                <include name="Core/Nodes/FilesNode.cs" />
+                <include name="Core/Nodes/MatchNode.cs" />
+                <include name="Core/Nodes/OptionsNode.cs" />
+                <include name="Core/Nodes/ProcessNode.cs" />
+                <include name="Core/Nodes/ProjectNode.cs" />
+                <include name="Core/Nodes/ReferenceNode.cs" />
+                <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/SolutionNode.cs" />
+                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Parse/Preprocessor.cs" />
+                <include name="Core/Targets/AutotoolsTarget.cs" />
+                <include name="Core/Targets/DebugTarget.cs" />
+                <include name="Core/Targets/MonoDevelopTarget.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.cs" />
+                <include name="Core/Targets/SharpDevelopTarget.cs" />
+                <include name="Core/Targets/VS2002Target.cs" />
+                <include name="Core/Targets/VS2003Target.cs" />
+                <include name="Core/Targets/VS2005Target.cs" />
+                <include name="Core/Utilities/CommandLineCollection.cs" />
+                <include name="Core/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Utilities/Helper.cs" />
+                <include name="Core/Utilities/Log.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.EnterpriseServices.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/Prebuild/src/Prebuild.snk b/Prebuild/src/Prebuild.snk
new file mode 100644
index 0000000..f9dce05
Binary files /dev/null and b/Prebuild/src/Prebuild.snk differ
diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..bfa9829
--- /dev/null
+++ b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,101 @@
+#region BSD License
+/*
+Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
+
+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. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source$
+ * $Author: jendave $
+ * $Date: 2007-01-26 19:31:34 +0100 (fr, 26 jan 2007) $
+ * $Revision: 203 $
+ */
+#endregion
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+using System.Resources;
+
+
+// FxCop recommended attributes
+[assembly: ComVisible(false)]
+[assembly: FileIOPermission(SecurityAction.RequestMinimum, Unrestricted=true)]
+[assembly: CLSCompliant(true)]
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle(".NET Prebuild")]
+[assembly: AssemblyDescription("A .NET project file build tool")]
+[assembly: AssemblyConfiguration(".NET CLR")]
+[assembly: AssemblyCompany("The Prebuild Project")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("Copyright  2004-2006 Matthew Holmes, Dan Moorehead and David Hudson")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguageAttribute("en-US")]
+[assembly: AssemblyVersion("2.0.0.*")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyName("")]
diff --git a/Prebuild/src/data/dnpb-1.0.xsd b/Prebuild/src/data/dnpb-1.0.xsd
new file mode 100644
index 0000000..45cab86
--- /dev/null
+++ b/Prebuild/src/data/dnpb-1.0.xsd
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema elementFormDefault="qualified" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.0.xsd"
+	xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.0.xsd"
+>
+	<xs:annotation>
+		<xs:documentation>
+			Copyright (c) 2004 Matthew Holmes (kerion@houston.rr.com)
+
+			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. 
+			* The name of the author may not be used to endorse or promote products derived from this software 
+			  without specific prior written permission. 
+
+			THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+		</xs:documentation>
+	</xs:annotation>
+
+	<xs:element name="DNPreBuild">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Solution" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="version" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Process" type="xs:string" />
+
+	<xs:element name="Solution">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+				<xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+				<xs:element ref="Files" minOccurs="0" />
+				<xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="path" type="xs:string" default="" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Project">
+		<xs:complexType>		
+			<xs:sequence>
+				<xs:element name="Reference" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="path" type="xs:string" />
+						<xs:attribute name="localCopy" type="xs:boolean" />
+						<xs:attribute name="version" type="xs:string" />
+					</xs:complexType>
+				</xs:element>
+
+				<xs:element ref="Files" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="path" type="xs:string" default="" />
+
+			<xs:attribute name="language" default="C#">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="C#" />
+						<xs:enumeration value="VB.NET" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+
+			<xs:attribute name="type" default="Exe">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Exe" />
+						<xs:enumeration value="WinExe" />
+						<xs:enumeration value="Library" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="runtime" default="Microsoft">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Microsoft" />
+						<xs:enumeration value="Mono" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="startupObject" type="xs:string" default="" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Configuration">	
+		<xs:complexType>
+			<xs:all>
+				<xs:element ref="Options" minOccurs="0" />
+			</xs:all>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Options">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+				<xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+				<xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+				<xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+				<xs:element name="WarningLevel" minOccurs="0">
+					<xs:simpleType>
+						<xs:restriction base="xs:integer">
+							<xs:minInclusive value="0" />
+							<xs:maxInclusive value="4"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+				<xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
+				<xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+				<xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+				<xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
+				<xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+				<xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+				<xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+				<xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />
+				<xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence> 
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Files">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="File">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+					<xs:attribute name="buildAction" default="Compile">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="Compile" />
+								<xs:enumeration value="Content" />
+								<xs:enumeration value="EmbeddedResource" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:attribute>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Match">
+		<xs:complexType>
+			<xs:attribute name="path" type="xs:string" use="required" />
+			<xs:attribute name="pattern" type="xs:string" use="required" />
+			<xs:attribute name="recurse" type="xs:boolean" default="false" />
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/Prebuild/src/data/dnpb-1.1.xsd b/Prebuild/src/data/dnpb-1.1.xsd
new file mode 100644
index 0000000..c402ceb
--- /dev/null
+++ b/Prebuild/src/data/dnpb-1.1.xsd
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema elementFormDefault="qualified" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.1.xsd"
+	xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.1.xsd"
+>
+	<xs:annotation>
+		<xs:documentation>
+			Copyright (c) 2004 Matthew Holmes (kerion@houston.rr.com)
+
+			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. 
+			* The name of the author may not be used to endorse or promote products derived from this software 
+			  without specific prior written permission. 
+
+			THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+		</xs:documentation>
+	</xs:annotation>
+
+	<xs:element name="DNPreBuild">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Solution" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="version" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Process" type="xs:string" />
+
+	<xs:element name="Solution">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+				<xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+				<xs:element ref="Files" minOccurs="0" />
+				<xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="path" type="xs:string" default="" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Project">
+		<xs:complexType>		
+			<xs:sequence>
+				<xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+
+				<xs:element name="Reference" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="path" type="xs:string" />
+						<xs:attribute name="localCopy" type="xs:boolean" />
+						<xs:attribute name="version" type="xs:string" />
+					</xs:complexType>
+				</xs:element>
+
+				<xs:element ref="Files" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="path" type="xs:string" default="" />
+
+			<xs:attribute name="language" default="C#">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="C#" />
+						<xs:enumeration value="VB.NET" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+
+			<xs:attribute name="type" default="Exe">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Exe" />
+						<xs:enumeration value="WinExe" />
+						<xs:enumeration value="Library" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="runtime" default="Microsoft">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Microsoft" />
+						<xs:enumeration value="Mono" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="startupObject" type="xs:string" default="" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Configuration">	
+		<xs:complexType>
+			<xs:all>
+				<xs:element ref="Options" minOccurs="0" />
+			</xs:all>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Options">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+				<xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+				<xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+				<xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+				<xs:element name="WarningLevel" minOccurs="0">
+					<xs:simpleType>
+						<xs:restriction base="xs:integer">
+							<xs:minInclusive value="0" />
+							<xs:maxInclusive value="4"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+				<xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
+				<xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+				<xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+				<xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
+				<xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+				<xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+				<xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+				<xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />				
+			</xs:sequence> 
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Files">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="File">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+					<xs:attribute name="buildAction" default="Compile">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="Compile" />
+								<xs:enumeration value="Content" />
+								<xs:enumeration value="EmbeddedResource" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:attribute>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Match">
+		<xs:complexType>
+			<xs:attribute name="path" type="xs:string" use="required" />
+			<xs:attribute name="pattern" type="xs:string" use="required" />
+			<xs:attribute name="recurse" type="xs:boolean" default="false" />
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/Prebuild/src/data/dnpb-1.2.xsd b/Prebuild/src/data/dnpb-1.2.xsd
new file mode 100644
index 0000000..8004af7
--- /dev/null
+++ b/Prebuild/src/data/dnpb-1.2.xsd
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema elementFormDefault="qualified" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.2.xsd"
+	xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.2.xsd"
+>
+	<xs:annotation>
+		<xs:documentation>
+			Copyright (c) 2004 Matthew Holmes (calefaction _at_ houston _._ rr _._ com)
+
+			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. 
+			* The name of the author may not be used to endorse or promote products derived from this software 
+			  without specific prior written permission. 
+
+			THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+		</xs:documentation>
+	</xs:annotation>
+
+	<xs:element name="DNPreBuild">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="version" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Process" type="xs:string" />
+
+	<xs:element name="Solution">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+				<xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+				<xs:element ref="Files" minOccurs="0" />
+				<xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="path" type="xs:string" default="" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Project">
+		<xs:complexType>		
+			<xs:sequence>
+				<xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
+
+				<xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+
+				<xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="path" type="xs:string" />
+						<xs:attribute name="localCopy" type="xs:boolean" />
+						<xs:attribute name="version" type="xs:string" />
+					</xs:complexType>
+				</xs:element>
+
+				<xs:element ref="Files" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="path" type="xs:string" default="" />
+
+			<xs:attribute name="language" default="C#">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="C#" />
+						<xs:enumeration value="VB.NET" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+
+			<xs:attribute name="type" default="Exe">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Exe" />
+						<xs:enumeration value="WinExe" />
+						<xs:enumeration value="Library" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="runtime" default="Microsoft">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Microsoft" />
+						<xs:enumeration value="Mono" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="startupObject" type="xs:string" default="" />
+			<xs:attribute name="rootNamespace" type="xs:string" />
+			<xs:attribute name="assemblyName" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Configuration">	
+		<xs:complexType>
+			<xs:all>
+				<xs:element ref="Options" minOccurs="0" />
+			</xs:all>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Options">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+				<xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+				<xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+				<xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+				<xs:element name="WarningLevel" minOccurs="0">
+					<xs:simpleType>
+						<xs:restriction base="xs:integer">
+							<xs:minInclusive value="0" />
+							<xs:maxInclusive value="4"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+				<xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
+				<xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+				<xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+				<xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
+				<xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+				<xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+				<xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+				<xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />				
+			</xs:all> 
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Files">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="File">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+	                <xs:attribute name="buildAction" default="Compile">
+		                <xs:simpleType>
+			                <xs:restriction base="xs:string">
+				                <xs:enumeration value="Compile" />
+				                <xs:enumeration value="Content" />
+				                <xs:enumeration value="EmbeddedResource" />
+			                </xs:restriction>
+		                </xs:simpleType>
+	                </xs:attribute>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Match">
+		<xs:complexType>
+			<xs:attribute name="path" type="xs:string" use="required" />			
+			<xs:attribute name="pattern" type="xs:string" use="required" />
+			<xs:attribute name="recurse" type="xs:boolean" default="false" />
+			<xs:attribute name="useRegex" type="xs:boolean" default="false" />
+	        <xs:attribute name="buildAction" default="Compile">
+		        <xs:simpleType>
+			        <xs:restriction base="xs:string">
+				        <xs:enumeration value="Compile" />
+				        <xs:enumeration value="Content" />
+				        <xs:enumeration value="EmbeddedResource" />
+			        </xs:restriction>
+		        </xs:simpleType>
+	        </xs:attribute>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/Prebuild/src/data/dnpb-1.3.xsd b/Prebuild/src/data/dnpb-1.3.xsd
new file mode 100644
index 0000000..5f8ada1
--- /dev/null
+++ b/Prebuild/src/data/dnpb-1.3.xsd
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema elementFormDefault="qualified" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.3.xsd"
+	xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.3.xsd"
+>
+	<xs:annotation>
+		<xs:documentation>
+			Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com)
+			
+			.NET Pre-Build is an XML-driven pre-build tool allowing developers to
+			easily generate project or make files for major IDE's and .NET
+			development tools including: Visual Studio 2003, Visual Studio 2002,
+			SharpDevelop, MonoDevelop, and NAnt.
+
+			BSD License:
+			
+			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. 
+			* The name of the author may not be used to endorse or promote products derived from this software 
+			  without specific prior written permission. 
+
+			THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
+		</xs:documentation>
+	</xs:annotation>
+
+	<xs:element name="DNPreBuild">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="version" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Process" type="xs:string" />
+
+	<xs:element name="Solution">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+				<xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+				<xs:element ref="Files" minOccurs="0" />
+				<xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="path" type="xs:string" default="" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Project">
+		<xs:complexType>		
+			<xs:sequence>
+				<xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
+
+				<xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+
+				<xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="path" type="xs:string" />
+						<xs:attribute name="localCopy" type="xs:boolean" />
+						<xs:attribute name="version" type="xs:string" />
+					</xs:complexType>
+				</xs:element>
+
+				<xs:element ref="Files" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="path" type="xs:string" default="" />
+			<xs:attribute name="icon" type="xs:string" default="" />
+
+			<xs:attribute name="language" default="C#">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="C#" />
+						<xs:enumeration value="VB.NET" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+
+			<xs:attribute name="type" default="Exe">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Exe" />
+						<xs:enumeration value="WinExe" />
+						<xs:enumeration value="Library" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="runtime" default="Microsoft">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Microsoft" />
+						<xs:enumeration value="Mono" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="startupObject" type="xs:string" default="" />
+			<xs:attribute name="rootNamespace" type="xs:string" />
+			<xs:attribute name="assemblyName" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Configuration">	
+		<xs:complexType>
+			<xs:all>
+				<xs:element ref="Options" minOccurs="0" />
+			</xs:all>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Options">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+				<xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+				<xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+				<xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+				<xs:element name="WarningLevel" minOccurs="0">
+					<xs:simpleType>
+						<xs:restriction base="xs:integer">
+							<xs:minInclusive value="0" />
+							<xs:maxInclusive value="4"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+				<xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
+				<xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+				<xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+				<xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
+				<xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+				<xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+				<xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+				<xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />				
+			</xs:all> 
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Files">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="File">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+	                <xs:attribute name="buildAction" default="Compile">
+		                <xs:simpleType>
+			                <xs:restriction base="xs:string">
+				                <xs:enumeration value="Compile" />
+				                <xs:enumeration value="Content" />
+				                <xs:enumeration value="EmbeddedResource" />
+			                </xs:restriction>
+		                </xs:simpleType>
+	                </xs:attribute>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Match">
+		<xs:complexType>
+			<xs:attribute name="path" type="xs:string" />			
+			<xs:attribute name="pattern" type="xs:string" use="required" />
+			<xs:attribute name="recurse" type="xs:boolean" default="false" />
+			<xs:attribute name="useRegex" type="xs:boolean" default="false" />
+	        <xs:attribute name="buildAction" default="Compile">
+		        <xs:simpleType>
+			        <xs:restriction base="xs:string">
+				        <xs:enumeration value="Compile" />
+				        <xs:enumeration value="Content" />
+				        <xs:enumeration value="EmbeddedResource" />
+			        </xs:restriction>
+		        </xs:simpleType>
+	        </xs:attribute>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/Prebuild/src/data/dnpb-1.4.xsd b/Prebuild/src/data/dnpb-1.4.xsd
new file mode 100644
index 0000000..54f9ac0
--- /dev/null
+++ b/Prebuild/src/data/dnpb-1.4.xsd
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema elementFormDefault="qualified" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.4.xsd"
+	xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.4.xsd"
+>
+	<xs:annotation>
+		<xs:documentation>
+			Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com)
+
+			.NET Prebuild is a cross-platform XML-driven pre-build tool which
+			allows developers to easily generate project or make files for major
+			IDE's and .NET development tools including: Visual Studio .NET 2002 and
+			2003, SharpDevelop, MonoDevelop, and NAnt.
+
+			BSD License:
+			
+			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. 
+			* The name of the author may not be used to endorse or promote products derived from this software 
+			  without specific prior written permission. 
+
+			THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
+		</xs:documentation>
+	</xs:annotation>
+
+	<xs:element name="DNPreBuild">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="version" />
+			<xs:attribute name="checkOsVars" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Process" type="xs:string" />
+
+	<xs:element name="Solution">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+				<xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+				<xs:element ref="Files" minOccurs="0" />
+				<xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="activeConfig" type="xs:string" default="Debug" />
+			<xs:attribute name="path" type="xs:string" default="" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Project">
+		<xs:complexType>		
+			<xs:sequence>
+				<xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
+
+				<xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+
+				<xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="path" type="xs:string" />
+						<xs:attribute name="localCopy" type="xs:boolean" />
+						<xs:attribute name="version" type="xs:string" />
+					</xs:complexType>
+				</xs:element>
+
+				<xs:element ref="Files" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="path" type="xs:string" default="" />
+			<xs:attribute name="icon" type="xs:string" default="" />
+
+			<xs:attribute name="language" default="C#">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="C#" />
+						<xs:enumeration value="VB.NET" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+
+			<xs:attribute name="type" default="Exe">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Exe" />
+						<xs:enumeration value="WinExe" />
+						<xs:enumeration value="Library" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="runtime" default="Microsoft">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Microsoft" />
+						<xs:enumeration value="Mono" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="startupObject" type="xs:string" default="" />
+			<xs:attribute name="rootNamespace" type="xs:string" />
+			<xs:attribute name="assemblyName" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Configuration">	
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Options">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+				<xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+				<xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+				<xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+				<xs:element name="WarningLevel" minOccurs="0">
+					<xs:simpleType>
+						<xs:restriction base="xs:integer">
+							<xs:minInclusive value="0" />
+							<xs:maxInclusive value="4"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+				<xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
+				<xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+				<xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+				<xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
+				<xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+				<xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+				<xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+				<xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />				
+			</xs:all> 
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Files">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="File">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+	                <xs:attribute name="buildAction" default="Compile">
+		                <xs:simpleType>
+			                <xs:restriction base="xs:string">
+								<xs:enumeration value="None" />
+				                <xs:enumeration value="Compile" />
+				                <xs:enumeration value="Content" />
+				                <xs:enumeration value="EmbeddedResource" />
+			                </xs:restriction>
+		                </xs:simpleType>
+	                </xs:attribute>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Match">
+		<xs:complexType>
+			<xs:attribute name="path" type="xs:string" />			
+			<xs:attribute name="pattern" type="xs:string" use="required" />
+			<xs:attribute name="recurse" type="xs:boolean" default="false" />
+			<xs:attribute name="useRegex" type="xs:boolean" default="false" />
+	        <xs:attribute name="buildAction" default="Compile">
+		        <xs:simpleType>
+			        <xs:restriction base="xs:string">
+				        <xs:enumeration value="None" />
+				        <xs:enumeration value="Compile" />
+				        <xs:enumeration value="Content" />
+				        <xs:enumeration value="EmbeddedResource" />
+			        </xs:restriction>
+		        </xs:simpleType>
+	        </xs:attribute>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
+
+
diff --git a/Prebuild/src/data/dnpb-1.5.xsd b/Prebuild/src/data/dnpb-1.5.xsd
new file mode 100644
index 0000000..2270e83
--- /dev/null
+++ b/Prebuild/src/data/dnpb-1.5.xsd
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema elementFormDefault="qualified" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://dnpb.sourceforge.net/schemas/dnpb-1.5.xsd"
+	xmlns="http://dnpb.sourceforge.net/schemas/dnpb-1.5.xsd"
+>
+	<xs:annotation>
+		<xs:documentation>
+			Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com)
+
+			.NET Prebuild is a cross-platform XML-driven pre-build tool which
+			allows developers to easily generate project or make files for major
+			IDE's and .NET development tools including: Visual Studio .NET 2002 and
+			2003, SharpDevelop, MonoDevelop, and NAnt.
+
+			BSD License:
+			
+			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. 
+			* The name of the author may not be used to endorse or promote products derived from this software 
+			  without specific prior written permission. 
+
+			THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
+		</xs:documentation>
+	</xs:annotation>
+
+	<xs:element name="DNPreBuild">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="version" />
+			<xs:attribute name="checkOsVars" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Process" type="xs:string" />
+
+	<xs:element name="Solution">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+				<xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+				<xs:element ref="Files" minOccurs="0" />
+				<xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="activeConfig" type="xs:string" default="Debug" />
+			<xs:attribute name="path" type="xs:string" default="" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Project">
+		<xs:complexType>		
+			<xs:sequence>
+				<xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
+
+				<xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+
+				<xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="path" type="xs:string" />
+						<xs:attribute name="localCopy" type="xs:boolean" />
+						<xs:attribute name="version" type="xs:string" />
+					</xs:complexType>
+				</xs:element>
+
+				<xs:element ref="Files" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="filterGroups" type="xs:string" default="" />
+			<xs:attribute name="path" type="xs:string" default="" />
+			<xs:attribute name="icon" type="xs:string" default="" />
+
+			<xs:attribute name="language" default="C#">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="C#" />
+						<xs:enumeration value="VB.NET" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+
+			<xs:attribute name="type" default="Exe">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Exe" />
+						<xs:enumeration value="WinExe" />
+						<xs:enumeration value="Library" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="runtime" default="Microsoft">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Microsoft" />
+						<xs:enumeration value="Mono" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			
+			<xs:attribute name="startupObject" type="xs:string" default="" />
+			<xs:attribute name="rootNamespace" type="xs:string" />
+			<xs:attribute name="assemblyName" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Configuration">	
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+			</xs:sequence>
+
+			<xs:attribute name="name" type="xs:string" use="required" />
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Options">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+				<xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+				<xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+				<xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+				<xs:element name="WarningLevel" minOccurs="0">
+					<xs:simpleType>
+						<xs:restriction base="xs:integer">
+							<xs:minInclusive value="0" />
+							<xs:maxInclusive value="4"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+				<xs:element name="SupressWarnings" type="xs:string" minOccurs="0" />
+				<xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+				<xs:element name="GenerateXmlDocFile" type="xs:boolean" minOccurs="0" />
+				<xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+				<xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RegisterCOMInterop" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RemoveIntegerChecks" type="xs:boolean" minOccurs="0" />
+				<xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+				<xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+				<xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+				<xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />				
+			</xs:all> 
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Files">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="File">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+	                <xs:attribute name="buildAction" default="Compile">
+		                <xs:simpleType>
+			                <xs:restriction base="xs:string">
+								<xs:enumeration value="None" />
+				                <xs:enumeration value="Compile" />
+				                <xs:enumeration value="Content" />
+				                <xs:enumeration value="EmbeddedResource" />
+			                </xs:restriction>
+		                </xs:simpleType>
+	                </xs:attribute>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="Match">
+		<xs:complexType>
+			<xs:attribute name="path" type="xs:string" />			
+			<xs:attribute name="pattern" type="xs:string" use="required" />
+			<xs:attribute name="recurse" type="xs:boolean" default="false" />
+			<xs:attribute name="useRegex" type="xs:boolean" default="false" />
+	        <xs:attribute name="buildAction" default="Compile">
+		        <xs:simpleType>
+			        <xs:restriction base="xs:string">
+				        <xs:enumeration value="None" />
+				        <xs:enumeration value="Compile" />
+				        <xs:enumeration value="Content" />
+				        <xs:enumeration value="EmbeddedResource" />
+			        </xs:restriction>
+		        </xs:simpleType>
+	        </xs:attribute>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
+
+
diff --git a/Prebuild/src/data/prebuild-1.6.xsd b/Prebuild/src/data/prebuild-1.6.xsd
new file mode 100644
index 0000000..f944faf
--- /dev/null
+++ b/Prebuild/src/data/prebuild-1.6.xsd
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd"
+	xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.6.xsd">
+	<xs:annotation>
+		<xs:documentation>
+			Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com)
+
+			.NET Prebuild is a cross-platform XML-driven pre-build tool which
+			allows developers to easily generate project or make files for major
+			IDE's and .NET development tools including: Visual Studio .NET 2002 and
+			2003, SharpDevelop, MonoDevelop, and NAnt.
+
+			BSD License:
+			
+			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. 
+			* The name of the author may not be used to endorse or promote products derived from this software 
+			  without specific prior written permission. 
+
+			THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
+		</xs:documentation>
+	</xs:annotation>
+	<xs:element name="Prebuild">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:attribute name="version" />
+			<xs:attribute name="checkOsVars" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Process" type="xs:string" />
+	<xs:element name="Solution">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+				<xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+				<xs:element ref="Files" minOccurs="0" />
+				<xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="activeConfig" type="xs:string" default="Debug" />
+			<xs:attribute name="path" type="xs:string" default="" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Project">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="path" type="xs:string" />
+						<xs:attribute name="localCopy" type="xs:boolean" />
+						<xs:attribute name="version" type="xs:string" />
+					</xs:complexType>
+				</xs:element>
+				<xs:element ref="Files" />
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="filterGroups" type="xs:string" default="" />
+			<xs:attribute name="path" type="xs:string" default="" />
+			<xs:attribute name="icon" type="xs:string" default="" />
+			<xs:attribute name="language" default="C#">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="C#" />
+						<xs:enumeration value="VB.NET" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="type" default="Exe">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Exe" />
+						<xs:enumeration value="WinExe" />
+						<xs:enumeration value="Library" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="runtime" default="Microsoft">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Microsoft" />
+						<xs:enumeration value="Mono" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="startupObject" type="xs:string" default="" />
+			<xs:attribute name="rootNamespace" type="xs:string" />
+			<xs:attribute name="assemblyName" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Configuration">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Options">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+				<xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+				<xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+				<xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+				<xs:element name="PreBuildEvent" type="xs:string" minOccurs="0" />
+				<xs:element name="PostBuildEvent" type="xs:string" minOccurs="0" />
+				<xs:element name="RunPostBuildEvent" minOccurs="0" default="OnBuildSuccess">
+					<xs:simpleType>
+						<xs:restriction base="xs:string">
+							<xs:enumeration value="OnBuildSuccess" />
+							<xs:enumeration value="Always" />
+							<xs:enumeration value="OnOutputUpdated" />
+				 		</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="RunScript" type="xs:string" minOccurs="0" />
+				<xs:element name="PreBuildEventArgs" type="xs:string" minOccurs="0" />
+				<xs:element name="PostBuildEventArgs" type="xs:string" minOccurs="0" />
+				<xs:element name="WarningLevel" minOccurs="0">
+					<xs:simpleType>
+						<xs:restriction base="xs:integer">
+							<xs:minInclusive value="0" />
+							<xs:maxInclusive value="4" />
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+				<xs:element name="SuppressWarnings" type="xs:string" minOccurs="0" />
+				<xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+				<xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+				<xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RegisterComInterop" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RemoveIntegerChecks" type="xs:boolean" minOccurs="0" />
+				<xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+				<xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+				<xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+				<xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Files">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="File">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+					<xs:attribute name="buildAction" default="Compile">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="None" />
+								<xs:enumeration value="Compile" />
+								<xs:enumeration value="Content" />
+								<xs:enumeration value="EmbeddedResource" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:attribute>
+					<xs:attribute name="subType" default="Code">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="Code" />
+								<xs:enumeration value="Component" />
+								<xs:enumeration value="Form" />
+								<xs:enumeration value="UserControl" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:attribute>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Match">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Exclude" minOccurs="0" />
+			</xs:sequence>
+			<xs:attribute name="path" type="xs:string" />
+			<xs:attribute name="pattern" type="xs:string" use="required" />
+			<xs:attribute name="recurse" type="xs:boolean" default="false" />
+			<xs:attribute name="useRegex" type="xs:boolean" default="false" />
+			<xs:attribute name="buildAction" default="Compile">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="None" />
+						<xs:enumeration value="Compile" />
+						<xs:enumeration value="Content" />
+						<xs:enumeration value="EmbeddedResource" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="subType" default="Code">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Code" />
+						<xs:enumeration value="Component" />
+						<xs:enumeration value="Form" />
+						<xs:enumeration value="UserControl" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+		<xs:element name="Exclude">
+			<xs:complexType>
+				<xs:attribute name="name" type="xs:string" use="required" />
+			</xs:complexType>
+		</xs:element>
+</xs:schema>
diff --git a/Prebuild/src/data/prebuild-1.7.xsd b/Prebuild/src/data/prebuild-1.7.xsd
new file mode 100644
index 0000000..9d63ce6
--- /dev/null
+++ b/Prebuild/src/data/prebuild-1.7.xsd
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"
+	xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd">
+	<xs:annotation>
+		<xs:documentation>
+			Copyright (c) 2004-2005 Matthew Holmes (calefaction at houston . rr . com), Dan Moorehead (dan05a at gmail . com), David Hudson (jendave at  yahoo dot com)
+
+			.NET Prebuild is a cross-platform XML-driven pre-build tool which
+			allows developers to easily generate project or make files for major
+			IDE's and .NET development tools including: Visual Studio .NET 2002 and
+			2003, SharpDevelop, MonoDevelop, and NAnt.
+
+			BSD License:
+			
+			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. 
+			* The name of the author may not be used to endorse or promote products derived from this software 
+			  without specific prior written permission. 
+
+			THIS SOFTWARE IS PROVIDED BY THE AUTHOR '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 AUTHOR 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.
+		</xs:documentation>
+	</xs:annotation>
+	<xs:element name="Prebuild">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Process" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Solution" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:attribute name="version" />
+			<xs:attribute name="checkOsVars" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Process" type="xs:string" />
+	<xs:element name="Solution">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+				<xs:element ref="Configuration" minOccurs="1" maxOccurs="unbounded" />
+				<xs:element ref="Files" minOccurs="0" />
+				<xs:element ref="Project" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="activeConfig" type="xs:string" default="Debug" />
+			<xs:attribute name="path" type="xs:string" default="" />
+			<xs:attribute name="version" type="xs:string" default="1.0.0" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Project">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Configuration" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="ReferencePath" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="name" type="xs:string" use="required" />
+						<xs:attribute name="path" type="xs:string" />
+						<xs:attribute name="localCopy" type="xs:boolean" />
+						<xs:attribute name="version" type="xs:string" default="1.0.0"/>
+					</xs:complexType>
+				</xs:element>
+				<xs:element ref="Files" />
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required" />
+			<xs:attribute name="designerFolder" type="xs:string" default="" />
+			<xs:attribute name="filterGroups" type="xs:string" default="" />
+			<xs:attribute name="path" type="xs:string" default="" />
+			<xs:attribute name="icon" type="xs:string" default="" />
+			<xs:attribute name="language" default="C#">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="C#" />
+						<xs:enumeration value="VB.NET" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="type" default="Exe">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Exe" />
+						<xs:enumeration value="WinExe" />
+						<xs:enumeration value="Library" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="runtime" default="Microsoft">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Microsoft" />
+						<xs:enumeration value="Mono" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="startupObject" type="xs:string" default="" />
+			<xs:attribute name="rootNamespace" type="xs:string" />
+			<xs:attribute name="assemblyName" type="xs:string" />
+      <xs:attribute name="generateAssemblyInfoFile" type="xs:boolean" default="false"/>
+    </xs:complexType>
+	</xs:element>
+	<xs:element name="Configuration">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Options" minOccurs="0" />
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Options">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CompilerDefines" type="xs:string" minOccurs="0" />
+				<xs:element name="OptimizeCode" type="xs:boolean" minOccurs="0" />
+				<xs:element name="CheckUnderflowOverflow" type="xs:boolean" minOccurs="0" />
+				<xs:element name="AllowUnsafe" type="xs:boolean" minOccurs="0" />
+				<xs:element name="PreBuildEvent" type="xs:string" minOccurs="0" />
+				<xs:element name="PostBuildEvent" type="xs:string" minOccurs="0" />
+				<xs:element name="RunPostBuildEvent" minOccurs="0" default="OnBuildSuccess">
+					<xs:simpleType>
+						<xs:restriction base="xs:string">
+							<xs:enumeration value="OnBuildSuccess" />
+							<xs:enumeration value="Always" />
+							<xs:enumeration value="OnOutputUpdated" />
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="RunScript" type="xs:string" minOccurs="0" />
+				<xs:element name="PreBuildEventArgs" type="xs:string" minOccurs="0" />
+				<xs:element name="PostBuildEventArgs" type="xs:string" minOccurs="0" />
+				<xs:element name="WarningLevel" minOccurs="0">
+					<xs:simpleType>
+						<xs:restriction base="xs:integer">
+							<xs:minInclusive value="0" />
+							<xs:maxInclusive value="4" />
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="WarningsAsErrors" type="xs:boolean" minOccurs="0" />
+				<xs:element name="SuppressWarnings" type="xs:string" minOccurs="0" />
+				<xs:element name="OutputPath" type="xs:string" minOccurs="0" />
+				<xs:element name="GenerateDocumentation" type="xs:boolean" minOccurs="0" />
+				<xs:element name="XmlDocFile" type="xs:string" minOccurs="0" />
+				<xs:element name="DebugInformation" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RegisterComInterop" type="xs:boolean" minOccurs="0" />
+				<xs:element name="RemoveIntegerChecks" type="xs:boolean" minOccurs="0" />
+				<xs:element name="IncrementalBuild" type="xs:boolean" minOccurs="0" />
+				<xs:element name="BaseAddress" type="xs:string" minOccurs="0" />
+				<xs:element name="FileAlignment" type="xs:integer" minOccurs="0" />
+				<xs:element name="NoStdLib" type="xs:boolean" minOccurs="0" />
+				<xs:element name="KeyFile" type="xs:string" minOccurs="0" />
+        </xs:all>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Files">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="File" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="Match" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="File">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+					<xs:attribute name="resourceName" type="xs:string" default="" />
+					<xs:attribute name="buildAction" default="Compile">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="None" />
+								<xs:enumeration value="Compile" />
+								<xs:enumeration value="Content" />
+								<xs:enumeration value="EmbeddedResource" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:attribute>
+					<xs:attribute name="subType" default="Code">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="Code" />
+								<xs:enumeration value="Component" />
+								<xs:enumeration value="Form" />
+								<xs:enumeration value="Settings" />
+								<xs:enumeration value="UserControl" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:attribute>
+					<xs:attribute name="link" type="xs:boolean" />
+					<xs:attribute name="copyToOutput" default="Never">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="Never" />
+								<xs:enumeration value="Always" />
+								<xs:enumeration value="PreserveNewest" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:attribute>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Match">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Exclude" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:attribute name="path" type="xs:string" />
+			<xs:attribute name="pattern" type="xs:string" use="required" />
+			<xs:attribute name="recurse" type="xs:boolean" default="false" />
+			<xs:attribute name="useRegex" type="xs:boolean" default="false" />
+			<xs:attribute name="buildAction" default="Compile">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="None" />
+						<xs:enumeration value="Compile" />
+						<xs:enumeration value="Content" />
+						<xs:enumeration value="EmbeddedResource" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="resourceName" type="xs:string" default="" />
+			<xs:attribute name="subType" default="Code">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Code" />
+						<xs:enumeration value="Component" />
+						<xs:enumeration value="Designer" />
+						<xs:enumeration value="Form" />
+						<xs:enumeration value="Settings" />
+						<xs:enumeration value="UserControl" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="link" type="xs:boolean" />
+			<xs:attribute name="copyToOutput" default="Never">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Never" />
+						<xs:enumeration value="Always" />
+						<xs:enumeration value="PreserveNewest" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="Exclude">
+		<xs:complexType>
+			<xs:attribute name="name" type="xs:string" use="required" />
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/ThirdPartyLicenses/Axiom.txt b/ThirdPartyLicenses/Axiom.txt
new file mode 100644
index 0000000..af4e9cd
--- /dev/null
+++ b/ThirdPartyLicenses/Axiom.txt
@@ -0,0 +1,141 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999 
+
+
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+Preamble
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
+
+This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
+
+When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
+
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
+
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
+
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
+
+To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
+
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
+
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
+
+When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
+
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
+
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
+
+In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
+
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
+
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
+
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
+
+The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
+
+"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
+
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+
+
+a) The modified work must itself be a software library. 
+b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
+c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
+d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
+(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
+
+In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
+
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
+
+This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
+
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
+
+If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
+
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
+
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
+
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
+
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
+
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
+
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
+
+You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
+
+
+a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
+b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
+c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
+d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
+e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
+For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
+
+7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
+
+
+a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
+b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
+
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
+
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+
+Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
+
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+
+NO WARRANTY 
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
\ No newline at end of file
diff --git a/ThirdPartyLicenses/MySQL.txt b/ThirdPartyLicenses/MySQL.txt
new file mode 100644
index 0000000..6dfe347
--- /dev/null
+++ b/ThirdPartyLicenses/MySQL.txt
@@ -0,0 +1,78 @@
+Covered under the MySQL FLOSS Exemption ( http://www.mysql.com/company/legal/licensing/foss-exception.html )
+
+--------------------------------------------------------------------
+Legal Terms and Conditions
+
+As a special exception to the terms and conditions of version 2.0 of the GPL:
+
+You are free to distribute a Derivative Work that is formed entirely from the Program and one or more works (each, a "FLOSS Work") licensed under one or more of the licenses listed below in section 1, as long as:
+
+   1. You obey the GPL in all respects for the Program and the Derivative Work, except for identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves,
+   2. all identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves,
+         1. are distributed subject to one of the FLOSS licenses listed below, and
+         2. the object code or executable form of those sections are accompanied by the complete corresponding machine-readable source code for those sections on the same medium and under the same FLOSS license as the corresponding object code or executable forms of those sections, and
+   3. any works which are aggregated with the Program or with a Derivative Work on a volume of a storage or distribution medium in accordance with the GPL, can reasonably be considered independent and separate works in themselves which are not derivatives of either the Program, a Derivative Work or a FLOSS Work.
+
+If the above conditions are not met, then the Program may only be copied, modified, distributed or used under the terms and conditions of the GPL or another valid licensing option from MySQL AB.
+
+--------------------------------------------------------------------
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
+    b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
+    c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+    b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+    c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
\ No newline at end of file
diff --git a/ThirdPartyLicenses/ODE.txt b/ThirdPartyLicenses/ODE.txt
new file mode 100644
index 0000000..312976f
--- /dev/null
+++ b/ThirdPartyLicenses/ODE.txt
@@ -0,0 +1,13 @@
+Open Dynamics Engine
+Copyright (c) 2001-2004, Russell L. Smith.
+All rights reserved.
+
+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 names of ODE's copyright owner 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR 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. 
\ No newline at end of file
diff --git a/ThirdPartyLicenses/OpenJpeg.txt b/ThirdPartyLicenses/OpenJpeg.txt
new file mode 100644
index 0000000..0ad4488
--- /dev/null
+++ b/ThirdPartyLicenses/OpenJpeg.txt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `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 COPYRIGHT OWNER OR 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.
+ */
\ No newline at end of file
diff --git a/ThirdPartyLicenses/libsl.txt b/ThirdPartyLicenses/libsl.txt
new file mode 100644
index 0000000..9555905
--- /dev/null
+++ b/ThirdPartyLicenses/libsl.txt
@@ -0,0 +1,23 @@
+Copyright (c) 2006, Second Life Reverse Engineering Team
+All rights reserved.
+
+- 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.
+- Neither the name of the Second Life Reverse Engineering Team 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR 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.
\ No newline at end of file
diff --git a/bin/Axiom.MathLib.dll b/bin/Axiom.MathLib.dll
new file mode 100644
index 0000000..21ce3a8
Binary files /dev/null and b/bin/Axiom.MathLib.dll differ
diff --git a/bin/Db4objects.Db4o.dll b/bin/Db4objects.Db4o.dll
new file mode 100644
index 0000000..be976a1
Binary files /dev/null and b/bin/Db4objects.Db4o.dll differ
diff --git a/bin/DotSets.dll b/bin/DotSets.dll
new file mode 100644
index 0000000..5225651
Binary files /dev/null and b/bin/DotSets.dll differ
diff --git a/bin/Kds.Serialization.dll b/bin/Kds.Serialization.dll
new file mode 100644
index 0000000..7f03277
Binary files /dev/null and b/bin/Kds.Serialization.dll differ
diff --git a/bin/Mono.PEToolkit.dll b/bin/Mono.PEToolkit.dll
new file mode 100644
index 0000000..b4c3e70
Binary files /dev/null and b/bin/Mono.PEToolkit.dll differ
diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll
new file mode 100644
index 0000000..0467dd6
Binary files /dev/null and b/bin/MySql.Data.dll differ
diff --git a/bin/Ode.NET.dll b/bin/Ode.NET.dll
new file mode 100644
index 0000000..40f15a5
Binary files /dev/null and b/bin/Ode.NET.dll differ
diff --git a/bin/PhysX-wrapper.dll b/bin/PhysX-wrapper.dll
new file mode 100644
index 0000000..5259ffc
Binary files /dev/null and b/bin/PhysX-wrapper.dll differ
diff --git a/bin/PhysX_Wrapper_Dotnet.dll b/bin/PhysX_Wrapper_Dotnet.dll
new file mode 100644
index 0000000..c66bf3a
Binary files /dev/null and b/bin/PhysX_Wrapper_Dotnet.dll differ
diff --git a/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll b/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll
new file mode 100644
index 0000000..06cbfdc
Binary files /dev/null and b/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll differ
diff --git a/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll b/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll
new file mode 100644
index 0000000..07a5958
Binary files /dev/null and b/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll differ
diff --git a/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll b/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll
new file mode 100644
index 0000000..fd12ea1
Binary files /dev/null and b/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll differ
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
new file mode 100644
index 0000000..81d532b
Binary files /dev/null and b/bin/Prebuild.exe differ
diff --git a/bin/System.Data.SQLite.dll b/bin/System.Data.SQLite.dll
new file mode 100644
index 0000000..70d84e7
Binary files /dev/null and b/bin/System.Data.SQLite.dll differ
diff --git a/bin/XMLRPC.dll b/bin/XMLRPC.dll
new file mode 100644
index 0000000..adf7297
Binary files /dev/null and b/bin/XMLRPC.dll differ
diff --git a/bin/defaultstripe.png b/bin/defaultstripe.png
new file mode 100644
index 0000000..9db19c8
Binary files /dev/null and b/bin/defaultstripe.png differ
diff --git a/bin/libTerrain-BSD.dll b/bin/libTerrain-BSD.dll
new file mode 100644
index 0000000..d9b95fc
Binary files /dev/null and b/bin/libTerrain-BSD.dll differ
diff --git a/bin/libdb_dotNET43.dll b/bin/libdb_dotNET43.dll
new file mode 100644
index 0000000..16a1cfc
Binary files /dev/null and b/bin/libdb_dotNET43.dll differ
diff --git a/bin/libode.a b/bin/libode.a
new file mode 100644
index 0000000..4df0ad1
Binary files /dev/null and b/bin/libode.a differ
diff --git a/bin/libode.so b/bin/libode.so
new file mode 100644
index 0000000..1c8565f
Binary files /dev/null and b/bin/libode.so differ
diff --git a/bin/libopenjpeg-1.0.0-x86_64.so b/bin/libopenjpeg-1.0.0-x86_64.so
new file mode 100644
index 0000000..84bb5c3
Binary files /dev/null and b/bin/libopenjpeg-1.0.0-x86_64.so differ
diff --git a/bin/libopenjpeg-1.0.0.so b/bin/libopenjpeg-1.0.0.so
new file mode 100644
index 0000000..154fbfe
Binary files /dev/null and b/bin/libopenjpeg-1.0.0.so differ
diff --git a/bin/libopenjpeg-1.1.0.dylib b/bin/libopenjpeg-1.1.0.dylib
new file mode 100644
index 0000000..6375632
Binary files /dev/null and b/bin/libopenjpeg-1.1.0.dylib differ
diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll
new file mode 100644
index 0000000..c89788b
Binary files /dev/null and b/bin/libsecondlife.dll differ
diff --git a/bin/log4net.dll b/bin/log4net.dll
new file mode 100644
index 0000000..ffc57e1
Binary files /dev/null and b/bin/log4net.dll differ
diff --git a/bin/ode.dll b/bin/ode.dll
new file mode 100644
index 0000000..b226096
Binary files /dev/null and b/bin/ode.dll differ
diff --git a/bin/openjpeg.dll b/bin/openjpeg.dll
new file mode 100644
index 0000000..c9a7500
Binary files /dev/null and b/bin/openjpeg.dll differ
diff --git a/bin/openjpegnet.dll b/bin/openjpegnet.dll
new file mode 100644
index 0000000..1812fa9
Binary files /dev/null and b/bin/openjpegnet.dll differ
diff --git a/prebuild.xml b/prebuild.xml
new file mode 100644
index 0000000..c20be88
--- /dev/null
+++ b/prebuild.xml
@@ -0,0 +1,1105 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
+  <Solution name="OpenSim" activeConfig="Debug" path="./">
+    <Configuration name="Debug">
+      <Options>
+        <CompilerDefines>TRACE;DEBUG</CompilerDefines>
+        <OptimizeCode>false</OptimizeCode>
+        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+        <AllowUnsafe>false</AllowUnsafe>
+        <WarningLevel>4</WarningLevel>
+        <WarningsAsErrors>false</WarningsAsErrors>
+        <SuppressWarnings></SuppressWarnings>
+        <OutputPath>bin</OutputPath>
+        <DebugInformation>true</DebugInformation>
+        <IncrementalBuild>true</IncrementalBuild>
+        <NoStdLib>false</NoStdLib>
+      </Options>
+    </Configuration>
+    <Configuration name="Release">
+      <Options>
+        <CompilerDefines>TRACE</CompilerDefines>
+        <OptimizeCode>true</OptimizeCode>
+        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+        <AllowUnsafe>false</AllowUnsafe>
+        <WarningLevel>4</WarningLevel>
+        <WarningsAsErrors>false</WarningsAsErrors>
+        <SuppressWarnings></SuppressWarnings>
+        <OutputPath>bin</OutputPath>
+        <DebugInformation>false</DebugInformation>
+        <IncrementalBuild>true</IncrementalBuild>
+        <NoStdLib>false</NoStdLib>
+      </Options>
+    </Configuration>
+
+
+    <!-- Core OpenSim Projects -->
+
+    <Project name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework" path="OpenSim/Framework/General" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Reference name="XMLRPC.dll"/>
+	<Reference name="OpenSim.Framework.Console"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+     <Reference name="OpenSim.Framework"/>
+     <Reference name="OpenSim.Framework.Console"/>
+     <Reference name="libsecondlife.dll"/>
+     <Reference name="XMLRPC.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Region.Caches" path="OpenSim/Region/Caches" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="libsecondlife.dll"/>
+	<Reference name="OpenSim.Framework"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+
+    <!-- Storage Plug-ins -->
+    <Project name="OpenSim.Region.Storage.LocalStorageDb4o" path="OpenSim/Region/Storage/LocalStorageDb4o" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+    
+    <Project name="OpenSim.Region.Storage.LocalStorageSQLite" path="OpenSim/Region/Storage/LocalStorageSQLite" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Data.SQLite.dll"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Region.Storage.LocalStorageBerkeleyDB" path="OpenSim/Region/Storage/LocalStorageBerkeleyDB" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="Kds.Serialization.dll"/>
+      <Reference name="libdb_dotNET43.dll"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <!-- Grid Server Plug-ins -->
+    <Project name="OpenSim.Region.GridInterfaces.Local" path="OpenSim/Region/GridInterfaces/Local" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Region.GridInterfaces.Remote" path="OpenSim/Region/GridInterfaces/Remote" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="XMLRPC.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+    
+
+    <Project name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml" localCopy="false" />
+      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
+      <Reference name="OpenSim.Framework" localCopy="false"/>
+      <Reference name="OpenSim.Framework.Console" localCopy="false"/>
+      <Files>
+        <Match pattern="*.cs" recurse="false"/>
+      </Files>
+    </Project>
+
+
+    <!-- Physics Plug-ins -->
+    <Project name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
+      <Reference name="OpenSim.Region.Physics.Manager" localCopy="false"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Region.Physics.PhysXPlugin" path="OpenSim/Region/Physics/PhysXPlugin" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
+      <Reference name="PhysX_Wrapper_Dotnet.dll" localCopy="false"/>
+      <Reference name="OpenSim.Region.Physics.Manager" localCopy="false"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
+      <Reference name="OpenSim.Region.Physics.Manager" localCopy="false"/>
+      <Reference name="Ode.NET.dll" localCopy="false" />      
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+     <!-- Xml Config Dll -->
+     <Project name="OpenSim.Framework.GenericConfig.Xml" path="OpenSim/Framework/GenericConfig/Xml" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+     <Reference name="OpenSim.Framework"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+     <!-- Terrain engine -->
+     <Project name="OpenSim.Region.Terrain.BasicTerrain" path="OpenSim/Region/Terrain.BasicTerrain" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Xml"/>
+      <Reference name="Microsoft.JScript"/>
+      <Reference name="libTerrain-BSD.dll"/>
+      <Reference name="openjpegnet.dll" />
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="libsecondlife.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.Data.DB4o" path="OpenSim/Framework/Data.DB4o" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="OpenSim.Framework.Data"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.UserManagement" path="OpenSim/Framework/UserManager" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      
+     <ReferencePath>../../../bin/</ReferencePath>
+     <Reference name="System" localCopy="false"/>
+     <Reference name="System.Data" localCopy="false"/>
+     <Reference name="System.Xml" localCopy="false"/>
+     <Reference name="XMLRPC.dll"/>
+     <Reference name="OpenSim.Framework"/>
+     <Reference name="OpenSim.Framework.Console"/>
+     <Reference name="OpenSim.Framework.Data"/>
+     <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
+     <Reference name="OpenSim.Framework.Servers"/>
+     <Reference name="libsecondlife.dll"/>
+     <Reference name="Db4objects.Db4o.dll"/>
+
+     <Files>
+       <Match pattern="*.cs" recurse="true"/>
+     </Files> 
+    </Project>
+
+    <!-- OpenGridFrameWork.Communications" -->
+	<Project name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+     <Reference name="OpenSim.Framework"/>
+     <Reference name="OpenSim.Framework.Data" />
+     <Reference name="libsecondlife.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.Communications.OGS1" path="OpenSim/Framework/Communications.OGS1" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Runtime.Remoting"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Framework.Communications" />
+      <Reference name="OpenSim.Framework.Data" />
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="XMLRPC.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+    
+    <Project name="OpenSim.Region.LocalCommunications" path="OpenSim/Region/LocalCommunications" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+     <Reference name="OpenSim.Framework.Communications"/>
+     <Reference name="OpenSim.Framework.UserManagement" />
+     <Reference name="OpenSim.Framework.Data" />
+     <Reference name="libsecondlife.dll"/>
+	<Reference name="OpenSim.Framework"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="Axiom.MathLib.dll"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.FrameworkGenericConfig.Xml"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Region.Caches"/>
+      <Reference name="XMLRPC.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+
+
+    <Project name="OpenSim.Region.Simulation" path="OpenSim/Region/Simulation" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="Axiom.MathLib.dll"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+	<Reference name="OpenSim.Region.Caches"/>
+      <Reference name="XMLRPC.dll"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <!-- OpenSim app -->
+    <Project name="OpenSim" path="OpenSim/Region/Application" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="Axiom.MathLib.dll"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+	<Reference name="OpenSim.Region.Simulation"/>
+      <Reference name="OpenSim.Region.ClientStack"/>
+      <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
+	<Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Communications.OGS1"/>
+	<Reference name="OpenSim.Region.Caches"/>
+      <Reference name="XMLRPC.dll"/>
+      <Reference name="OpenSim.Framework.UserManagement" />
+      <Reference name="OpenSim.Region.LocalCommunications"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+  
+        <!-- Scene Server API Example Apps -->
+
+    <Project name="SimpleApp" path="OpenSim/Region/Examples/SimpleApp" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Data.dll"/>
+      <Reference name="System.Xml"/>
+
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="XMLRPC.dll"/>
+      <Reference name="OpenSim.Region.GridInterfaces.Local"/>
+      <Reference name="OpenSim.Servers"/>
+<Reference name="OpenSim.Framework.Communications"/>      
+<Reference name="OpenSim.Region.LocalCommunications"/>      
+      <Reference name="OpenSim.Region.Caches"/>
+      <Reference name="OpenSim.Region.ClientStack"/>
+      <Reference name="OpenSim.Region.Simulation"/>
+      
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+</Solution>
+  
+  
+<Solution name="OpenGridServices" activeConfig="Debug" path="./">
+    <Configuration name="Debug">
+      <Options>
+        <CompilerDefines>TRACE;DEBUG</CompilerDefines>
+        <OptimizeCode>false</OptimizeCode>
+        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+        <AllowUnsafe>false</AllowUnsafe>
+        <WarningLevel>4</WarningLevel>
+        <WarningsAsErrors>false</WarningsAsErrors>
+        <SuppressWarnings></SuppressWarnings>
+        <OutputPath>bin</OutputPath>
+        <DebugInformation>true</DebugInformation>
+        <IncrementalBuild>true</IncrementalBuild>
+        <NoStdLib>false</NoStdLib>
+      </Options>
+    </Configuration>
+    <Configuration name="Release">
+      <Options>
+        <CompilerDefines>TRACE</CompilerDefines>
+        <OptimizeCode>true</OptimizeCode>
+        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
+        <AllowUnsafe>false</AllowUnsafe>
+        <WarningLevel>4</WarningLevel>
+        <WarningsAsErrors>false</WarningsAsErrors>
+        <SuppressWarnings></SuppressWarnings>
+        <OutputPath>bin</OutputPath>
+        <DebugInformation>false</DebugInformation>
+        <IncrementalBuild>true</IncrementalBuild>
+        <NoStdLib>false</NoStdLib>
+      </Options>
+    </Configuration>
+
+ 
+  <!-- OpenGrid Data Services -->
+    <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="libsecondlife.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.Data.MySQL" path="OpenSim/Framework/Data.MySQL" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="OpenSim.Framework.Data"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="MySql.Data.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.Data.DB4o" path="OpenSim/Framework/Data.DB4o" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="OpenSim.Framework.Data"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.Data.MSSQL" path="OpenSim/Framework/Data.MSSQL" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="OpenSim.Framework.Data"/>
+      <Reference name="libsecondlife.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.Data.SQLite" path="OpenSim/Framework/Data.SQLite" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Data.SQLite.dll"/>
+      <Reference name="OpenSim.Framework.Data"/>
+      <Reference name="libsecondlife.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <!-- OGS projects -->    
+   
+   <Project name="OpenSim.Grid.Framework.Manager" path="OpenSim/Grid/Framework.Manager" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+     <ReferencePath>../../../bin/</ReferencePath>
+     <Reference name="System" localCopy="false"/>
+     <Reference name="OpenSim.Framework"/>
+     <Reference name="OpenSim.Framework.Servers"/>
+     <Reference name="libsecondlife.dll"/>
+     <Reference name="XMLRPC.dll"/>
+
+
+     <Files>
+       <Match pattern="*.cs" recurse="true"/>
+     </Files>
+    </Project>
+ 
+    <Project name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+     <ReferencePath>../../../bin/</ReferencePath>
+     <Reference name="System" localCopy="false"/>
+     <Reference name="System.Data" localCopy="false"/>
+     <Reference name="System.Xml" localCopy="false"/>
+     <Reference name="OpenSim.Framework"/>
+     <Reference name="OpenSim.Framework.Console"/>
+     <Reference name="OpenSim.Framework.Servers"/>
+     <Reference name="OpenSim.Framework.Data"/>
+     <Reference name="OpenSim.Grid.Framework.Manager"/>
+     <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
+     <Reference name="libsecondlife.dll"/>
+     <Reference name="Db4objects.Db4o.dll"/>
+     <Reference name="XMLRPC.dll"/>
+
+     <Files>
+       <Match pattern="*.cs" recurse="true"/>
+     </Files>
+    </Project>
+
+ <Project name="OpenSim.Grid.AssetServer" path="OpenSim/Grid/AssetServer" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+     <ReferencePath>../../../bin/</ReferencePath>
+     <Reference name="System" localCopy="false"/>
+     <Reference name="System.Data" localCopy="false"/>
+     <Reference name="System.Xml" localCopy="false"/>
+     <Reference name="OpenSim.Framework"/>
+     <Reference name="OpenSim.Framework.Console"/>
+     <Reference name="OpenSim.Framework.Servers"/>
+     <Reference name="libsecondlife.dll"/>
+     <Reference name="Db4objects.Db4o.dll"/>
+     <Reference name="XMLRPC.dll"/>
+
+     <Files>
+       <Match pattern="*.cs" recurse="true"/>
+     </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.UserManagement" path="OpenSim/Framework/UserManager" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      
+     <ReferencePath>../../../bin/</ReferencePath>
+     <Reference name="System" localCopy="false"/>
+     <Reference name="System.Data" localCopy="false"/>
+     <Reference name="System.Xml" localCopy="false"/>
+     <Reference name="OpenSim.Framework"/>
+     <Reference name="OpenSim.Framework.Console"/>
+     <Reference name="OpenSim.Framework.Data"/>
+     <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
+     <Reference name="OpenSim.Framework.Servers"/>
+     <Reference name="libsecondlife.dll"/>
+     <Reference name="Db4objects.Db4o.dll"/>
+     <Reference name="XMLRPC.dll"/>
+
+     <Files>
+       <Match pattern="*.cs" recurse="true"/>
+     </Files> 
+    </Project>
+
+    <Project name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      
+     <ReferencePath>../../../bin/</ReferencePath>
+     <Reference name="System" localCopy="false"/>
+     <Reference name="System.Data" localCopy="false"/>
+     <Reference name="System.Xml" localCopy="false"/>
+     <Reference name="OpenSim.Framework"/>
+     <Reference name="OpenSim.Framework.Console"/>
+     <Reference name="OpenSim.Framework.Data"/>
+     <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
+     <Reference name="OpenSim.Framework.Servers"/>
+     <Reference name="OpenSim.Framework.UserManager" />
+     <Reference name="libsecondlife.dll"/>
+     <Reference name="Db4objects.Db4o.dll"/>
+     <Reference name="XMLRPC.dll"/>
+
+     <Files>
+       <Match pattern="*.cs" recurse="true"/>
+     </Files> 
+    </Project>
+
+    <Project name="OpenSim.Grid.GridServer.Config" path="OpenSim/Grid/GridServer.Config" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Data.dll"/>
+      <Reference name="System.Xml"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Grid.UserServer.Config" path="OpenSim/Grid/UserServer.Config" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Data.dll"/>
+      <Reference name="System.Xml"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="Db4objects.Db4o.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+  
+</Solution>
+  
+  
+  <!-- Prebuild tool -->
+  <Solution name="Prebuild" path="Prebuild/" >
+    <Configuration name="Debug">
+      <Options>
+        <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+        <OptimizeCode>false</OptimizeCode>
+        <OutputPath>bin/Debug</OutputPath>
+        <DebugInformation>true</DebugInformation>
+        <SuppressWarnings>1595</SuppressWarnings>
+      </Options>
+    </Configuration>
+    <Configuration name="Release">
+      <Options>
+        <CompilerDefines>TRACE</CompilerDefines>
+        <OutputPath>bin/Release</OutputPath>
+        <OptimizeCode>true</OptimizeCode>
+        <DebugInformation>false</DebugInformation>
+        <SuppressWarnings>1595</SuppressWarnings>
+      </Options>
+    </Configuration>
+    <Project name="Prebuild" path="src/" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild">
+      <Configuration name="Debug">
+        <Options>
+          <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+          <OptimizeCode>false</OptimizeCode>
+          <OutputPath>..\..\bin\</OutputPath>
+          <DebugInformation>true</DebugInformation>
+          <KeyFile>Prebuild.snk</KeyFile>
+          <SuppressWarnings>1595</SuppressWarnings>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <CompilerDefines>TRACE</CompilerDefines>
+          <OutputPath>..\..\bin\</OutputPath>
+          <OptimizeCode>true</OptimizeCode>
+          <DebugInformation>false</DebugInformation>
+          <KeyFile>Prebuild.snk</KeyFile>
+          <SuppressWarnings>1595</SuppressWarnings>
+        </Options>
+      </Configuration>
+      <ReferencePath>../../bin/</ReferencePath>
+      <Reference name="System.EnterpriseServices" />
+      <Reference name="System.Xml" />
+      <Reference name="System" />
+      <Files>
+        <Match pattern="App.ico" buildAction="EmbeddedResource"/>
+        <Match path="data" pattern="prebuild-1.7.xsd" buildAction="EmbeddedResource"/>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+  </Solution>
+</Prebuild>
+
+
diff --git a/runprebuild.bat b/runprebuild.bat
new file mode 100644
index 0000000..c1e5d0e
--- /dev/null
+++ b/runprebuild.bat
@@ -0,0 +1,2 @@
+bin\Prebuild.exe /target nant
+bin\Prebuild.exe /target vs2005
\ No newline at end of file
diff --git a/share/php/generateUserFunction.php b/share/php/generateUserFunction.php
new file mode 100644
index 0000000..52ebc9f
--- /dev/null
+++ b/share/php/generateUserFunction.php
@@ -0,0 +1,46 @@
+<?php
+	// GenerateUser (v1.0)
+	// Creates a new user account, and returns it into an associative array.
+	// --
+	// $firstname - The users firstname
+	// $lastname - The users lastname
+	// $password - the users password
+	// $home - the regionhandle of the users home location
+	// --
+	function generateUser($firstname,$lastname,$password,$home) {
+		$user = array();
+		$user['UUID'] = sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+			mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
+			mt_rand( 0, 0x0fff ) | 0x4000,
+			mt_rand( 0, 0x3fff ) | 0x8000,
+			mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ) );
+		$user['username'] = $firstname;
+		$user['lastname'] = $lastname;
+		
+		$user['passwordSalt'] = md5(microtime() . mt_rand(0,0xffff));
+		$user['passwordHash'] = md5(md5($password) . ":" . $user['passwordSalt']);
+		
+		$user['homeRegion'] = $home;
+		$user['homeLocationX'] = 128;
+		$user['homeLocationY'] = 128;
+		$user['homeLocationZ'] = 128;
+		$user['homeLookAtX'] = 15;
+		$user['homeLookAtY'] = 15;
+		$user['homeLookAtZ'] = 15;
+		
+		$user['created'] = time();
+		$user['lastLogin'] = 0;
+		
+		$user['userInventoryURI'] = "http://inventory.server.tld:8004/";
+		$user['userAssetURI'] = "http://asset.server.tld:8003/";
+		
+		$user['profileCanDoMask'] = 0;
+		$user['profileWantDoMask'] = 0;
+		$user['profileAboutText'] = "I am a user.";
+		$user['profileFirstText'] = "Stuff.";
+		$user['profileImage'] = sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x', 0, 0, 0, 0, 0, 0, 0, 0 );
+		$user['profileFirstImage'] = sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x', 0, 0, 0, 0, 0, 0, 0, 0 );
+		
+		return $user;
+	}
+?>
\ No newline at end of file
diff --git a/share/regions/config_0.xml b/share/regions/config_0.xml
new file mode 100644
index 0000000..a7a85ad
--- /dev/null
+++ b/share/regions/config_0.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf000" SimName="0" SimLocationX="1000" SimLocationY="1000" Datastore="store_0_x00_y00.yap" SimListenPort="9100" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1.xml b/share/regions/config_1.xml
new file mode 100644
index 0000000..1ff4fd9
--- /dev/null
+++ b/share/regions/config_1.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf001" SimName="1" SimLocationX="1001" SimLocationY="1000" Datastore="store_1_x01_y00.yap" SimListenPort="9101" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_10.xml b/share/regions/config_10.xml
new file mode 100644
index 0000000..1ce503d
--- /dev/null
+++ b/share/regions/config_10.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf00a" SimName="10" SimLocationX="1010" SimLocationY="1000" Datastore="store_10_x10_y00.yap" SimListenPort="9110" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_100.xml b/share/regions/config_100.xml
new file mode 100644
index 0000000..5377794
--- /dev/null
+++ b/share/regions/config_100.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf064" SimName="100" SimLocationX="1004" SimLocationY="1003" Datastore="store_100_x04_y06.yap" SimListenPort="9200" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1000.xml b/share/regions/config_1000.xml
new file mode 100644
index 0000000..12cc889
--- /dev/null
+++ b/share/regions/config_1000.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e8" SimName="1000" SimLocationX="1008" SimLocationY="1031" Datastore="store_1000_x08_y62.yap" SimListenPort="10100" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1001.xml b/share/regions/config_1001.xml
new file mode 100644
index 0000000..e5010b9
--- /dev/null
+++ b/share/regions/config_1001.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e9" SimName="1001" SimLocationX="1009" SimLocationY="1031" Datastore="store_1001_x09_y62.yap" SimListenPort="10101" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1002.xml b/share/regions/config_1002.xml
new file mode 100644
index 0000000..f901d80
--- /dev/null
+++ b/share/regions/config_1002.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ea" SimName="1002" SimLocationX="1010" SimLocationY="1031" Datastore="store_1002_x10_y62.yap" SimListenPort="10102" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1003.xml b/share/regions/config_1003.xml
new file mode 100644
index 0000000..5ff3dce
--- /dev/null
+++ b/share/regions/config_1003.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3eb" SimName="1003" SimLocationX="1011" SimLocationY="1031" Datastore="store_1003_x11_y62.yap" SimListenPort="10103" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1004.xml b/share/regions/config_1004.xml
new file mode 100644
index 0000000..c2b9f1e
--- /dev/null
+++ b/share/regions/config_1004.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ec" SimName="1004" SimLocationX="1012" SimLocationY="1031" Datastore="store_1004_x12_y62.yap" SimListenPort="10104" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1005.xml b/share/regions/config_1005.xml
new file mode 100644
index 0000000..5aa7a3e
--- /dev/null
+++ b/share/regions/config_1005.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ed" SimName="1005" SimLocationX="1013" SimLocationY="1031" Datastore="store_1005_x13_y62.yap" SimListenPort="10105" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1006.xml b/share/regions/config_1006.xml
new file mode 100644
index 0000000..d561403
--- /dev/null
+++ b/share/regions/config_1006.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ee" SimName="1006" SimLocationX="1014" SimLocationY="1031" Datastore="store_1006_x14_y62.yap" SimListenPort="10106" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1007.xml b/share/regions/config_1007.xml
new file mode 100644
index 0000000..afd6c8a
--- /dev/null
+++ b/share/regions/config_1007.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ef" SimName="1007" SimLocationX="1015" SimLocationY="1031" Datastore="store_1007_x15_y62.yap" SimListenPort="10107" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1008.xml b/share/regions/config_1008.xml
new file mode 100644
index 0000000..c69ac88
--- /dev/null
+++ b/share/regions/config_1008.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f0" SimName="1008" SimLocationX="1016" SimLocationY="1031" Datastore="store_1008_x00_y63.yap" SimListenPort="10108" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1009.xml b/share/regions/config_1009.xml
new file mode 100644
index 0000000..77a8cb9
--- /dev/null
+++ b/share/regions/config_1009.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f1" SimName="1009" SimLocationX="1017" SimLocationY="1031" Datastore="store_1009_x01_y63.yap" SimListenPort="10109" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_101.xml b/share/regions/config_101.xml
new file mode 100644
index 0000000..d1510b6
--- /dev/null
+++ b/share/regions/config_101.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf065" SimName="101" SimLocationX="1005" SimLocationY="1003" Datastore="store_101_x05_y06.yap" SimListenPort="9201" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1010.xml b/share/regions/config_1010.xml
new file mode 100644
index 0000000..1f371b9
--- /dev/null
+++ b/share/regions/config_1010.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f2" SimName="1010" SimLocationX="1018" SimLocationY="1031" Datastore="store_1010_x02_y63.yap" SimListenPort="10110" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1011.xml b/share/regions/config_1011.xml
new file mode 100644
index 0000000..1483495
--- /dev/null
+++ b/share/regions/config_1011.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f3" SimName="1011" SimLocationX="1019" SimLocationY="1031" Datastore="store_1011_x03_y63.yap" SimListenPort="10111" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1012.xml b/share/regions/config_1012.xml
new file mode 100644
index 0000000..d076c14
--- /dev/null
+++ b/share/regions/config_1012.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f4" SimName="1012" SimLocationX="1020" SimLocationY="1031" Datastore="store_1012_x04_y63.yap" SimListenPort="10112" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1013.xml b/share/regions/config_1013.xml
new file mode 100644
index 0000000..32d783a
--- /dev/null
+++ b/share/regions/config_1013.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f5" SimName="1013" SimLocationX="1021" SimLocationY="1031" Datastore="store_1013_x05_y63.yap" SimListenPort="10113" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1014.xml b/share/regions/config_1014.xml
new file mode 100644
index 0000000..14df9f4
--- /dev/null
+++ b/share/regions/config_1014.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f6" SimName="1014" SimLocationX="1022" SimLocationY="1031" Datastore="store_1014_x06_y63.yap" SimListenPort="10114" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1015.xml b/share/regions/config_1015.xml
new file mode 100644
index 0000000..20b2317
--- /dev/null
+++ b/share/regions/config_1015.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f7" SimName="1015" SimLocationX="1023" SimLocationY="1031" Datastore="store_1015_x07_y63.yap" SimListenPort="10115" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1016.xml b/share/regions/config_1016.xml
new file mode 100644
index 0000000..5be5dee
--- /dev/null
+++ b/share/regions/config_1016.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f8" SimName="1016" SimLocationX="1024" SimLocationY="1031" Datastore="store_1016_x08_y63.yap" SimListenPort="10116" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1017.xml b/share/regions/config_1017.xml
new file mode 100644
index 0000000..1edbc6a
--- /dev/null
+++ b/share/regions/config_1017.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3f9" SimName="1017" SimLocationX="1025" SimLocationY="1031" Datastore="store_1017_x09_y63.yap" SimListenPort="10117" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1018.xml b/share/regions/config_1018.xml
new file mode 100644
index 0000000..bee2492
--- /dev/null
+++ b/share/regions/config_1018.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3fa" SimName="1018" SimLocationX="1026" SimLocationY="1031" Datastore="store_1018_x10_y63.yap" SimListenPort="10118" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1019.xml b/share/regions/config_1019.xml
new file mode 100644
index 0000000..ae20cce
--- /dev/null
+++ b/share/regions/config_1019.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3fb" SimName="1019" SimLocationX="1027" SimLocationY="1031" Datastore="store_1019_x11_y63.yap" SimListenPort="10119" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_102.xml b/share/regions/config_102.xml
new file mode 100644
index 0000000..b163638
--- /dev/null
+++ b/share/regions/config_102.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf066" SimName="102" SimLocationX="1006" SimLocationY="1003" Datastore="store_102_x06_y06.yap" SimListenPort="9202" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1020.xml b/share/regions/config_1020.xml
new file mode 100644
index 0000000..3acbfe6
--- /dev/null
+++ b/share/regions/config_1020.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3fc" SimName="1020" SimLocationX="1028" SimLocationY="1031" Datastore="store_1020_x12_y63.yap" SimListenPort="10120" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1021.xml b/share/regions/config_1021.xml
new file mode 100644
index 0000000..33a28da
--- /dev/null
+++ b/share/regions/config_1021.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3fd" SimName="1021" SimLocationX="1029" SimLocationY="1031" Datastore="store_1021_x13_y63.yap" SimListenPort="10121" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1022.xml b/share/regions/config_1022.xml
new file mode 100644
index 0000000..bee87ff
--- /dev/null
+++ b/share/regions/config_1022.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3fe" SimName="1022" SimLocationX="1030" SimLocationY="1031" Datastore="store_1022_x14_y63.yap" SimListenPort="10122" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_1023.xml b/share/regions/config_1023.xml
new file mode 100644
index 0000000..ff90f32
--- /dev/null
+++ b/share/regions/config_1023.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ff" SimName="1023" SimLocationX="1031" SimLocationY="1031" Datastore="store_1023_x15_y63.yap" SimListenPort="10123" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-48.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_103.xml b/share/regions/config_103.xml
new file mode 100644
index 0000000..8a1e78e
--- /dev/null
+++ b/share/regions/config_103.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf067" SimName="103" SimLocationX="1007" SimLocationY="1003" Datastore="store_103_x07_y06.yap" SimListenPort="9203" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_104.xml b/share/regions/config_104.xml
new file mode 100644
index 0000000..5875dd9
--- /dev/null
+++ b/share/regions/config_104.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf068" SimName="104" SimLocationX="1008" SimLocationY="1003" Datastore="store_104_x08_y06.yap" SimListenPort="9204" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_105.xml b/share/regions/config_105.xml
new file mode 100644
index 0000000..86f6c5b
--- /dev/null
+++ b/share/regions/config_105.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf069" SimName="105" SimLocationX="1009" SimLocationY="1003" Datastore="store_105_x09_y06.yap" SimListenPort="9205" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_106.xml b/share/regions/config_106.xml
new file mode 100644
index 0000000..768a528
--- /dev/null
+++ b/share/regions/config_106.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf06a" SimName="106" SimLocationX="1010" SimLocationY="1003" Datastore="store_106_x10_y06.yap" SimListenPort="9206" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_107.xml b/share/regions/config_107.xml
new file mode 100644
index 0000000..efa0446
--- /dev/null
+++ b/share/regions/config_107.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf06b" SimName="107" SimLocationX="1011" SimLocationY="1003" Datastore="store_107_x11_y06.yap" SimListenPort="9207" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_108.xml b/share/regions/config_108.xml
new file mode 100644
index 0000000..60f1dcb
--- /dev/null
+++ b/share/regions/config_108.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf06c" SimName="108" SimLocationX="1012" SimLocationY="1003" Datastore="store_108_x12_y06.yap" SimListenPort="9208" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_109.xml b/share/regions/config_109.xml
new file mode 100644
index 0000000..2c44ff9
--- /dev/null
+++ b/share/regions/config_109.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf06d" SimName="109" SimLocationX="1013" SimLocationY="1003" Datastore="store_109_x13_y06.yap" SimListenPort="9209" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_11.xml b/share/regions/config_11.xml
new file mode 100644
index 0000000..63b3489
--- /dev/null
+++ b/share/regions/config_11.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf00b" SimName="11" SimLocationX="1011" SimLocationY="1000" Datastore="store_11_x11_y00.yap" SimListenPort="9111" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_110.xml b/share/regions/config_110.xml
new file mode 100644
index 0000000..02fbc4d
--- /dev/null
+++ b/share/regions/config_110.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf06e" SimName="110" SimLocationX="1014" SimLocationY="1003" Datastore="store_110_x14_y06.yap" SimListenPort="9210" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_111.xml b/share/regions/config_111.xml
new file mode 100644
index 0000000..4752891
--- /dev/null
+++ b/share/regions/config_111.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf06f" SimName="111" SimLocationX="1015" SimLocationY="1003" Datastore="store_111_x15_y06.yap" SimListenPort="9211" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_112.xml b/share/regions/config_112.xml
new file mode 100644
index 0000000..c672402
--- /dev/null
+++ b/share/regions/config_112.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf070" SimName="112" SimLocationX="1016" SimLocationY="1003" Datastore="store_112_x00_y07.yap" SimListenPort="9212" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_113.xml b/share/regions/config_113.xml
new file mode 100644
index 0000000..0ea4391
--- /dev/null
+++ b/share/regions/config_113.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf071" SimName="113" SimLocationX="1017" SimLocationY="1003" Datastore="store_113_x01_y07.yap" SimListenPort="9213" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_114.xml b/share/regions/config_114.xml
new file mode 100644
index 0000000..844653e
--- /dev/null
+++ b/share/regions/config_114.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf072" SimName="114" SimLocationX="1018" SimLocationY="1003" Datastore="store_114_x02_y07.yap" SimListenPort="9214" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_115.xml b/share/regions/config_115.xml
new file mode 100644
index 0000000..1672c5d
--- /dev/null
+++ b/share/regions/config_115.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf073" SimName="115" SimLocationX="1019" SimLocationY="1003" Datastore="store_115_x03_y07.yap" SimListenPort="9215" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_116.xml b/share/regions/config_116.xml
new file mode 100644
index 0000000..abb1e44
--- /dev/null
+++ b/share/regions/config_116.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf074" SimName="116" SimLocationX="1020" SimLocationY="1003" Datastore="store_116_x04_y07.yap" SimListenPort="9216" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_117.xml b/share/regions/config_117.xml
new file mode 100644
index 0000000..4f90aa4
--- /dev/null
+++ b/share/regions/config_117.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf075" SimName="117" SimLocationX="1021" SimLocationY="1003" Datastore="store_117_x05_y07.yap" SimListenPort="9217" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_118.xml b/share/regions/config_118.xml
new file mode 100644
index 0000000..5241fa6
--- /dev/null
+++ b/share/regions/config_118.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf076" SimName="118" SimLocationX="1022" SimLocationY="1003" Datastore="store_118_x06_y07.yap" SimListenPort="9218" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_119.xml b/share/regions/config_119.xml
new file mode 100644
index 0000000..8b8d85d
--- /dev/null
+++ b/share/regions/config_119.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf077" SimName="119" SimLocationX="1023" SimLocationY="1003" Datastore="store_119_x07_y07.yap" SimListenPort="9219" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_12.xml b/share/regions/config_12.xml
new file mode 100644
index 0000000..dbab016
--- /dev/null
+++ b/share/regions/config_12.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf00c" SimName="12" SimLocationX="1012" SimLocationY="1000" Datastore="store_12_x12_y00.yap" SimListenPort="9112" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_120.xml b/share/regions/config_120.xml
new file mode 100644
index 0000000..b3a3ba5
--- /dev/null
+++ b/share/regions/config_120.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf078" SimName="120" SimLocationX="1024" SimLocationY="1003" Datastore="store_120_x08_y07.yap" SimListenPort="9220" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_121.xml b/share/regions/config_121.xml
new file mode 100644
index 0000000..d204659
--- /dev/null
+++ b/share/regions/config_121.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf079" SimName="121" SimLocationX="1025" SimLocationY="1003" Datastore="store_121_x09_y07.yap" SimListenPort="9221" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_122.xml b/share/regions/config_122.xml
new file mode 100644
index 0000000..b13dc6f
--- /dev/null
+++ b/share/regions/config_122.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf07a" SimName="122" SimLocationX="1026" SimLocationY="1003" Datastore="store_122_x10_y07.yap" SimListenPort="9222" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_123.xml b/share/regions/config_123.xml
new file mode 100644
index 0000000..22a81ee
--- /dev/null
+++ b/share/regions/config_123.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf07b" SimName="123" SimLocationX="1027" SimLocationY="1003" Datastore="store_123_x11_y07.yap" SimListenPort="9223" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_124.xml b/share/regions/config_124.xml
new file mode 100644
index 0000000..5b9b153
--- /dev/null
+++ b/share/regions/config_124.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf07c" SimName="124" SimLocationX="1028" SimLocationY="1003" Datastore="store_124_x12_y07.yap" SimListenPort="9224" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_125.xml b/share/regions/config_125.xml
new file mode 100644
index 0000000..deef175
--- /dev/null
+++ b/share/regions/config_125.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf07d" SimName="125" SimLocationX="1029" SimLocationY="1003" Datastore="store_125_x13_y07.yap" SimListenPort="9225" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_126.xml b/share/regions/config_126.xml
new file mode 100644
index 0000000..705978c
--- /dev/null
+++ b/share/regions/config_126.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf07e" SimName="126" SimLocationX="1030" SimLocationY="1003" Datastore="store_126_x14_y07.yap" SimListenPort="9226" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_127.xml b/share/regions/config_127.xml
new file mode 100644
index 0000000..a6ef58c
--- /dev/null
+++ b/share/regions/config_127.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf07f" SimName="127" SimLocationX="1031" SimLocationY="1003" Datastore="store_127_x15_y07.yap" SimListenPort="9227" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y08.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_128.xml b/share/regions/config_128.xml
new file mode 100644
index 0000000..9745ea2
--- /dev/null
+++ b/share/regions/config_128.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf080" SimName="128" SimLocationX="1000" SimLocationY="1004" Datastore="store_128_x00_y08.yap" SimListenPort="9228" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_129.xml b/share/regions/config_129.xml
new file mode 100644
index 0000000..81abdde
--- /dev/null
+++ b/share/regions/config_129.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf081" SimName="129" SimLocationX="1001" SimLocationY="1004" Datastore="store_129_x01_y08.yap" SimListenPort="9229" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_13.xml b/share/regions/config_13.xml
new file mode 100644
index 0000000..879d1cc
--- /dev/null
+++ b/share/regions/config_13.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf00d" SimName="13" SimLocationX="1013" SimLocationY="1000" Datastore="store_13_x13_y00.yap" SimListenPort="9113" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_130.xml b/share/regions/config_130.xml
new file mode 100644
index 0000000..ca8f2fb
--- /dev/null
+++ b/share/regions/config_130.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf082" SimName="130" SimLocationX="1002" SimLocationY="1004" Datastore="store_130_x02_y08.yap" SimListenPort="9230" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_131.xml b/share/regions/config_131.xml
new file mode 100644
index 0000000..ae84c9e
--- /dev/null
+++ b/share/regions/config_131.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf083" SimName="131" SimLocationX="1003" SimLocationY="1004" Datastore="store_131_x03_y08.yap" SimListenPort="9231" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_132.xml b/share/regions/config_132.xml
new file mode 100644
index 0000000..88b0895
--- /dev/null
+++ b/share/regions/config_132.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf084" SimName="132" SimLocationX="1004" SimLocationY="1004" Datastore="store_132_x04_y08.yap" SimListenPort="9232" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_133.xml b/share/regions/config_133.xml
new file mode 100644
index 0000000..f03aff6
--- /dev/null
+++ b/share/regions/config_133.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf085" SimName="133" SimLocationX="1005" SimLocationY="1004" Datastore="store_133_x05_y08.yap" SimListenPort="9233" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_134.xml b/share/regions/config_134.xml
new file mode 100644
index 0000000..1dae046
--- /dev/null
+++ b/share/regions/config_134.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf086" SimName="134" SimLocationX="1006" SimLocationY="1004" Datastore="store_134_x06_y08.yap" SimListenPort="9234" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_135.xml b/share/regions/config_135.xml
new file mode 100644
index 0000000..5643a00
--- /dev/null
+++ b/share/regions/config_135.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf087" SimName="135" SimLocationX="1007" SimLocationY="1004" Datastore="store_135_x07_y08.yap" SimListenPort="9235" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_136.xml b/share/regions/config_136.xml
new file mode 100644
index 0000000..5e85f53
--- /dev/null
+++ b/share/regions/config_136.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf088" SimName="136" SimLocationX="1008" SimLocationY="1004" Datastore="store_136_x08_y08.yap" SimListenPort="9236" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_137.xml b/share/regions/config_137.xml
new file mode 100644
index 0000000..7fedbaa
--- /dev/null
+++ b/share/regions/config_137.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf089" SimName="137" SimLocationX="1009" SimLocationY="1004" Datastore="store_137_x09_y08.yap" SimListenPort="9237" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_138.xml b/share/regions/config_138.xml
new file mode 100644
index 0000000..9610d97
--- /dev/null
+++ b/share/regions/config_138.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf08a" SimName="138" SimLocationX="1010" SimLocationY="1004" Datastore="store_138_x10_y08.yap" SimListenPort="9238" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_139.xml b/share/regions/config_139.xml
new file mode 100644
index 0000000..950a9ae
--- /dev/null
+++ b/share/regions/config_139.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf08b" SimName="139" SimLocationX="1011" SimLocationY="1004" Datastore="store_139_x11_y08.yap" SimListenPort="9239" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_14.xml b/share/regions/config_14.xml
new file mode 100644
index 0000000..d737ebf
--- /dev/null
+++ b/share/regions/config_14.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf00e" SimName="14" SimLocationX="1014" SimLocationY="1000" Datastore="store_14_x14_y00.yap" SimListenPort="9114" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_140.xml b/share/regions/config_140.xml
new file mode 100644
index 0000000..9ba3d2e
--- /dev/null
+++ b/share/regions/config_140.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf08c" SimName="140" SimLocationX="1012" SimLocationY="1004" Datastore="store_140_x12_y08.yap" SimListenPort="9240" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_141.xml b/share/regions/config_141.xml
new file mode 100644
index 0000000..35f63d1
--- /dev/null
+++ b/share/regions/config_141.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf08d" SimName="141" SimLocationX="1013" SimLocationY="1004" Datastore="store_141_x13_y08.yap" SimListenPort="9241" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_142.xml b/share/regions/config_142.xml
new file mode 100644
index 0000000..35511cf
--- /dev/null
+++ b/share/regions/config_142.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf08e" SimName="142" SimLocationX="1014" SimLocationY="1004" Datastore="store_142_x14_y08.yap" SimListenPort="9242" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_143.xml b/share/regions/config_143.xml
new file mode 100644
index 0000000..83fd144
--- /dev/null
+++ b/share/regions/config_143.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf08f" SimName="143" SimLocationX="1015" SimLocationY="1004" Datastore="store_143_x15_y08.yap" SimListenPort="9243" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y07.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_144.xml b/share/regions/config_144.xml
new file mode 100644
index 0000000..559f854
--- /dev/null
+++ b/share/regions/config_144.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf090" SimName="144" SimLocationX="1016" SimLocationY="1004" Datastore="store_144_x00_y09.yap" SimListenPort="9244" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_145.xml b/share/regions/config_145.xml
new file mode 100644
index 0000000..ea2aff7
--- /dev/null
+++ b/share/regions/config_145.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf091" SimName="145" SimLocationX="1017" SimLocationY="1004" Datastore="store_145_x01_y09.yap" SimListenPort="9245" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_146.xml b/share/regions/config_146.xml
new file mode 100644
index 0000000..35308b0
--- /dev/null
+++ b/share/regions/config_146.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf092" SimName="146" SimLocationX="1018" SimLocationY="1004" Datastore="store_146_x02_y09.yap" SimListenPort="9246" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_147.xml b/share/regions/config_147.xml
new file mode 100644
index 0000000..65ffcbc
--- /dev/null
+++ b/share/regions/config_147.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf093" SimName="147" SimLocationX="1019" SimLocationY="1004" Datastore="store_147_x03_y09.yap" SimListenPort="9247" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_148.xml b/share/regions/config_148.xml
new file mode 100644
index 0000000..50e5b70
--- /dev/null
+++ b/share/regions/config_148.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf094" SimName="148" SimLocationX="1020" SimLocationY="1004" Datastore="store_148_x04_y09.yap" SimListenPort="9248" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_149.xml b/share/regions/config_149.xml
new file mode 100644
index 0000000..d75a455
--- /dev/null
+++ b/share/regions/config_149.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf095" SimName="149" SimLocationX="1021" SimLocationY="1004" Datastore="store_149_x05_y09.yap" SimListenPort="9249" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_15.xml b/share/regions/config_15.xml
new file mode 100644
index 0000000..9caeae7
--- /dev/null
+++ b/share/regions/config_15.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf00f" SimName="15" SimLocationX="1015" SimLocationY="1000" Datastore="store_15_x15_y00.yap" SimListenPort="9115" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_150.xml b/share/regions/config_150.xml
new file mode 100644
index 0000000..2ae5b9f
--- /dev/null
+++ b/share/regions/config_150.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf096" SimName="150" SimLocationX="1022" SimLocationY="1004" Datastore="store_150_x06_y09.yap" SimListenPort="9250" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_151.xml b/share/regions/config_151.xml
new file mode 100644
index 0000000..bc2bdcd
--- /dev/null
+++ b/share/regions/config_151.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf097" SimName="151" SimLocationX="1023" SimLocationY="1004" Datastore="store_151_x07_y09.yap" SimListenPort="9251" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_152.xml b/share/regions/config_152.xml
new file mode 100644
index 0000000..b641d91
--- /dev/null
+++ b/share/regions/config_152.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf098" SimName="152" SimLocationX="1024" SimLocationY="1004" Datastore="store_152_x08_y09.yap" SimListenPort="9252" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_153.xml b/share/regions/config_153.xml
new file mode 100644
index 0000000..f308946
--- /dev/null
+++ b/share/regions/config_153.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf099" SimName="153" SimLocationX="1025" SimLocationY="1004" Datastore="store_153_x09_y09.yap" SimListenPort="9253" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_154.xml b/share/regions/config_154.xml
new file mode 100644
index 0000000..16a0185
--- /dev/null
+++ b/share/regions/config_154.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf09a" SimName="154" SimLocationX="1026" SimLocationY="1004" Datastore="store_154_x10_y09.yap" SimListenPort="9254" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_155.xml b/share/regions/config_155.xml
new file mode 100644
index 0000000..d026ca7
--- /dev/null
+++ b/share/regions/config_155.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf09b" SimName="155" SimLocationX="1027" SimLocationY="1004" Datastore="store_155_x11_y09.yap" SimListenPort="9255" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_156.xml b/share/regions/config_156.xml
new file mode 100644
index 0000000..1565d11
--- /dev/null
+++ b/share/regions/config_156.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf09c" SimName="156" SimLocationX="1028" SimLocationY="1004" Datastore="store_156_x12_y09.yap" SimListenPort="9256" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_157.xml b/share/regions/config_157.xml
new file mode 100644
index 0000000..6883214
--- /dev/null
+++ b/share/regions/config_157.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf09d" SimName="157" SimLocationX="1029" SimLocationY="1004" Datastore="store_157_x13_y09.yap" SimListenPort="9257" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_158.xml b/share/regions/config_158.xml
new file mode 100644
index 0000000..f8d2d67
--- /dev/null
+++ b/share/regions/config_158.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf09e" SimName="158" SimLocationX="1030" SimLocationY="1004" Datastore="store_158_x14_y09.yap" SimListenPort="9258" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_159.xml b/share/regions/config_159.xml
new file mode 100644
index 0000000..95147b4
--- /dev/null
+++ b/share/regions/config_159.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf09f" SimName="159" SimLocationX="1031" SimLocationY="1004" Datastore="store_159_x15_y09.yap" SimListenPort="9259" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y06.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_16.xml b/share/regions/config_16.xml
new file mode 100644
index 0000000..92bb4a9
--- /dev/null
+++ b/share/regions/config_16.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf010" SimName="16" SimLocationX="1016" SimLocationY="1000" Datastore="store_16_x00_y01.yap" SimListenPort="9116" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_160.xml b/share/regions/config_160.xml
new file mode 100644
index 0000000..6590dd3
--- /dev/null
+++ b/share/regions/config_160.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a0" SimName="160" SimLocationX="1000" SimLocationY="1005" Datastore="store_160_x00_y10.yap" SimListenPort="9260" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_161.xml b/share/regions/config_161.xml
new file mode 100644
index 0000000..77f9205
--- /dev/null
+++ b/share/regions/config_161.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a1" SimName="161" SimLocationX="1001" SimLocationY="1005" Datastore="store_161_x01_y10.yap" SimListenPort="9261" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_162.xml b/share/regions/config_162.xml
new file mode 100644
index 0000000..0b33247
--- /dev/null
+++ b/share/regions/config_162.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a2" SimName="162" SimLocationX="1002" SimLocationY="1005" Datastore="store_162_x02_y10.yap" SimListenPort="9262" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_163.xml b/share/regions/config_163.xml
new file mode 100644
index 0000000..f6d1d2e
--- /dev/null
+++ b/share/regions/config_163.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a3" SimName="163" SimLocationX="1003" SimLocationY="1005" Datastore="store_163_x03_y10.yap" SimListenPort="9263" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_164.xml b/share/regions/config_164.xml
new file mode 100644
index 0000000..92e4731
--- /dev/null
+++ b/share/regions/config_164.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a4" SimName="164" SimLocationX="1004" SimLocationY="1005" Datastore="store_164_x04_y10.yap" SimListenPort="9264" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_165.xml b/share/regions/config_165.xml
new file mode 100644
index 0000000..d7b8613
--- /dev/null
+++ b/share/regions/config_165.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a5" SimName="165" SimLocationX="1005" SimLocationY="1005" Datastore="store_165_x05_y10.yap" SimListenPort="9265" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_166.xml b/share/regions/config_166.xml
new file mode 100644
index 0000000..61aa9d9
--- /dev/null
+++ b/share/regions/config_166.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a6" SimName="166" SimLocationX="1006" SimLocationY="1005" Datastore="store_166_x06_y10.yap" SimListenPort="9266" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_167.xml b/share/regions/config_167.xml
new file mode 100644
index 0000000..96170d7
--- /dev/null
+++ b/share/regions/config_167.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a7" SimName="167" SimLocationX="1007" SimLocationY="1005" Datastore="store_167_x07_y10.yap" SimListenPort="9267" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_168.xml b/share/regions/config_168.xml
new file mode 100644
index 0000000..b0d3929
--- /dev/null
+++ b/share/regions/config_168.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a8" SimName="168" SimLocationX="1008" SimLocationY="1005" Datastore="store_168_x08_y10.yap" SimListenPort="9268" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_169.xml b/share/regions/config_169.xml
new file mode 100644
index 0000000..aeef543
--- /dev/null
+++ b/share/regions/config_169.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0a9" SimName="169" SimLocationX="1009" SimLocationY="1005" Datastore="store_169_x09_y10.yap" SimListenPort="9269" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_17.xml b/share/regions/config_17.xml
new file mode 100644
index 0000000..5265775
--- /dev/null
+++ b/share/regions/config_17.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf011" SimName="17" SimLocationX="1017" SimLocationY="1000" Datastore="store_17_x01_y01.yap" SimListenPort="9117" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_170.xml b/share/regions/config_170.xml
new file mode 100644
index 0000000..37462f7
--- /dev/null
+++ b/share/regions/config_170.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0aa" SimName="170" SimLocationX="1010" SimLocationY="1005" Datastore="store_170_x10_y10.yap" SimListenPort="9270" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_171.xml b/share/regions/config_171.xml
new file mode 100644
index 0000000..51c5e30
--- /dev/null
+++ b/share/regions/config_171.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ab" SimName="171" SimLocationX="1011" SimLocationY="1005" Datastore="store_171_x11_y10.yap" SimListenPort="9271" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_172.xml b/share/regions/config_172.xml
new file mode 100644
index 0000000..6560be5
--- /dev/null
+++ b/share/regions/config_172.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ac" SimName="172" SimLocationX="1012" SimLocationY="1005" Datastore="store_172_x12_y10.yap" SimListenPort="9272" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_173.xml b/share/regions/config_173.xml
new file mode 100644
index 0000000..12a448d
--- /dev/null
+++ b/share/regions/config_173.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ad" SimName="173" SimLocationX="1013" SimLocationY="1005" Datastore="store_173_x13_y10.yap" SimListenPort="9273" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_174.xml b/share/regions/config_174.xml
new file mode 100644
index 0000000..5897c49
--- /dev/null
+++ b/share/regions/config_174.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ae" SimName="174" SimLocationX="1014" SimLocationY="1005" Datastore="store_174_x14_y10.yap" SimListenPort="9274" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_175.xml b/share/regions/config_175.xml
new file mode 100644
index 0000000..79e0808
--- /dev/null
+++ b/share/regions/config_175.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0af" SimName="175" SimLocationX="1015" SimLocationY="1005" Datastore="store_175_x15_y10.yap" SimListenPort="9275" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y05.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_176.xml b/share/regions/config_176.xml
new file mode 100644
index 0000000..26845f3
--- /dev/null
+++ b/share/regions/config_176.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b0" SimName="176" SimLocationX="1016" SimLocationY="1005" Datastore="store_176_x00_y11.yap" SimListenPort="9276" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_177.xml b/share/regions/config_177.xml
new file mode 100644
index 0000000..e87dc0d
--- /dev/null
+++ b/share/regions/config_177.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b1" SimName="177" SimLocationX="1017" SimLocationY="1005" Datastore="store_177_x01_y11.yap" SimListenPort="9277" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_178.xml b/share/regions/config_178.xml
new file mode 100644
index 0000000..f82a47d
--- /dev/null
+++ b/share/regions/config_178.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b2" SimName="178" SimLocationX="1018" SimLocationY="1005" Datastore="store_178_x02_y11.yap" SimListenPort="9278" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_179.xml b/share/regions/config_179.xml
new file mode 100644
index 0000000..483f97f
--- /dev/null
+++ b/share/regions/config_179.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b3" SimName="179" SimLocationX="1019" SimLocationY="1005" Datastore="store_179_x03_y11.yap" SimListenPort="9279" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_18.xml b/share/regions/config_18.xml
new file mode 100644
index 0000000..ea486a1
--- /dev/null
+++ b/share/regions/config_18.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf012" SimName="18" SimLocationX="1018" SimLocationY="1000" Datastore="store_18_x02_y01.yap" SimListenPort="9118" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_180.xml b/share/regions/config_180.xml
new file mode 100644
index 0000000..21a0ade
--- /dev/null
+++ b/share/regions/config_180.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b4" SimName="180" SimLocationX="1020" SimLocationY="1005" Datastore="store_180_x04_y11.yap" SimListenPort="9280" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_181.xml b/share/regions/config_181.xml
new file mode 100644
index 0000000..c8043c7
--- /dev/null
+++ b/share/regions/config_181.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b5" SimName="181" SimLocationX="1021" SimLocationY="1005" Datastore="store_181_x05_y11.yap" SimListenPort="9281" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_182.xml b/share/regions/config_182.xml
new file mode 100644
index 0000000..b1a35f6
--- /dev/null
+++ b/share/regions/config_182.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b6" SimName="182" SimLocationX="1022" SimLocationY="1005" Datastore="store_182_x06_y11.yap" SimListenPort="9282" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_183.xml b/share/regions/config_183.xml
new file mode 100644
index 0000000..0d4e7dc
--- /dev/null
+++ b/share/regions/config_183.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b7" SimName="183" SimLocationX="1023" SimLocationY="1005" Datastore="store_183_x07_y11.yap" SimListenPort="9283" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_184.xml b/share/regions/config_184.xml
new file mode 100644
index 0000000..475f411
--- /dev/null
+++ b/share/regions/config_184.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b8" SimName="184" SimLocationX="1024" SimLocationY="1005" Datastore="store_184_x08_y11.yap" SimListenPort="9284" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_185.xml b/share/regions/config_185.xml
new file mode 100644
index 0000000..7501e1a
--- /dev/null
+++ b/share/regions/config_185.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0b9" SimName="185" SimLocationX="1025" SimLocationY="1005" Datastore="store_185_x09_y11.yap" SimListenPort="9285" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_186.xml b/share/regions/config_186.xml
new file mode 100644
index 0000000..744e6d1
--- /dev/null
+++ b/share/regions/config_186.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ba" SimName="186" SimLocationX="1026" SimLocationY="1005" Datastore="store_186_x10_y11.yap" SimListenPort="9286" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_187.xml b/share/regions/config_187.xml
new file mode 100644
index 0000000..3e063c9
--- /dev/null
+++ b/share/regions/config_187.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0bb" SimName="187" SimLocationX="1027" SimLocationY="1005" Datastore="store_187_x11_y11.yap" SimListenPort="9287" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_188.xml b/share/regions/config_188.xml
new file mode 100644
index 0000000..89707ab
--- /dev/null
+++ b/share/regions/config_188.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0bc" SimName="188" SimLocationX="1028" SimLocationY="1005" Datastore="store_188_x12_y11.yap" SimListenPort="9288" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_189.xml b/share/regions/config_189.xml
new file mode 100644
index 0000000..6aaa491
--- /dev/null
+++ b/share/regions/config_189.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0bd" SimName="189" SimLocationX="1029" SimLocationY="1005" Datastore="store_189_x13_y11.yap" SimListenPort="9289" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_19.xml b/share/regions/config_19.xml
new file mode 100644
index 0000000..5f5ca6f
--- /dev/null
+++ b/share/regions/config_19.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf013" SimName="19" SimLocationX="1019" SimLocationY="1000" Datastore="store_19_x03_y01.yap" SimListenPort="9119" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_190.xml b/share/regions/config_190.xml
new file mode 100644
index 0000000..b37cce9
--- /dev/null
+++ b/share/regions/config_190.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0be" SimName="190" SimLocationX="1030" SimLocationY="1005" Datastore="store_190_x14_y11.yap" SimListenPort="9290" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_191.xml b/share/regions/config_191.xml
new file mode 100644
index 0000000..774b607
--- /dev/null
+++ b/share/regions/config_191.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0bf" SimName="191" SimLocationX="1031" SimLocationY="1005" Datastore="store_191_x15_y11.yap" SimListenPort="9291" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y04.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_192.xml b/share/regions/config_192.xml
new file mode 100644
index 0000000..8efd00f
--- /dev/null
+++ b/share/regions/config_192.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c0" SimName="192" SimLocationX="1000" SimLocationY="1006" Datastore="store_192_x00_y12.yap" SimListenPort="9292" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_193.xml b/share/regions/config_193.xml
new file mode 100644
index 0000000..a60cf3c
--- /dev/null
+++ b/share/regions/config_193.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c1" SimName="193" SimLocationX="1001" SimLocationY="1006" Datastore="store_193_x01_y12.yap" SimListenPort="9293" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_194.xml b/share/regions/config_194.xml
new file mode 100644
index 0000000..fabecfe
--- /dev/null
+++ b/share/regions/config_194.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c2" SimName="194" SimLocationX="1002" SimLocationY="1006" Datastore="store_194_x02_y12.yap" SimListenPort="9294" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_195.xml b/share/regions/config_195.xml
new file mode 100644
index 0000000..c83ab69
--- /dev/null
+++ b/share/regions/config_195.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c3" SimName="195" SimLocationX="1003" SimLocationY="1006" Datastore="store_195_x03_y12.yap" SimListenPort="9295" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_196.xml b/share/regions/config_196.xml
new file mode 100644
index 0000000..40cd901
--- /dev/null
+++ b/share/regions/config_196.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c4" SimName="196" SimLocationX="1004" SimLocationY="1006" Datastore="store_196_x04_y12.yap" SimListenPort="9296" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_197.xml b/share/regions/config_197.xml
new file mode 100644
index 0000000..d1cd6e9
--- /dev/null
+++ b/share/regions/config_197.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c5" SimName="197" SimLocationX="1005" SimLocationY="1006" Datastore="store_197_x05_y12.yap" SimListenPort="9297" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_198.xml b/share/regions/config_198.xml
new file mode 100644
index 0000000..f66b8c3
--- /dev/null
+++ b/share/regions/config_198.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c6" SimName="198" SimLocationX="1006" SimLocationY="1006" Datastore="store_198_x06_y12.yap" SimListenPort="9298" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_199.xml b/share/regions/config_199.xml
new file mode 100644
index 0000000..e660b53
--- /dev/null
+++ b/share/regions/config_199.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c7" SimName="199" SimLocationX="1007" SimLocationY="1006" Datastore="store_199_x07_y12.yap" SimListenPort="9299" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_2.xml b/share/regions/config_2.xml
new file mode 100644
index 0000000..83cb5aa
--- /dev/null
+++ b/share/regions/config_2.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf002" SimName="2" SimLocationX="1002" SimLocationY="1000" Datastore="store_2_x02_y00.yap" SimListenPort="9102" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_20.xml b/share/regions/config_20.xml
new file mode 100644
index 0000000..adbee55
--- /dev/null
+++ b/share/regions/config_20.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf014" SimName="20" SimLocationX="1020" SimLocationY="1000" Datastore="store_20_x04_y01.yap" SimListenPort="9120" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_200.xml b/share/regions/config_200.xml
new file mode 100644
index 0000000..9911037
--- /dev/null
+++ b/share/regions/config_200.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c8" SimName="200" SimLocationX="1008" SimLocationY="1006" Datastore="store_200_x08_y12.yap" SimListenPort="9300" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_201.xml b/share/regions/config_201.xml
new file mode 100644
index 0000000..3c73666
--- /dev/null
+++ b/share/regions/config_201.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0c9" SimName="201" SimLocationX="1009" SimLocationY="1006" Datastore="store_201_x09_y12.yap" SimListenPort="9301" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_202.xml b/share/regions/config_202.xml
new file mode 100644
index 0000000..baab769
--- /dev/null
+++ b/share/regions/config_202.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ca" SimName="202" SimLocationX="1010" SimLocationY="1006" Datastore="store_202_x10_y12.yap" SimListenPort="9302" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_203.xml b/share/regions/config_203.xml
new file mode 100644
index 0000000..a4aa865
--- /dev/null
+++ b/share/regions/config_203.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0cb" SimName="203" SimLocationX="1011" SimLocationY="1006" Datastore="store_203_x11_y12.yap" SimListenPort="9303" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_204.xml b/share/regions/config_204.xml
new file mode 100644
index 0000000..f5e62b0
--- /dev/null
+++ b/share/regions/config_204.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0cc" SimName="204" SimLocationX="1012" SimLocationY="1006" Datastore="store_204_x12_y12.yap" SimListenPort="9304" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_205.xml b/share/regions/config_205.xml
new file mode 100644
index 0000000..daafd9a
--- /dev/null
+++ b/share/regions/config_205.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0cd" SimName="205" SimLocationX="1013" SimLocationY="1006" Datastore="store_205_x13_y12.yap" SimListenPort="9305" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_206.xml b/share/regions/config_206.xml
new file mode 100644
index 0000000..951303b
--- /dev/null
+++ b/share/regions/config_206.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ce" SimName="206" SimLocationX="1014" SimLocationY="1006" Datastore="store_206_x14_y12.yap" SimListenPort="9306" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_207.xml b/share/regions/config_207.xml
new file mode 100644
index 0000000..6978761
--- /dev/null
+++ b/share/regions/config_207.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0cf" SimName="207" SimLocationX="1015" SimLocationY="1006" Datastore="store_207_x15_y12.yap" SimListenPort="9307" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y03.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_208.xml b/share/regions/config_208.xml
new file mode 100644
index 0000000..beb4192
--- /dev/null
+++ b/share/regions/config_208.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d0" SimName="208" SimLocationX="1016" SimLocationY="1006" Datastore="store_208_x00_y13.yap" SimListenPort="9308" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_209.xml b/share/regions/config_209.xml
new file mode 100644
index 0000000..0d31497
--- /dev/null
+++ b/share/regions/config_209.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d1" SimName="209" SimLocationX="1017" SimLocationY="1006" Datastore="store_209_x01_y13.yap" SimListenPort="9309" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_21.xml b/share/regions/config_21.xml
new file mode 100644
index 0000000..bc6d3c8
--- /dev/null
+++ b/share/regions/config_21.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf015" SimName="21" SimLocationX="1021" SimLocationY="1000" Datastore="store_21_x05_y01.yap" SimListenPort="9121" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_210.xml b/share/regions/config_210.xml
new file mode 100644
index 0000000..fefc765
--- /dev/null
+++ b/share/regions/config_210.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d2" SimName="210" SimLocationX="1018" SimLocationY="1006" Datastore="store_210_x02_y13.yap" SimListenPort="9310" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_211.xml b/share/regions/config_211.xml
new file mode 100644
index 0000000..7988165
--- /dev/null
+++ b/share/regions/config_211.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d3" SimName="211" SimLocationX="1019" SimLocationY="1006" Datastore="store_211_x03_y13.yap" SimListenPort="9311" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_212.xml b/share/regions/config_212.xml
new file mode 100644
index 0000000..85dbe0d
--- /dev/null
+++ b/share/regions/config_212.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d4" SimName="212" SimLocationX="1020" SimLocationY="1006" Datastore="store_212_x04_y13.yap" SimListenPort="9312" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_213.xml b/share/regions/config_213.xml
new file mode 100644
index 0000000..548b527
--- /dev/null
+++ b/share/regions/config_213.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d5" SimName="213" SimLocationX="1021" SimLocationY="1006" Datastore="store_213_x05_y13.yap" SimListenPort="9313" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_214.xml b/share/regions/config_214.xml
new file mode 100644
index 0000000..40d84e4
--- /dev/null
+++ b/share/regions/config_214.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d6" SimName="214" SimLocationX="1022" SimLocationY="1006" Datastore="store_214_x06_y13.yap" SimListenPort="9314" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_215.xml b/share/regions/config_215.xml
new file mode 100644
index 0000000..d412233
--- /dev/null
+++ b/share/regions/config_215.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d7" SimName="215" SimLocationX="1023" SimLocationY="1006" Datastore="store_215_x07_y13.yap" SimListenPort="9315" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_216.xml b/share/regions/config_216.xml
new file mode 100644
index 0000000..f404b28
--- /dev/null
+++ b/share/regions/config_216.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d8" SimName="216" SimLocationX="1024" SimLocationY="1006" Datastore="store_216_x08_y13.yap" SimListenPort="9316" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_217.xml b/share/regions/config_217.xml
new file mode 100644
index 0000000..707bf97
--- /dev/null
+++ b/share/regions/config_217.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0d9" SimName="217" SimLocationX="1025" SimLocationY="1006" Datastore="store_217_x09_y13.yap" SimListenPort="9317" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_218.xml b/share/regions/config_218.xml
new file mode 100644
index 0000000..656c3e0
--- /dev/null
+++ b/share/regions/config_218.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0da" SimName="218" SimLocationX="1026" SimLocationY="1006" Datastore="store_218_x10_y13.yap" SimListenPort="9318" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_219.xml b/share/regions/config_219.xml
new file mode 100644
index 0000000..0dd3407
--- /dev/null
+++ b/share/regions/config_219.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0db" SimName="219" SimLocationX="1027" SimLocationY="1006" Datastore="store_219_x11_y13.yap" SimListenPort="9319" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_22.xml b/share/regions/config_22.xml
new file mode 100644
index 0000000..c474cf8
--- /dev/null
+++ b/share/regions/config_22.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf016" SimName="22" SimLocationX="1022" SimLocationY="1000" Datastore="store_22_x06_y01.yap" SimListenPort="9122" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_220.xml b/share/regions/config_220.xml
new file mode 100644
index 0000000..4518a89
--- /dev/null
+++ b/share/regions/config_220.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0dc" SimName="220" SimLocationX="1028" SimLocationY="1006" Datastore="store_220_x12_y13.yap" SimListenPort="9320" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_221.xml b/share/regions/config_221.xml
new file mode 100644
index 0000000..85c4523
--- /dev/null
+++ b/share/regions/config_221.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0dd" SimName="221" SimLocationX="1029" SimLocationY="1006" Datastore="store_221_x13_y13.yap" SimListenPort="9321" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_222.xml b/share/regions/config_222.xml
new file mode 100644
index 0000000..0985eb7
--- /dev/null
+++ b/share/regions/config_222.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0de" SimName="222" SimLocationX="1030" SimLocationY="1006" Datastore="store_222_x14_y13.yap" SimListenPort="9322" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_223.xml b/share/regions/config_223.xml
new file mode 100644
index 0000000..d0884d1
--- /dev/null
+++ b/share/regions/config_223.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0df" SimName="223" SimLocationX="1031" SimLocationY="1006" Datastore="store_223_x15_y13.yap" SimListenPort="9323" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y02.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_224.xml b/share/regions/config_224.xml
new file mode 100644
index 0000000..9c8f651
--- /dev/null
+++ b/share/regions/config_224.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e0" SimName="224" SimLocationX="1000" SimLocationY="1007" Datastore="store_224_x00_y14.yap" SimListenPort="9324" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_225.xml b/share/regions/config_225.xml
new file mode 100644
index 0000000..c5dbf32
--- /dev/null
+++ b/share/regions/config_225.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e1" SimName="225" SimLocationX="1001" SimLocationY="1007" Datastore="store_225_x01_y14.yap" SimListenPort="9325" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_226.xml b/share/regions/config_226.xml
new file mode 100644
index 0000000..7d831d1
--- /dev/null
+++ b/share/regions/config_226.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e2" SimName="226" SimLocationX="1002" SimLocationY="1007" Datastore="store_226_x02_y14.yap" SimListenPort="9326" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_227.xml b/share/regions/config_227.xml
new file mode 100644
index 0000000..d614e38
--- /dev/null
+++ b/share/regions/config_227.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e3" SimName="227" SimLocationX="1003" SimLocationY="1007" Datastore="store_227_x03_y14.yap" SimListenPort="9327" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_228.xml b/share/regions/config_228.xml
new file mode 100644
index 0000000..8ad7b59
--- /dev/null
+++ b/share/regions/config_228.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e4" SimName="228" SimLocationX="1004" SimLocationY="1007" Datastore="store_228_x04_y14.yap" SimListenPort="9328" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_229.xml b/share/regions/config_229.xml
new file mode 100644
index 0000000..6a56d2a
--- /dev/null
+++ b/share/regions/config_229.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e5" SimName="229" SimLocationX="1005" SimLocationY="1007" Datastore="store_229_x05_y14.yap" SimListenPort="9329" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_23.xml b/share/regions/config_23.xml
new file mode 100644
index 0000000..7d29fec
--- /dev/null
+++ b/share/regions/config_23.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf017" SimName="23" SimLocationX="1023" SimLocationY="1000" Datastore="store_23_x07_y01.yap" SimListenPort="9123" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_230.xml b/share/regions/config_230.xml
new file mode 100644
index 0000000..8fcb606
--- /dev/null
+++ b/share/regions/config_230.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e6" SimName="230" SimLocationX="1006" SimLocationY="1007" Datastore="store_230_x06_y14.yap" SimListenPort="9330" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_231.xml b/share/regions/config_231.xml
new file mode 100644
index 0000000..c024242
--- /dev/null
+++ b/share/regions/config_231.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e7" SimName="231" SimLocationX="1007" SimLocationY="1007" Datastore="store_231_x07_y14.yap" SimListenPort="9331" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_232.xml b/share/regions/config_232.xml
new file mode 100644
index 0000000..f55b7f0
--- /dev/null
+++ b/share/regions/config_232.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e8" SimName="232" SimLocationX="1008" SimLocationY="1007" Datastore="store_232_x08_y14.yap" SimListenPort="9332" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_233.xml b/share/regions/config_233.xml
new file mode 100644
index 0000000..9ba5de1
--- /dev/null
+++ b/share/regions/config_233.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0e9" SimName="233" SimLocationX="1009" SimLocationY="1007" Datastore="store_233_x09_y14.yap" SimListenPort="9333" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_234.xml b/share/regions/config_234.xml
new file mode 100644
index 0000000..7f5164f
--- /dev/null
+++ b/share/regions/config_234.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ea" SimName="234" SimLocationX="1010" SimLocationY="1007" Datastore="store_234_x10_y14.yap" SimListenPort="9334" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_235.xml b/share/regions/config_235.xml
new file mode 100644
index 0000000..6a8292c
--- /dev/null
+++ b/share/regions/config_235.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0eb" SimName="235" SimLocationX="1011" SimLocationY="1007" Datastore="store_235_x11_y14.yap" SimListenPort="9335" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_236.xml b/share/regions/config_236.xml
new file mode 100644
index 0000000..f99af33
--- /dev/null
+++ b/share/regions/config_236.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ec" SimName="236" SimLocationX="1012" SimLocationY="1007" Datastore="store_236_x12_y14.yap" SimListenPort="9336" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_237.xml b/share/regions/config_237.xml
new file mode 100644
index 0000000..3c8199f
--- /dev/null
+++ b/share/regions/config_237.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ed" SimName="237" SimLocationX="1013" SimLocationY="1007" Datastore="store_237_x13_y14.yap" SimListenPort="9337" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_238.xml b/share/regions/config_238.xml
new file mode 100644
index 0000000..0144491
--- /dev/null
+++ b/share/regions/config_238.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ee" SimName="238" SimLocationX="1014" SimLocationY="1007" Datastore="store_238_x14_y14.yap" SimListenPort="9338" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_239.xml b/share/regions/config_239.xml
new file mode 100644
index 0000000..9bf8bf5
--- /dev/null
+++ b/share/regions/config_239.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ef" SimName="239" SimLocationX="1015" SimLocationY="1007" Datastore="store_239_x15_y14.yap" SimListenPort="9339" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y01.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_24.xml b/share/regions/config_24.xml
new file mode 100644
index 0000000..c6f1752
--- /dev/null
+++ b/share/regions/config_24.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf018" SimName="24" SimLocationX="1024" SimLocationY="1000" Datastore="store_24_x08_y01.yap" SimListenPort="9124" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_240.xml b/share/regions/config_240.xml
new file mode 100644
index 0000000..ad7181a
--- /dev/null
+++ b/share/regions/config_240.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f0" SimName="240" SimLocationX="1016" SimLocationY="1007" Datastore="store_240_x00_y15.yap" SimListenPort="9340" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_241.xml b/share/regions/config_241.xml
new file mode 100644
index 0000000..3fd187f
--- /dev/null
+++ b/share/regions/config_241.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f1" SimName="241" SimLocationX="1017" SimLocationY="1007" Datastore="store_241_x01_y15.yap" SimListenPort="9341" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_242.xml b/share/regions/config_242.xml
new file mode 100644
index 0000000..6d265ef
--- /dev/null
+++ b/share/regions/config_242.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f2" SimName="242" SimLocationX="1018" SimLocationY="1007" Datastore="store_242_x02_y15.yap" SimListenPort="9342" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_243.xml b/share/regions/config_243.xml
new file mode 100644
index 0000000..a3c7508
--- /dev/null
+++ b/share/regions/config_243.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f3" SimName="243" SimLocationX="1019" SimLocationY="1007" Datastore="store_243_x03_y15.yap" SimListenPort="9343" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_244.xml b/share/regions/config_244.xml
new file mode 100644
index 0000000..b36846d
--- /dev/null
+++ b/share/regions/config_244.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f4" SimName="244" SimLocationX="1020" SimLocationY="1007" Datastore="store_244_x04_y15.yap" SimListenPort="9344" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_245.xml b/share/regions/config_245.xml
new file mode 100644
index 0000000..22f57a6
--- /dev/null
+++ b/share/regions/config_245.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f5" SimName="245" SimLocationX="1021" SimLocationY="1007" Datastore="store_245_x05_y15.yap" SimListenPort="9345" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_246.xml b/share/regions/config_246.xml
new file mode 100644
index 0000000..9ead36c
--- /dev/null
+++ b/share/regions/config_246.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f6" SimName="246" SimLocationX="1022" SimLocationY="1007" Datastore="store_246_x06_y15.yap" SimListenPort="9346" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_247.xml b/share/regions/config_247.xml
new file mode 100644
index 0000000..7bcb4d4
--- /dev/null
+++ b/share/regions/config_247.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f7" SimName="247" SimLocationX="1023" SimLocationY="1007" Datastore="store_247_x07_y15.yap" SimListenPort="9347" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_248.xml b/share/regions/config_248.xml
new file mode 100644
index 0000000..48232f1
--- /dev/null
+++ b/share/regions/config_248.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f8" SimName="248" SimLocationX="1024" SimLocationY="1007" Datastore="store_248_x08_y15.yap" SimListenPort="9348" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_249.xml b/share/regions/config_249.xml
new file mode 100644
index 0000000..6d62588
--- /dev/null
+++ b/share/regions/config_249.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0f9" SimName="249" SimLocationX="1025" SimLocationY="1007" Datastore="store_249_x09_y15.yap" SimListenPort="9349" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_25.xml b/share/regions/config_25.xml
new file mode 100644
index 0000000..5543521
--- /dev/null
+++ b/share/regions/config_25.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf019" SimName="25" SimLocationX="1025" SimLocationY="1000" Datastore="store_25_x09_y01.yap" SimListenPort="9125" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_250.xml b/share/regions/config_250.xml
new file mode 100644
index 0000000..1b1abaa
--- /dev/null
+++ b/share/regions/config_250.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0fa" SimName="250" SimLocationX="1026" SimLocationY="1007" Datastore="store_250_x10_y15.yap" SimListenPort="9350" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_251.xml b/share/regions/config_251.xml
new file mode 100644
index 0000000..780a6e6
--- /dev/null
+++ b/share/regions/config_251.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0fb" SimName="251" SimLocationX="1027" SimLocationY="1007" Datastore="store_251_x11_y15.yap" SimListenPort="9351" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_252.xml b/share/regions/config_252.xml
new file mode 100644
index 0000000..5adfad5
--- /dev/null
+++ b/share/regions/config_252.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0fc" SimName="252" SimLocationX="1028" SimLocationY="1007" Datastore="store_252_x12_y15.yap" SimListenPort="9352" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_253.xml b/share/regions/config_253.xml
new file mode 100644
index 0000000..d974650
--- /dev/null
+++ b/share/regions/config_253.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0fd" SimName="253" SimLocationX="1029" SimLocationY="1007" Datastore="store_253_x13_y15.yap" SimListenPort="9353" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_254.xml b/share/regions/config_254.xml
new file mode 100644
index 0000000..ccb55f9
--- /dev/null
+++ b/share/regions/config_254.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0fe" SimName="254" SimLocationX="1030" SimLocationY="1007" Datastore="store_254_x14_y15.yap" SimListenPort="9354" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_255.xml b/share/regions/config_255.xml
new file mode 100644
index 0000000..7cec0e9
--- /dev/null
+++ b/share/regions/config_255.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf0ff" SimName="255" SimLocationX="1031" SimLocationY="1007" Datastore="store_255_x15_y15.yap" SimListenPort="9355" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y00.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_256.xml b/share/regions/config_256.xml
new file mode 100644
index 0000000..59a632f
--- /dev/null
+++ b/share/regions/config_256.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf100" SimName="256" SimLocationX="1000" SimLocationY="1008" Datastore="store_256_x00_y16.yap" SimListenPort="9356" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_257.xml b/share/regions/config_257.xml
new file mode 100644
index 0000000..6e0543e
--- /dev/null
+++ b/share/regions/config_257.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf101" SimName="257" SimLocationX="1001" SimLocationY="1008" Datastore="store_257_x01_y16.yap" SimListenPort="9357" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_258.xml b/share/regions/config_258.xml
new file mode 100644
index 0000000..655ace1
--- /dev/null
+++ b/share/regions/config_258.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf102" SimName="258" SimLocationX="1002" SimLocationY="1008" Datastore="store_258_x02_y16.yap" SimListenPort="9358" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_259.xml b/share/regions/config_259.xml
new file mode 100644
index 0000000..78c90d6
--- /dev/null
+++ b/share/regions/config_259.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf103" SimName="259" SimLocationX="1003" SimLocationY="1008" Datastore="store_259_x03_y16.yap" SimListenPort="9359" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_26.xml b/share/regions/config_26.xml
new file mode 100644
index 0000000..763a3b1
--- /dev/null
+++ b/share/regions/config_26.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf01a" SimName="26" SimLocationX="1026" SimLocationY="1000" Datastore="store_26_x10_y01.yap" SimListenPort="9126" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_260.xml b/share/regions/config_260.xml
new file mode 100644
index 0000000..96e20ae
--- /dev/null
+++ b/share/regions/config_260.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf104" SimName="260" SimLocationX="1004" SimLocationY="1008" Datastore="store_260_x04_y16.yap" SimListenPort="9360" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_261.xml b/share/regions/config_261.xml
new file mode 100644
index 0000000..d50760c
--- /dev/null
+++ b/share/regions/config_261.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf105" SimName="261" SimLocationX="1005" SimLocationY="1008" Datastore="store_261_x05_y16.yap" SimListenPort="9361" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_262.xml b/share/regions/config_262.xml
new file mode 100644
index 0000000..96f8101
--- /dev/null
+++ b/share/regions/config_262.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf106" SimName="262" SimLocationX="1006" SimLocationY="1008" Datastore="store_262_x06_y16.yap" SimListenPort="9362" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_263.xml b/share/regions/config_263.xml
new file mode 100644
index 0000000..2ce131b
--- /dev/null
+++ b/share/regions/config_263.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf107" SimName="263" SimLocationX="1007" SimLocationY="1008" Datastore="store_263_x07_y16.yap" SimListenPort="9363" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_264.xml b/share/regions/config_264.xml
new file mode 100644
index 0000000..48e9e5d
--- /dev/null
+++ b/share/regions/config_264.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf108" SimName="264" SimLocationX="1008" SimLocationY="1008" Datastore="store_264_x08_y16.yap" SimListenPort="9364" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_265.xml b/share/regions/config_265.xml
new file mode 100644
index 0000000..45a4702
--- /dev/null
+++ b/share/regions/config_265.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf109" SimName="265" SimLocationX="1009" SimLocationY="1008" Datastore="store_265_x09_y16.yap" SimListenPort="9365" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_266.xml b/share/regions/config_266.xml
new file mode 100644
index 0000000..19b71ef
--- /dev/null
+++ b/share/regions/config_266.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf10a" SimName="266" SimLocationX="1010" SimLocationY="1008" Datastore="store_266_x10_y16.yap" SimListenPort="9366" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_267.xml b/share/regions/config_267.xml
new file mode 100644
index 0000000..66d6461
--- /dev/null
+++ b/share/regions/config_267.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf10b" SimName="267" SimLocationX="1011" SimLocationY="1008" Datastore="store_267_x11_y16.yap" SimListenPort="9367" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_268.xml b/share/regions/config_268.xml
new file mode 100644
index 0000000..4a7d8a5
--- /dev/null
+++ b/share/regions/config_268.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf10c" SimName="268" SimLocationX="1012" SimLocationY="1008" Datastore="store_268_x12_y16.yap" SimListenPort="9368" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_269.xml b/share/regions/config_269.xml
new file mode 100644
index 0000000..3b31628
--- /dev/null
+++ b/share/regions/config_269.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf10d" SimName="269" SimLocationX="1013" SimLocationY="1008" Datastore="store_269_x13_y16.yap" SimListenPort="9369" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_27.xml b/share/regions/config_27.xml
new file mode 100644
index 0000000..8dfbbd3
--- /dev/null
+++ b/share/regions/config_27.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf01b" SimName="27" SimLocationX="1027" SimLocationY="1000" Datastore="store_27_x11_y01.yap" SimListenPort="9127" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_270.xml b/share/regions/config_270.xml
new file mode 100644
index 0000000..9117885
--- /dev/null
+++ b/share/regions/config_270.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf10e" SimName="270" SimLocationX="1014" SimLocationY="1008" Datastore="store_270_x14_y16.yap" SimListenPort="9370" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_271.xml b/share/regions/config_271.xml
new file mode 100644
index 0000000..af8522c
--- /dev/null
+++ b/share/regions/config_271.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf10f" SimName="271" SimLocationX="1015" SimLocationY="1008" Datastore="store_271_x15_y16.yap" SimListenPort="9371" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-1.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_272.xml b/share/regions/config_272.xml
new file mode 100644
index 0000000..0274ef9
--- /dev/null
+++ b/share/regions/config_272.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf110" SimName="272" SimLocationX="1016" SimLocationY="1008" Datastore="store_272_x00_y17.yap" SimListenPort="9372" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_273.xml b/share/regions/config_273.xml
new file mode 100644
index 0000000..0f55269
--- /dev/null
+++ b/share/regions/config_273.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf111" SimName="273" SimLocationX="1017" SimLocationY="1008" Datastore="store_273_x01_y17.yap" SimListenPort="9373" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_274.xml b/share/regions/config_274.xml
new file mode 100644
index 0000000..35f3a9d
--- /dev/null
+++ b/share/regions/config_274.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf112" SimName="274" SimLocationX="1018" SimLocationY="1008" Datastore="store_274_x02_y17.yap" SimListenPort="9374" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_275.xml b/share/regions/config_275.xml
new file mode 100644
index 0000000..fc37b99
--- /dev/null
+++ b/share/regions/config_275.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf113" SimName="275" SimLocationX="1019" SimLocationY="1008" Datastore="store_275_x03_y17.yap" SimListenPort="9375" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_276.xml b/share/regions/config_276.xml
new file mode 100644
index 0000000..2ffa80c
--- /dev/null
+++ b/share/regions/config_276.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf114" SimName="276" SimLocationX="1020" SimLocationY="1008" Datastore="store_276_x04_y17.yap" SimListenPort="9376" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_277.xml b/share/regions/config_277.xml
new file mode 100644
index 0000000..8f4f35c
--- /dev/null
+++ b/share/regions/config_277.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf115" SimName="277" SimLocationX="1021" SimLocationY="1008" Datastore="store_277_x05_y17.yap" SimListenPort="9377" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_278.xml b/share/regions/config_278.xml
new file mode 100644
index 0000000..3363f18
--- /dev/null
+++ b/share/regions/config_278.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf116" SimName="278" SimLocationX="1022" SimLocationY="1008" Datastore="store_278_x06_y17.yap" SimListenPort="9378" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_279.xml b/share/regions/config_279.xml
new file mode 100644
index 0000000..df78f8f
--- /dev/null
+++ b/share/regions/config_279.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf117" SimName="279" SimLocationX="1023" SimLocationY="1008" Datastore="store_279_x07_y17.yap" SimListenPort="9379" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_28.xml b/share/regions/config_28.xml
new file mode 100644
index 0000000..5e6441d
--- /dev/null
+++ b/share/regions/config_28.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf01c" SimName="28" SimLocationX="1028" SimLocationY="1000" Datastore="store_28_x12_y01.yap" SimListenPort="9128" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_280.xml b/share/regions/config_280.xml
new file mode 100644
index 0000000..766ac88
--- /dev/null
+++ b/share/regions/config_280.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf118" SimName="280" SimLocationX="1024" SimLocationY="1008" Datastore="store_280_x08_y17.yap" SimListenPort="9380" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_281.xml b/share/regions/config_281.xml
new file mode 100644
index 0000000..32c6aa7
--- /dev/null
+++ b/share/regions/config_281.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf119" SimName="281" SimLocationX="1025" SimLocationY="1008" Datastore="store_281_x09_y17.yap" SimListenPort="9381" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_282.xml b/share/regions/config_282.xml
new file mode 100644
index 0000000..d53e3d9
--- /dev/null
+++ b/share/regions/config_282.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf11a" SimName="282" SimLocationX="1026" SimLocationY="1008" Datastore="store_282_x10_y17.yap" SimListenPort="9382" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_283.xml b/share/regions/config_283.xml
new file mode 100644
index 0000000..9db3fdf
--- /dev/null
+++ b/share/regions/config_283.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf11b" SimName="283" SimLocationX="1027" SimLocationY="1008" Datastore="store_283_x11_y17.yap" SimListenPort="9383" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_284.xml b/share/regions/config_284.xml
new file mode 100644
index 0000000..905bbb4
--- /dev/null
+++ b/share/regions/config_284.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf11c" SimName="284" SimLocationX="1028" SimLocationY="1008" Datastore="store_284_x12_y17.yap" SimListenPort="9384" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_285.xml b/share/regions/config_285.xml
new file mode 100644
index 0000000..8216e68
--- /dev/null
+++ b/share/regions/config_285.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf11d" SimName="285" SimLocationX="1029" SimLocationY="1008" Datastore="store_285_x13_y17.yap" SimListenPort="9385" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_286.xml b/share/regions/config_286.xml
new file mode 100644
index 0000000..58d10df
--- /dev/null
+++ b/share/regions/config_286.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf11e" SimName="286" SimLocationX="1030" SimLocationY="1008" Datastore="store_286_x14_y17.yap" SimListenPort="9386" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_287.xml b/share/regions/config_287.xml
new file mode 100644
index 0000000..4eee8cd
--- /dev/null
+++ b/share/regions/config_287.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf11f" SimName="287" SimLocationX="1031" SimLocationY="1008" Datastore="store_287_x15_y17.yap" SimListenPort="9387" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-2.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_288.xml b/share/regions/config_288.xml
new file mode 100644
index 0000000..ee82cd2
--- /dev/null
+++ b/share/regions/config_288.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf120" SimName="288" SimLocationX="1000" SimLocationY="1009" Datastore="store_288_x00_y18.yap" SimListenPort="9388" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_289.xml b/share/regions/config_289.xml
new file mode 100644
index 0000000..9601fc7
--- /dev/null
+++ b/share/regions/config_289.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf121" SimName="289" SimLocationX="1001" SimLocationY="1009" Datastore="store_289_x01_y18.yap" SimListenPort="9389" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_29.xml b/share/regions/config_29.xml
new file mode 100644
index 0000000..1881ee9
--- /dev/null
+++ b/share/regions/config_29.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf01d" SimName="29" SimLocationX="1029" SimLocationY="1000" Datastore="store_29_x13_y01.yap" SimListenPort="9129" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_290.xml b/share/regions/config_290.xml
new file mode 100644
index 0000000..22a383a
--- /dev/null
+++ b/share/regions/config_290.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf122" SimName="290" SimLocationX="1002" SimLocationY="1009" Datastore="store_290_x02_y18.yap" SimListenPort="9390" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_291.xml b/share/regions/config_291.xml
new file mode 100644
index 0000000..540d89d
--- /dev/null
+++ b/share/regions/config_291.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf123" SimName="291" SimLocationX="1003" SimLocationY="1009" Datastore="store_291_x03_y18.yap" SimListenPort="9391" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_292.xml b/share/regions/config_292.xml
new file mode 100644
index 0000000..6ce1d47
--- /dev/null
+++ b/share/regions/config_292.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf124" SimName="292" SimLocationX="1004" SimLocationY="1009" Datastore="store_292_x04_y18.yap" SimListenPort="9392" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_293.xml b/share/regions/config_293.xml
new file mode 100644
index 0000000..003d49a
--- /dev/null
+++ b/share/regions/config_293.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf125" SimName="293" SimLocationX="1005" SimLocationY="1009" Datastore="store_293_x05_y18.yap" SimListenPort="9393" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_294.xml b/share/regions/config_294.xml
new file mode 100644
index 0000000..f668758
--- /dev/null
+++ b/share/regions/config_294.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf126" SimName="294" SimLocationX="1006" SimLocationY="1009" Datastore="store_294_x06_y18.yap" SimListenPort="9394" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_295.xml b/share/regions/config_295.xml
new file mode 100644
index 0000000..d102961
--- /dev/null
+++ b/share/regions/config_295.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf127" SimName="295" SimLocationX="1007" SimLocationY="1009" Datastore="store_295_x07_y18.yap" SimListenPort="9395" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_296.xml b/share/regions/config_296.xml
new file mode 100644
index 0000000..5e012e4
--- /dev/null
+++ b/share/regions/config_296.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf128" SimName="296" SimLocationX="1008" SimLocationY="1009" Datastore="store_296_x08_y18.yap" SimListenPort="9396" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_297.xml b/share/regions/config_297.xml
new file mode 100644
index 0000000..a3b8b93
--- /dev/null
+++ b/share/regions/config_297.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf129" SimName="297" SimLocationX="1009" SimLocationY="1009" Datastore="store_297_x09_y18.yap" SimListenPort="9397" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_298.xml b/share/regions/config_298.xml
new file mode 100644
index 0000000..fdff826
--- /dev/null
+++ b/share/regions/config_298.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf12a" SimName="298" SimLocationX="1010" SimLocationY="1009" Datastore="store_298_x10_y18.yap" SimListenPort="9398" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_299.xml b/share/regions/config_299.xml
new file mode 100644
index 0000000..0642bb3
--- /dev/null
+++ b/share/regions/config_299.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf12b" SimName="299" SimLocationX="1011" SimLocationY="1009" Datastore="store_299_x11_y18.yap" SimListenPort="9399" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_3.xml b/share/regions/config_3.xml
new file mode 100644
index 0000000..806c88d
--- /dev/null
+++ b/share/regions/config_3.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf003" SimName="3" SimLocationX="1003" SimLocationY="1000" Datastore="store_3_x03_y00.yap" SimListenPort="9103" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_30.xml b/share/regions/config_30.xml
new file mode 100644
index 0000000..c1c55ec
--- /dev/null
+++ b/share/regions/config_30.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf01e" SimName="30" SimLocationX="1030" SimLocationY="1000" Datastore="store_30_x14_y01.yap" SimListenPort="9130" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_300.xml b/share/regions/config_300.xml
new file mode 100644
index 0000000..5fd299f
--- /dev/null
+++ b/share/regions/config_300.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf12c" SimName="300" SimLocationX="1012" SimLocationY="1009" Datastore="store_300_x12_y18.yap" SimListenPort="9400" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_301.xml b/share/regions/config_301.xml
new file mode 100644
index 0000000..90c08bb
--- /dev/null
+++ b/share/regions/config_301.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf12d" SimName="301" SimLocationX="1013" SimLocationY="1009" Datastore="store_301_x13_y18.yap" SimListenPort="9401" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_302.xml b/share/regions/config_302.xml
new file mode 100644
index 0000000..4d1c646
--- /dev/null
+++ b/share/regions/config_302.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf12e" SimName="302" SimLocationX="1014" SimLocationY="1009" Datastore="store_302_x14_y18.yap" SimListenPort="9402" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_303.xml b/share/regions/config_303.xml
new file mode 100644
index 0000000..931bf65
--- /dev/null
+++ b/share/regions/config_303.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf12f" SimName="303" SimLocationX="1015" SimLocationY="1009" Datastore="store_303_x15_y18.yap" SimListenPort="9403" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-3.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_304.xml b/share/regions/config_304.xml
new file mode 100644
index 0000000..5d6395a
--- /dev/null
+++ b/share/regions/config_304.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf130" SimName="304" SimLocationX="1016" SimLocationY="1009" Datastore="store_304_x00_y19.yap" SimListenPort="9404" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_305.xml b/share/regions/config_305.xml
new file mode 100644
index 0000000..6d95c1d
--- /dev/null
+++ b/share/regions/config_305.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf131" SimName="305" SimLocationX="1017" SimLocationY="1009" Datastore="store_305_x01_y19.yap" SimListenPort="9405" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_306.xml b/share/regions/config_306.xml
new file mode 100644
index 0000000..4beb01c
--- /dev/null
+++ b/share/regions/config_306.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf132" SimName="306" SimLocationX="1018" SimLocationY="1009" Datastore="store_306_x02_y19.yap" SimListenPort="9406" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_307.xml b/share/regions/config_307.xml
new file mode 100644
index 0000000..ac717c0
--- /dev/null
+++ b/share/regions/config_307.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf133" SimName="307" SimLocationX="1019" SimLocationY="1009" Datastore="store_307_x03_y19.yap" SimListenPort="9407" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_308.xml b/share/regions/config_308.xml
new file mode 100644
index 0000000..d84b894
--- /dev/null
+++ b/share/regions/config_308.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf134" SimName="308" SimLocationX="1020" SimLocationY="1009" Datastore="store_308_x04_y19.yap" SimListenPort="9408" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_309.xml b/share/regions/config_309.xml
new file mode 100644
index 0000000..bb6d9cf
--- /dev/null
+++ b/share/regions/config_309.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf135" SimName="309" SimLocationX="1021" SimLocationY="1009" Datastore="store_309_x05_y19.yap" SimListenPort="9409" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_31.xml b/share/regions/config_31.xml
new file mode 100644
index 0000000..a66ed51
--- /dev/null
+++ b/share/regions/config_31.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf01f" SimName="31" SimLocationX="1031" SimLocationY="1000" Datastore="store_31_x15_y01.yap" SimListenPort="9131" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_310.xml b/share/regions/config_310.xml
new file mode 100644
index 0000000..c9d537d
--- /dev/null
+++ b/share/regions/config_310.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf136" SimName="310" SimLocationX="1022" SimLocationY="1009" Datastore="store_310_x06_y19.yap" SimListenPort="9410" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_311.xml b/share/regions/config_311.xml
new file mode 100644
index 0000000..ecdaeb8
--- /dev/null
+++ b/share/regions/config_311.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf137" SimName="311" SimLocationX="1023" SimLocationY="1009" Datastore="store_311_x07_y19.yap" SimListenPort="9411" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_312.xml b/share/regions/config_312.xml
new file mode 100644
index 0000000..dbcb515
--- /dev/null
+++ b/share/regions/config_312.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf138" SimName="312" SimLocationX="1024" SimLocationY="1009" Datastore="store_312_x08_y19.yap" SimListenPort="9412" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_313.xml b/share/regions/config_313.xml
new file mode 100644
index 0000000..7dc6b45
--- /dev/null
+++ b/share/regions/config_313.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf139" SimName="313" SimLocationX="1025" SimLocationY="1009" Datastore="store_313_x09_y19.yap" SimListenPort="9413" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_314.xml b/share/regions/config_314.xml
new file mode 100644
index 0000000..865d865
--- /dev/null
+++ b/share/regions/config_314.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf13a" SimName="314" SimLocationX="1026" SimLocationY="1009" Datastore="store_314_x10_y19.yap" SimListenPort="9414" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_315.xml b/share/regions/config_315.xml
new file mode 100644
index 0000000..073e89a
--- /dev/null
+++ b/share/regions/config_315.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf13b" SimName="315" SimLocationX="1027" SimLocationY="1009" Datastore="store_315_x11_y19.yap" SimListenPort="9415" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_316.xml b/share/regions/config_316.xml
new file mode 100644
index 0000000..4c5d131
--- /dev/null
+++ b/share/regions/config_316.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf13c" SimName="316" SimLocationX="1028" SimLocationY="1009" Datastore="store_316_x12_y19.yap" SimListenPort="9416" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_317.xml b/share/regions/config_317.xml
new file mode 100644
index 0000000..853caf7
--- /dev/null
+++ b/share/regions/config_317.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf13d" SimName="317" SimLocationX="1029" SimLocationY="1009" Datastore="store_317_x13_y19.yap" SimListenPort="9417" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_318.xml b/share/regions/config_318.xml
new file mode 100644
index 0000000..d0eb759
--- /dev/null
+++ b/share/regions/config_318.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf13e" SimName="318" SimLocationX="1030" SimLocationY="1009" Datastore="store_318_x14_y19.yap" SimListenPort="9418" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_319.xml b/share/regions/config_319.xml
new file mode 100644
index 0000000..168875f
--- /dev/null
+++ b/share/regions/config_319.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf13f" SimName="319" SimLocationX="1031" SimLocationY="1009" Datastore="store_319_x15_y19.yap" SimListenPort="9419" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-4.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_32.xml b/share/regions/config_32.xml
new file mode 100644
index 0000000..47c45af
--- /dev/null
+++ b/share/regions/config_32.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf020" SimName="32" SimLocationX="1000" SimLocationY="1001" Datastore="store_32_x00_y02.yap" SimListenPort="9132" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_320.xml b/share/regions/config_320.xml
new file mode 100644
index 0000000..6f7c12e
--- /dev/null
+++ b/share/regions/config_320.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf140" SimName="320" SimLocationX="1000" SimLocationY="1010" Datastore="store_320_x00_y20.yap" SimListenPort="9420" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_321.xml b/share/regions/config_321.xml
new file mode 100644
index 0000000..dd8c9ea
--- /dev/null
+++ b/share/regions/config_321.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf141" SimName="321" SimLocationX="1001" SimLocationY="1010" Datastore="store_321_x01_y20.yap" SimListenPort="9421" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_322.xml b/share/regions/config_322.xml
new file mode 100644
index 0000000..47ec1e8
--- /dev/null
+++ b/share/regions/config_322.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf142" SimName="322" SimLocationX="1002" SimLocationY="1010" Datastore="store_322_x02_y20.yap" SimListenPort="9422" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_323.xml b/share/regions/config_323.xml
new file mode 100644
index 0000000..e6efaf4
--- /dev/null
+++ b/share/regions/config_323.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf143" SimName="323" SimLocationX="1003" SimLocationY="1010" Datastore="store_323_x03_y20.yap" SimListenPort="9423" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_324.xml b/share/regions/config_324.xml
new file mode 100644
index 0000000..24c7a1a
--- /dev/null
+++ b/share/regions/config_324.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf144" SimName="324" SimLocationX="1004" SimLocationY="1010" Datastore="store_324_x04_y20.yap" SimListenPort="9424" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_325.xml b/share/regions/config_325.xml
new file mode 100644
index 0000000..5a9b9e1
--- /dev/null
+++ b/share/regions/config_325.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf145" SimName="325" SimLocationX="1005" SimLocationY="1010" Datastore="store_325_x05_y20.yap" SimListenPort="9425" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_326.xml b/share/regions/config_326.xml
new file mode 100644
index 0000000..1994ff3
--- /dev/null
+++ b/share/regions/config_326.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf146" SimName="326" SimLocationX="1006" SimLocationY="1010" Datastore="store_326_x06_y20.yap" SimListenPort="9426" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_327.xml b/share/regions/config_327.xml
new file mode 100644
index 0000000..75a3cfc
--- /dev/null
+++ b/share/regions/config_327.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf147" SimName="327" SimLocationX="1007" SimLocationY="1010" Datastore="store_327_x07_y20.yap" SimListenPort="9427" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_328.xml b/share/regions/config_328.xml
new file mode 100644
index 0000000..824b2e9
--- /dev/null
+++ b/share/regions/config_328.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf148" SimName="328" SimLocationX="1008" SimLocationY="1010" Datastore="store_328_x08_y20.yap" SimListenPort="9428" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_329.xml b/share/regions/config_329.xml
new file mode 100644
index 0000000..757680f
--- /dev/null
+++ b/share/regions/config_329.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf149" SimName="329" SimLocationX="1009" SimLocationY="1010" Datastore="store_329_x09_y20.yap" SimListenPort="9429" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_33.xml b/share/regions/config_33.xml
new file mode 100644
index 0000000..8c14f7a
--- /dev/null
+++ b/share/regions/config_33.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf021" SimName="33" SimLocationX="1001" SimLocationY="1001" Datastore="store_33_x01_y02.yap" SimListenPort="9133" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_330.xml b/share/regions/config_330.xml
new file mode 100644
index 0000000..0270580
--- /dev/null
+++ b/share/regions/config_330.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf14a" SimName="330" SimLocationX="1010" SimLocationY="1010" Datastore="store_330_x10_y20.yap" SimListenPort="9430" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_331.xml b/share/regions/config_331.xml
new file mode 100644
index 0000000..ad74945
--- /dev/null
+++ b/share/regions/config_331.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf14b" SimName="331" SimLocationX="1011" SimLocationY="1010" Datastore="store_331_x11_y20.yap" SimListenPort="9431" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_332.xml b/share/regions/config_332.xml
new file mode 100644
index 0000000..bf19af1
--- /dev/null
+++ b/share/regions/config_332.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf14c" SimName="332" SimLocationX="1012" SimLocationY="1010" Datastore="store_332_x12_y20.yap" SimListenPort="9432" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_333.xml b/share/regions/config_333.xml
new file mode 100644
index 0000000..3686668
--- /dev/null
+++ b/share/regions/config_333.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf14d" SimName="333" SimLocationX="1013" SimLocationY="1010" Datastore="store_333_x13_y20.yap" SimListenPort="9433" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_334.xml b/share/regions/config_334.xml
new file mode 100644
index 0000000..4b28b3e
--- /dev/null
+++ b/share/regions/config_334.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf14e" SimName="334" SimLocationX="1014" SimLocationY="1010" Datastore="store_334_x14_y20.yap" SimListenPort="9434" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_335.xml b/share/regions/config_335.xml
new file mode 100644
index 0000000..1980da0
--- /dev/null
+++ b/share/regions/config_335.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf14f" SimName="335" SimLocationX="1015" SimLocationY="1010" Datastore="store_335_x15_y20.yap" SimListenPort="9435" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-5.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_336.xml b/share/regions/config_336.xml
new file mode 100644
index 0000000..1e4b2a7
--- /dev/null
+++ b/share/regions/config_336.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf150" SimName="336" SimLocationX="1016" SimLocationY="1010" Datastore="store_336_x00_y21.yap" SimListenPort="9436" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_337.xml b/share/regions/config_337.xml
new file mode 100644
index 0000000..3e7e3ce
--- /dev/null
+++ b/share/regions/config_337.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf151" SimName="337" SimLocationX="1017" SimLocationY="1010" Datastore="store_337_x01_y21.yap" SimListenPort="9437" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_338.xml b/share/regions/config_338.xml
new file mode 100644
index 0000000..71c88de
--- /dev/null
+++ b/share/regions/config_338.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf152" SimName="338" SimLocationX="1018" SimLocationY="1010" Datastore="store_338_x02_y21.yap" SimListenPort="9438" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_339.xml b/share/regions/config_339.xml
new file mode 100644
index 0000000..d22de66
--- /dev/null
+++ b/share/regions/config_339.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf153" SimName="339" SimLocationX="1019" SimLocationY="1010" Datastore="store_339_x03_y21.yap" SimListenPort="9439" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_34.xml b/share/regions/config_34.xml
new file mode 100644
index 0000000..08132d0
--- /dev/null
+++ b/share/regions/config_34.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf022" SimName="34" SimLocationX="1002" SimLocationY="1001" Datastore="store_34_x02_y02.yap" SimListenPort="9134" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_340.xml b/share/regions/config_340.xml
new file mode 100644
index 0000000..c05d9e3
--- /dev/null
+++ b/share/regions/config_340.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf154" SimName="340" SimLocationX="1020" SimLocationY="1010" Datastore="store_340_x04_y21.yap" SimListenPort="9440" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_341.xml b/share/regions/config_341.xml
new file mode 100644
index 0000000..a8e8581
--- /dev/null
+++ b/share/regions/config_341.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf155" SimName="341" SimLocationX="1021" SimLocationY="1010" Datastore="store_341_x05_y21.yap" SimListenPort="9441" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_342.xml b/share/regions/config_342.xml
new file mode 100644
index 0000000..cb28842
--- /dev/null
+++ b/share/regions/config_342.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf156" SimName="342" SimLocationX="1022" SimLocationY="1010" Datastore="store_342_x06_y21.yap" SimListenPort="9442" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_343.xml b/share/regions/config_343.xml
new file mode 100644
index 0000000..2a9678f
--- /dev/null
+++ b/share/regions/config_343.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf157" SimName="343" SimLocationX="1023" SimLocationY="1010" Datastore="store_343_x07_y21.yap" SimListenPort="9443" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_344.xml b/share/regions/config_344.xml
new file mode 100644
index 0000000..8e9771a
--- /dev/null
+++ b/share/regions/config_344.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf158" SimName="344" SimLocationX="1024" SimLocationY="1010" Datastore="store_344_x08_y21.yap" SimListenPort="9444" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_345.xml b/share/regions/config_345.xml
new file mode 100644
index 0000000..4d64467
--- /dev/null
+++ b/share/regions/config_345.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf159" SimName="345" SimLocationX="1025" SimLocationY="1010" Datastore="store_345_x09_y21.yap" SimListenPort="9445" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_346.xml b/share/regions/config_346.xml
new file mode 100644
index 0000000..36b2516
--- /dev/null
+++ b/share/regions/config_346.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf15a" SimName="346" SimLocationX="1026" SimLocationY="1010" Datastore="store_346_x10_y21.yap" SimListenPort="9446" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_347.xml b/share/regions/config_347.xml
new file mode 100644
index 0000000..10344f4
--- /dev/null
+++ b/share/regions/config_347.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf15b" SimName="347" SimLocationX="1027" SimLocationY="1010" Datastore="store_347_x11_y21.yap" SimListenPort="9447" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_348.xml b/share/regions/config_348.xml
new file mode 100644
index 0000000..102b9dd
--- /dev/null
+++ b/share/regions/config_348.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf15c" SimName="348" SimLocationX="1028" SimLocationY="1010" Datastore="store_348_x12_y21.yap" SimListenPort="9448" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_349.xml b/share/regions/config_349.xml
new file mode 100644
index 0000000..de39dc9
--- /dev/null
+++ b/share/regions/config_349.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf15d" SimName="349" SimLocationX="1029" SimLocationY="1010" Datastore="store_349_x13_y21.yap" SimListenPort="9449" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_35.xml b/share/regions/config_35.xml
new file mode 100644
index 0000000..fde3552
--- /dev/null
+++ b/share/regions/config_35.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf023" SimName="35" SimLocationX="1003" SimLocationY="1001" Datastore="store_35_x03_y02.yap" SimListenPort="9135" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_350.xml b/share/regions/config_350.xml
new file mode 100644
index 0000000..aa10906
--- /dev/null
+++ b/share/regions/config_350.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf15e" SimName="350" SimLocationX="1030" SimLocationY="1010" Datastore="store_350_x14_y21.yap" SimListenPort="9450" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_351.xml b/share/regions/config_351.xml
new file mode 100644
index 0000000..e791e61
--- /dev/null
+++ b/share/regions/config_351.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf15f" SimName="351" SimLocationX="1031" SimLocationY="1010" Datastore="store_351_x15_y21.yap" SimListenPort="9451" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-6.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_352.xml b/share/regions/config_352.xml
new file mode 100644
index 0000000..7ab0219
--- /dev/null
+++ b/share/regions/config_352.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf160" SimName="352" SimLocationX="1000" SimLocationY="1011" Datastore="store_352_x00_y22.yap" SimListenPort="9452" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_353.xml b/share/regions/config_353.xml
new file mode 100644
index 0000000..489ce5a
--- /dev/null
+++ b/share/regions/config_353.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf161" SimName="353" SimLocationX="1001" SimLocationY="1011" Datastore="store_353_x01_y22.yap" SimListenPort="9453" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_354.xml b/share/regions/config_354.xml
new file mode 100644
index 0000000..4eacc38
--- /dev/null
+++ b/share/regions/config_354.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf162" SimName="354" SimLocationX="1002" SimLocationY="1011" Datastore="store_354_x02_y22.yap" SimListenPort="9454" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_355.xml b/share/regions/config_355.xml
new file mode 100644
index 0000000..1f85b26
--- /dev/null
+++ b/share/regions/config_355.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf163" SimName="355" SimLocationX="1003" SimLocationY="1011" Datastore="store_355_x03_y22.yap" SimListenPort="9455" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_356.xml b/share/regions/config_356.xml
new file mode 100644
index 0000000..baf1880
--- /dev/null
+++ b/share/regions/config_356.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf164" SimName="356" SimLocationX="1004" SimLocationY="1011" Datastore="store_356_x04_y22.yap" SimListenPort="9456" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_357.xml b/share/regions/config_357.xml
new file mode 100644
index 0000000..37e2f28
--- /dev/null
+++ b/share/regions/config_357.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf165" SimName="357" SimLocationX="1005" SimLocationY="1011" Datastore="store_357_x05_y22.yap" SimListenPort="9457" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_358.xml b/share/regions/config_358.xml
new file mode 100644
index 0000000..75ae185
--- /dev/null
+++ b/share/regions/config_358.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf166" SimName="358" SimLocationX="1006" SimLocationY="1011" Datastore="store_358_x06_y22.yap" SimListenPort="9458" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_359.xml b/share/regions/config_359.xml
new file mode 100644
index 0000000..698ab2b
--- /dev/null
+++ b/share/regions/config_359.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf167" SimName="359" SimLocationX="1007" SimLocationY="1011" Datastore="store_359_x07_y22.yap" SimListenPort="9459" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_36.xml b/share/regions/config_36.xml
new file mode 100644
index 0000000..f50eda8
--- /dev/null
+++ b/share/regions/config_36.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf024" SimName="36" SimLocationX="1004" SimLocationY="1001" Datastore="store_36_x04_y02.yap" SimListenPort="9136" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_360.xml b/share/regions/config_360.xml
new file mode 100644
index 0000000..c18027c
--- /dev/null
+++ b/share/regions/config_360.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf168" SimName="360" SimLocationX="1008" SimLocationY="1011" Datastore="store_360_x08_y22.yap" SimListenPort="9460" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_361.xml b/share/regions/config_361.xml
new file mode 100644
index 0000000..97f12e6
--- /dev/null
+++ b/share/regions/config_361.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf169" SimName="361" SimLocationX="1009" SimLocationY="1011" Datastore="store_361_x09_y22.yap" SimListenPort="9461" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_362.xml b/share/regions/config_362.xml
new file mode 100644
index 0000000..ba0a464
--- /dev/null
+++ b/share/regions/config_362.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf16a" SimName="362" SimLocationX="1010" SimLocationY="1011" Datastore="store_362_x10_y22.yap" SimListenPort="9462" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_363.xml b/share/regions/config_363.xml
new file mode 100644
index 0000000..c0965e6
--- /dev/null
+++ b/share/regions/config_363.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf16b" SimName="363" SimLocationX="1011" SimLocationY="1011" Datastore="store_363_x11_y22.yap" SimListenPort="9463" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_364.xml b/share/regions/config_364.xml
new file mode 100644
index 0000000..d977ab4
--- /dev/null
+++ b/share/regions/config_364.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf16c" SimName="364" SimLocationX="1012" SimLocationY="1011" Datastore="store_364_x12_y22.yap" SimListenPort="9464" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_365.xml b/share/regions/config_365.xml
new file mode 100644
index 0000000..260e3a6
--- /dev/null
+++ b/share/regions/config_365.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf16d" SimName="365" SimLocationX="1013" SimLocationY="1011" Datastore="store_365_x13_y22.yap" SimListenPort="9465" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_366.xml b/share/regions/config_366.xml
new file mode 100644
index 0000000..3d61061
--- /dev/null
+++ b/share/regions/config_366.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf16e" SimName="366" SimLocationX="1014" SimLocationY="1011" Datastore="store_366_x14_y22.yap" SimListenPort="9466" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_367.xml b/share/regions/config_367.xml
new file mode 100644
index 0000000..cc2b5d6
--- /dev/null
+++ b/share/regions/config_367.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf16f" SimName="367" SimLocationX="1015" SimLocationY="1011" Datastore="store_367_x15_y22.yap" SimListenPort="9467" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-7.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_368.xml b/share/regions/config_368.xml
new file mode 100644
index 0000000..07bab28
--- /dev/null
+++ b/share/regions/config_368.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf170" SimName="368" SimLocationX="1016" SimLocationY="1011" Datastore="store_368_x00_y23.yap" SimListenPort="9468" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_369.xml b/share/regions/config_369.xml
new file mode 100644
index 0000000..6b0b8f8
--- /dev/null
+++ b/share/regions/config_369.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf171" SimName="369" SimLocationX="1017" SimLocationY="1011" Datastore="store_369_x01_y23.yap" SimListenPort="9469" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_37.xml b/share/regions/config_37.xml
new file mode 100644
index 0000000..d8f8e70
--- /dev/null
+++ b/share/regions/config_37.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf025" SimName="37" SimLocationX="1005" SimLocationY="1001" Datastore="store_37_x05_y02.yap" SimListenPort="9137" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_370.xml b/share/regions/config_370.xml
new file mode 100644
index 0000000..b9b23df
--- /dev/null
+++ b/share/regions/config_370.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf172" SimName="370" SimLocationX="1018" SimLocationY="1011" Datastore="store_370_x02_y23.yap" SimListenPort="9470" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_371.xml b/share/regions/config_371.xml
new file mode 100644
index 0000000..db2e347
--- /dev/null
+++ b/share/regions/config_371.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf173" SimName="371" SimLocationX="1019" SimLocationY="1011" Datastore="store_371_x03_y23.yap" SimListenPort="9471" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_372.xml b/share/regions/config_372.xml
new file mode 100644
index 0000000..daaf089
--- /dev/null
+++ b/share/regions/config_372.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf174" SimName="372" SimLocationX="1020" SimLocationY="1011" Datastore="store_372_x04_y23.yap" SimListenPort="9472" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_373.xml b/share/regions/config_373.xml
new file mode 100644
index 0000000..9169e6f
--- /dev/null
+++ b/share/regions/config_373.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf175" SimName="373" SimLocationX="1021" SimLocationY="1011" Datastore="store_373_x05_y23.yap" SimListenPort="9473" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_374.xml b/share/regions/config_374.xml
new file mode 100644
index 0000000..f7a8024
--- /dev/null
+++ b/share/regions/config_374.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf176" SimName="374" SimLocationX="1022" SimLocationY="1011" Datastore="store_374_x06_y23.yap" SimListenPort="9474" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_375.xml b/share/regions/config_375.xml
new file mode 100644
index 0000000..ee53e02
--- /dev/null
+++ b/share/regions/config_375.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf177" SimName="375" SimLocationX="1023" SimLocationY="1011" Datastore="store_375_x07_y23.yap" SimListenPort="9475" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_376.xml b/share/regions/config_376.xml
new file mode 100644
index 0000000..6567eba
--- /dev/null
+++ b/share/regions/config_376.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf178" SimName="376" SimLocationX="1024" SimLocationY="1011" Datastore="store_376_x08_y23.yap" SimListenPort="9476" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_377.xml b/share/regions/config_377.xml
new file mode 100644
index 0000000..9cfc07a
--- /dev/null
+++ b/share/regions/config_377.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf179" SimName="377" SimLocationX="1025" SimLocationY="1011" Datastore="store_377_x09_y23.yap" SimListenPort="9477" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_378.xml b/share/regions/config_378.xml
new file mode 100644
index 0000000..dc64f23
--- /dev/null
+++ b/share/regions/config_378.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf17a" SimName="378" SimLocationX="1026" SimLocationY="1011" Datastore="store_378_x10_y23.yap" SimListenPort="9478" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_379.xml b/share/regions/config_379.xml
new file mode 100644
index 0000000..b690161
--- /dev/null
+++ b/share/regions/config_379.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf17b" SimName="379" SimLocationX="1027" SimLocationY="1011" Datastore="store_379_x11_y23.yap" SimListenPort="9479" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_38.xml b/share/regions/config_38.xml
new file mode 100644
index 0000000..8b59756
--- /dev/null
+++ b/share/regions/config_38.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf026" SimName="38" SimLocationX="1006" SimLocationY="1001" Datastore="store_38_x06_y02.yap" SimListenPort="9138" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_380.xml b/share/regions/config_380.xml
new file mode 100644
index 0000000..c287ca7
--- /dev/null
+++ b/share/regions/config_380.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf17c" SimName="380" SimLocationX="1028" SimLocationY="1011" Datastore="store_380_x12_y23.yap" SimListenPort="9480" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_381.xml b/share/regions/config_381.xml
new file mode 100644
index 0000000..6407a59
--- /dev/null
+++ b/share/regions/config_381.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf17d" SimName="381" SimLocationX="1029" SimLocationY="1011" Datastore="store_381_x13_y23.yap" SimListenPort="9481" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_382.xml b/share/regions/config_382.xml
new file mode 100644
index 0000000..c3601c0
--- /dev/null
+++ b/share/regions/config_382.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf17e" SimName="382" SimLocationX="1030" SimLocationY="1011" Datastore="store_382_x14_y23.yap" SimListenPort="9482" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_383.xml b/share/regions/config_383.xml
new file mode 100644
index 0000000..5067b99
--- /dev/null
+++ b/share/regions/config_383.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf17f" SimName="383" SimLocationX="1031" SimLocationY="1011" Datastore="store_383_x15_y23.yap" SimListenPort="9483" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-8.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_384.xml b/share/regions/config_384.xml
new file mode 100644
index 0000000..e624312
--- /dev/null
+++ b/share/regions/config_384.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf180" SimName="384" SimLocationX="1000" SimLocationY="1012" Datastore="store_384_x00_y24.yap" SimListenPort="9484" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_385.xml b/share/regions/config_385.xml
new file mode 100644
index 0000000..d0095f3
--- /dev/null
+++ b/share/regions/config_385.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf181" SimName="385" SimLocationX="1001" SimLocationY="1012" Datastore="store_385_x01_y24.yap" SimListenPort="9485" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_386.xml b/share/regions/config_386.xml
new file mode 100644
index 0000000..ae9549d
--- /dev/null
+++ b/share/regions/config_386.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf182" SimName="386" SimLocationX="1002" SimLocationY="1012" Datastore="store_386_x02_y24.yap" SimListenPort="9486" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_387.xml b/share/regions/config_387.xml
new file mode 100644
index 0000000..e2c2880
--- /dev/null
+++ b/share/regions/config_387.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf183" SimName="387" SimLocationX="1003" SimLocationY="1012" Datastore="store_387_x03_y24.yap" SimListenPort="9487" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_388.xml b/share/regions/config_388.xml
new file mode 100644
index 0000000..5b0e3e2
--- /dev/null
+++ b/share/regions/config_388.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf184" SimName="388" SimLocationX="1004" SimLocationY="1012" Datastore="store_388_x04_y24.yap" SimListenPort="9488" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_389.xml b/share/regions/config_389.xml
new file mode 100644
index 0000000..a77061a
--- /dev/null
+++ b/share/regions/config_389.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf185" SimName="389" SimLocationX="1005" SimLocationY="1012" Datastore="store_389_x05_y24.yap" SimListenPort="9489" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_39.xml b/share/regions/config_39.xml
new file mode 100644
index 0000000..75050bb
--- /dev/null
+++ b/share/regions/config_39.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf027" SimName="39" SimLocationX="1007" SimLocationY="1001" Datastore="store_39_x07_y02.yap" SimListenPort="9139" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_390.xml b/share/regions/config_390.xml
new file mode 100644
index 0000000..79887c0
--- /dev/null
+++ b/share/regions/config_390.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf186" SimName="390" SimLocationX="1006" SimLocationY="1012" Datastore="store_390_x06_y24.yap" SimListenPort="9490" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_391.xml b/share/regions/config_391.xml
new file mode 100644
index 0000000..3863fb5
--- /dev/null
+++ b/share/regions/config_391.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf187" SimName="391" SimLocationX="1007" SimLocationY="1012" Datastore="store_391_x07_y24.yap" SimListenPort="9491" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_392.xml b/share/regions/config_392.xml
new file mode 100644
index 0000000..c5c4552
--- /dev/null
+++ b/share/regions/config_392.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf188" SimName="392" SimLocationX="1008" SimLocationY="1012" Datastore="store_392_x08_y24.yap" SimListenPort="9492" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_393.xml b/share/regions/config_393.xml
new file mode 100644
index 0000000..d0e0a61
--- /dev/null
+++ b/share/regions/config_393.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf189" SimName="393" SimLocationX="1009" SimLocationY="1012" Datastore="store_393_x09_y24.yap" SimListenPort="9493" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_394.xml b/share/regions/config_394.xml
new file mode 100644
index 0000000..3fd4cb5
--- /dev/null
+++ b/share/regions/config_394.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf18a" SimName="394" SimLocationX="1010" SimLocationY="1012" Datastore="store_394_x10_y24.yap" SimListenPort="9494" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_395.xml b/share/regions/config_395.xml
new file mode 100644
index 0000000..a49a948
--- /dev/null
+++ b/share/regions/config_395.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf18b" SimName="395" SimLocationX="1011" SimLocationY="1012" Datastore="store_395_x11_y24.yap" SimListenPort="9495" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_396.xml b/share/regions/config_396.xml
new file mode 100644
index 0000000..fd2461a
--- /dev/null
+++ b/share/regions/config_396.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf18c" SimName="396" SimLocationX="1012" SimLocationY="1012" Datastore="store_396_x12_y24.yap" SimListenPort="9496" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_397.xml b/share/regions/config_397.xml
new file mode 100644
index 0000000..d3a693b
--- /dev/null
+++ b/share/regions/config_397.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf18d" SimName="397" SimLocationX="1013" SimLocationY="1012" Datastore="store_397_x13_y24.yap" SimListenPort="9497" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_398.xml b/share/regions/config_398.xml
new file mode 100644
index 0000000..e2afde9
--- /dev/null
+++ b/share/regions/config_398.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf18e" SimName="398" SimLocationX="1014" SimLocationY="1012" Datastore="store_398_x14_y24.yap" SimListenPort="9498" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_399.xml b/share/regions/config_399.xml
new file mode 100644
index 0000000..938794c
--- /dev/null
+++ b/share/regions/config_399.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf18f" SimName="399" SimLocationX="1015" SimLocationY="1012" Datastore="store_399_x15_y24.yap" SimListenPort="9499" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-9.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_4.xml b/share/regions/config_4.xml
new file mode 100644
index 0000000..8744f4e
--- /dev/null
+++ b/share/regions/config_4.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf004" SimName="4" SimLocationX="1004" SimLocationY="1000" Datastore="store_4_x04_y00.yap" SimListenPort="9104" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_40.xml b/share/regions/config_40.xml
new file mode 100644
index 0000000..2e399da
--- /dev/null
+++ b/share/regions/config_40.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf028" SimName="40" SimLocationX="1008" SimLocationY="1001" Datastore="store_40_x08_y02.yap" SimListenPort="9140" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_400.xml b/share/regions/config_400.xml
new file mode 100644
index 0000000..cab19d9
--- /dev/null
+++ b/share/regions/config_400.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf190" SimName="400" SimLocationX="1016" SimLocationY="1012" Datastore="store_400_x00_y25.yap" SimListenPort="9500" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_401.xml b/share/regions/config_401.xml
new file mode 100644
index 0000000..f8c29e7
--- /dev/null
+++ b/share/regions/config_401.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf191" SimName="401" SimLocationX="1017" SimLocationY="1012" Datastore="store_401_x01_y25.yap" SimListenPort="9501" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_402.xml b/share/regions/config_402.xml
new file mode 100644
index 0000000..39fea36
--- /dev/null
+++ b/share/regions/config_402.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf192" SimName="402" SimLocationX="1018" SimLocationY="1012" Datastore="store_402_x02_y25.yap" SimListenPort="9502" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_403.xml b/share/regions/config_403.xml
new file mode 100644
index 0000000..d61a2da
--- /dev/null
+++ b/share/regions/config_403.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf193" SimName="403" SimLocationX="1019" SimLocationY="1012" Datastore="store_403_x03_y25.yap" SimListenPort="9503" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_404.xml b/share/regions/config_404.xml
new file mode 100644
index 0000000..d2d5a81
--- /dev/null
+++ b/share/regions/config_404.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf194" SimName="404" SimLocationX="1020" SimLocationY="1012" Datastore="store_404_x04_y25.yap" SimListenPort="9504" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_405.xml b/share/regions/config_405.xml
new file mode 100644
index 0000000..a07a7bc
--- /dev/null
+++ b/share/regions/config_405.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf195" SimName="405" SimLocationX="1021" SimLocationY="1012" Datastore="store_405_x05_y25.yap" SimListenPort="9505" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_406.xml b/share/regions/config_406.xml
new file mode 100644
index 0000000..5855778
--- /dev/null
+++ b/share/regions/config_406.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf196" SimName="406" SimLocationX="1022" SimLocationY="1012" Datastore="store_406_x06_y25.yap" SimListenPort="9506" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_407.xml b/share/regions/config_407.xml
new file mode 100644
index 0000000..9c54b3d
--- /dev/null
+++ b/share/regions/config_407.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf197" SimName="407" SimLocationX="1023" SimLocationY="1012" Datastore="store_407_x07_y25.yap" SimListenPort="9507" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_408.xml b/share/regions/config_408.xml
new file mode 100644
index 0000000..83e95b1
--- /dev/null
+++ b/share/regions/config_408.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf198" SimName="408" SimLocationX="1024" SimLocationY="1012" Datastore="store_408_x08_y25.yap" SimListenPort="9508" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_409.xml b/share/regions/config_409.xml
new file mode 100644
index 0000000..6b15ed3
--- /dev/null
+++ b/share/regions/config_409.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf199" SimName="409" SimLocationX="1025" SimLocationY="1012" Datastore="store_409_x09_y25.yap" SimListenPort="9509" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_41.xml b/share/regions/config_41.xml
new file mode 100644
index 0000000..c7ddbb9
--- /dev/null
+++ b/share/regions/config_41.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf029" SimName="41" SimLocationX="1009" SimLocationY="1001" Datastore="store_41_x09_y02.yap" SimListenPort="9141" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_410.xml b/share/regions/config_410.xml
new file mode 100644
index 0000000..0fb99a1
--- /dev/null
+++ b/share/regions/config_410.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf19a" SimName="410" SimLocationX="1026" SimLocationY="1012" Datastore="store_410_x10_y25.yap" SimListenPort="9510" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_411.xml b/share/regions/config_411.xml
new file mode 100644
index 0000000..aa6144d
--- /dev/null
+++ b/share/regions/config_411.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf19b" SimName="411" SimLocationX="1027" SimLocationY="1012" Datastore="store_411_x11_y25.yap" SimListenPort="9511" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_412.xml b/share/regions/config_412.xml
new file mode 100644
index 0000000..9645235
--- /dev/null
+++ b/share/regions/config_412.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf19c" SimName="412" SimLocationX="1028" SimLocationY="1012" Datastore="store_412_x12_y25.yap" SimListenPort="9512" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_413.xml b/share/regions/config_413.xml
new file mode 100644
index 0000000..1ae01f8
--- /dev/null
+++ b/share/regions/config_413.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf19d" SimName="413" SimLocationX="1029" SimLocationY="1012" Datastore="store_413_x13_y25.yap" SimListenPort="9513" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_414.xml b/share/regions/config_414.xml
new file mode 100644
index 0000000..9773a95
--- /dev/null
+++ b/share/regions/config_414.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf19e" SimName="414" SimLocationX="1030" SimLocationY="1012" Datastore="store_414_x14_y25.yap" SimListenPort="9514" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_415.xml b/share/regions/config_415.xml
new file mode 100644
index 0000000..7b43426
--- /dev/null
+++ b/share/regions/config_415.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf19f" SimName="415" SimLocationX="1031" SimLocationY="1012" Datastore="store_415_x15_y25.yap" SimListenPort="9515" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_416.xml b/share/regions/config_416.xml
new file mode 100644
index 0000000..a35c477
--- /dev/null
+++ b/share/regions/config_416.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a0" SimName="416" SimLocationX="1000" SimLocationY="1013" Datastore="store_416_x00_y26.yap" SimListenPort="9516" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_417.xml b/share/regions/config_417.xml
new file mode 100644
index 0000000..58001d1
--- /dev/null
+++ b/share/regions/config_417.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a1" SimName="417" SimLocationX="1001" SimLocationY="1013" Datastore="store_417_x01_y26.yap" SimListenPort="9517" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_418.xml b/share/regions/config_418.xml
new file mode 100644
index 0000000..3c525a1
--- /dev/null
+++ b/share/regions/config_418.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a2" SimName="418" SimLocationX="1002" SimLocationY="1013" Datastore="store_418_x02_y26.yap" SimListenPort="9518" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_419.xml b/share/regions/config_419.xml
new file mode 100644
index 0000000..9663580
--- /dev/null
+++ b/share/regions/config_419.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a3" SimName="419" SimLocationX="1003" SimLocationY="1013" Datastore="store_419_x03_y26.yap" SimListenPort="9519" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_42.xml b/share/regions/config_42.xml
new file mode 100644
index 0000000..edc7db7
--- /dev/null
+++ b/share/regions/config_42.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf02a" SimName="42" SimLocationX="1010" SimLocationY="1001" Datastore="store_42_x10_y02.yap" SimListenPort="9142" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_420.xml b/share/regions/config_420.xml
new file mode 100644
index 0000000..3df78a7
--- /dev/null
+++ b/share/regions/config_420.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a4" SimName="420" SimLocationX="1004" SimLocationY="1013" Datastore="store_420_x04_y26.yap" SimListenPort="9520" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_421.xml b/share/regions/config_421.xml
new file mode 100644
index 0000000..aed95bc
--- /dev/null
+++ b/share/regions/config_421.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a5" SimName="421" SimLocationX="1005" SimLocationY="1013" Datastore="store_421_x05_y26.yap" SimListenPort="9521" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_422.xml b/share/regions/config_422.xml
new file mode 100644
index 0000000..703c004
--- /dev/null
+++ b/share/regions/config_422.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a6" SimName="422" SimLocationX="1006" SimLocationY="1013" Datastore="store_422_x06_y26.yap" SimListenPort="9522" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_423.xml b/share/regions/config_423.xml
new file mode 100644
index 0000000..eca9a6f
--- /dev/null
+++ b/share/regions/config_423.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a7" SimName="423" SimLocationX="1007" SimLocationY="1013" Datastore="store_423_x07_y26.yap" SimListenPort="9523" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_424.xml b/share/regions/config_424.xml
new file mode 100644
index 0000000..91c68dc
--- /dev/null
+++ b/share/regions/config_424.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a8" SimName="424" SimLocationX="1008" SimLocationY="1013" Datastore="store_424_x08_y26.yap" SimListenPort="9524" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_425.xml b/share/regions/config_425.xml
new file mode 100644
index 0000000..92111f1
--- /dev/null
+++ b/share/regions/config_425.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1a9" SimName="425" SimLocationX="1009" SimLocationY="1013" Datastore="store_425_x09_y26.yap" SimListenPort="9525" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_426.xml b/share/regions/config_426.xml
new file mode 100644
index 0000000..9295577
--- /dev/null
+++ b/share/regions/config_426.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1aa" SimName="426" SimLocationX="1010" SimLocationY="1013" Datastore="store_426_x10_y26.yap" SimListenPort="9526" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_427.xml b/share/regions/config_427.xml
new file mode 100644
index 0000000..f54d20c
--- /dev/null
+++ b/share/regions/config_427.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ab" SimName="427" SimLocationX="1011" SimLocationY="1013" Datastore="store_427_x11_y26.yap" SimListenPort="9527" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_428.xml b/share/regions/config_428.xml
new file mode 100644
index 0000000..b4b407a
--- /dev/null
+++ b/share/regions/config_428.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ac" SimName="428" SimLocationX="1012" SimLocationY="1013" Datastore="store_428_x12_y26.yap" SimListenPort="9528" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_429.xml b/share/regions/config_429.xml
new file mode 100644
index 0000000..3389b8c
--- /dev/null
+++ b/share/regions/config_429.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ad" SimName="429" SimLocationX="1013" SimLocationY="1013" Datastore="store_429_x13_y26.yap" SimListenPort="9529" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_43.xml b/share/regions/config_43.xml
new file mode 100644
index 0000000..3841629
--- /dev/null
+++ b/share/regions/config_43.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf02b" SimName="43" SimLocationX="1011" SimLocationY="1001" Datastore="store_43_x11_y02.yap" SimListenPort="9143" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_430.xml b/share/regions/config_430.xml
new file mode 100644
index 0000000..1123c41
--- /dev/null
+++ b/share/regions/config_430.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ae" SimName="430" SimLocationX="1014" SimLocationY="1013" Datastore="store_430_x14_y26.yap" SimListenPort="9530" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_431.xml b/share/regions/config_431.xml
new file mode 100644
index 0000000..3c225d2
--- /dev/null
+++ b/share/regions/config_431.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1af" SimName="431" SimLocationX="1015" SimLocationY="1013" Datastore="store_431_x15_y26.yap" SimListenPort="9531" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_432.xml b/share/regions/config_432.xml
new file mode 100644
index 0000000..67579d3
--- /dev/null
+++ b/share/regions/config_432.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b0" SimName="432" SimLocationX="1016" SimLocationY="1013" Datastore="store_432_x00_y27.yap" SimListenPort="9532" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_433.xml b/share/regions/config_433.xml
new file mode 100644
index 0000000..6086a53
--- /dev/null
+++ b/share/regions/config_433.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b1" SimName="433" SimLocationX="1017" SimLocationY="1013" Datastore="store_433_x01_y27.yap" SimListenPort="9533" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_434.xml b/share/regions/config_434.xml
new file mode 100644
index 0000000..a634da2
--- /dev/null
+++ b/share/regions/config_434.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b2" SimName="434" SimLocationX="1018" SimLocationY="1013" Datastore="store_434_x02_y27.yap" SimListenPort="9534" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_435.xml b/share/regions/config_435.xml
new file mode 100644
index 0000000..06dcd5b
--- /dev/null
+++ b/share/regions/config_435.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b3" SimName="435" SimLocationX="1019" SimLocationY="1013" Datastore="store_435_x03_y27.yap" SimListenPort="9535" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_436.xml b/share/regions/config_436.xml
new file mode 100644
index 0000000..70c64a6
--- /dev/null
+++ b/share/regions/config_436.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b4" SimName="436" SimLocationX="1020" SimLocationY="1013" Datastore="store_436_x04_y27.yap" SimListenPort="9536" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_437.xml b/share/regions/config_437.xml
new file mode 100644
index 0000000..aaa105e
--- /dev/null
+++ b/share/regions/config_437.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b5" SimName="437" SimLocationX="1021" SimLocationY="1013" Datastore="store_437_x05_y27.yap" SimListenPort="9537" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_438.xml b/share/regions/config_438.xml
new file mode 100644
index 0000000..3f7b991
--- /dev/null
+++ b/share/regions/config_438.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b6" SimName="438" SimLocationX="1022" SimLocationY="1013" Datastore="store_438_x06_y27.yap" SimListenPort="9538" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_439.xml b/share/regions/config_439.xml
new file mode 100644
index 0000000..6ff6c99
--- /dev/null
+++ b/share/regions/config_439.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b7" SimName="439" SimLocationX="1023" SimLocationY="1013" Datastore="store_439_x07_y27.yap" SimListenPort="9539" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_44.xml b/share/regions/config_44.xml
new file mode 100644
index 0000000..00a639c
--- /dev/null
+++ b/share/regions/config_44.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf02c" SimName="44" SimLocationX="1012" SimLocationY="1001" Datastore="store_44_x12_y02.yap" SimListenPort="9144" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_440.xml b/share/regions/config_440.xml
new file mode 100644
index 0000000..2514f27
--- /dev/null
+++ b/share/regions/config_440.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b8" SimName="440" SimLocationX="1024" SimLocationY="1013" Datastore="store_440_x08_y27.yap" SimListenPort="9540" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_441.xml b/share/regions/config_441.xml
new file mode 100644
index 0000000..6c69568
--- /dev/null
+++ b/share/regions/config_441.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1b9" SimName="441" SimLocationX="1025" SimLocationY="1013" Datastore="store_441_x09_y27.yap" SimListenPort="9541" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_442.xml b/share/regions/config_442.xml
new file mode 100644
index 0000000..3b39f84
--- /dev/null
+++ b/share/regions/config_442.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ba" SimName="442" SimLocationX="1026" SimLocationY="1013" Datastore="store_442_x10_y27.yap" SimListenPort="9542" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_443.xml b/share/regions/config_443.xml
new file mode 100644
index 0000000..f86fcca
--- /dev/null
+++ b/share/regions/config_443.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1bb" SimName="443" SimLocationX="1027" SimLocationY="1013" Datastore="store_443_x11_y27.yap" SimListenPort="9543" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_444.xml b/share/regions/config_444.xml
new file mode 100644
index 0000000..0b2cecc
--- /dev/null
+++ b/share/regions/config_444.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1bc" SimName="444" SimLocationX="1028" SimLocationY="1013" Datastore="store_444_x12_y27.yap" SimListenPort="9544" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_445.xml b/share/regions/config_445.xml
new file mode 100644
index 0000000..cda5bf8
--- /dev/null
+++ b/share/regions/config_445.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1bd" SimName="445" SimLocationX="1029" SimLocationY="1013" Datastore="store_445_x13_y27.yap" SimListenPort="9545" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_446.xml b/share/regions/config_446.xml
new file mode 100644
index 0000000..d2daec5
--- /dev/null
+++ b/share/regions/config_446.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1be" SimName="446" SimLocationX="1030" SimLocationY="1013" Datastore="store_446_x14_y27.yap" SimListenPort="9546" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_447.xml b/share/regions/config_447.xml
new file mode 100644
index 0000000..c39cd11
--- /dev/null
+++ b/share/regions/config_447.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1bf" SimName="447" SimLocationX="1031" SimLocationY="1013" Datastore="store_447_x15_y27.yap" SimListenPort="9547" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_448.xml b/share/regions/config_448.xml
new file mode 100644
index 0000000..391cf51
--- /dev/null
+++ b/share/regions/config_448.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c0" SimName="448" SimLocationX="1000" SimLocationY="1014" Datastore="store_448_x00_y28.yap" SimListenPort="9548" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_449.xml b/share/regions/config_449.xml
new file mode 100644
index 0000000..fa67578
--- /dev/null
+++ b/share/regions/config_449.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c1" SimName="449" SimLocationX="1001" SimLocationY="1014" Datastore="store_449_x01_y28.yap" SimListenPort="9549" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_45.xml b/share/regions/config_45.xml
new file mode 100644
index 0000000..247bcd7
--- /dev/null
+++ b/share/regions/config_45.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf02d" SimName="45" SimLocationX="1013" SimLocationY="1001" Datastore="store_45_x13_y02.yap" SimListenPort="9145" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_450.xml b/share/regions/config_450.xml
new file mode 100644
index 0000000..54404a1
--- /dev/null
+++ b/share/regions/config_450.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c2" SimName="450" SimLocationX="1002" SimLocationY="1014" Datastore="store_450_x02_y28.yap" SimListenPort="9550" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_451.xml b/share/regions/config_451.xml
new file mode 100644
index 0000000..4c21c75
--- /dev/null
+++ b/share/regions/config_451.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c3" SimName="451" SimLocationX="1003" SimLocationY="1014" Datastore="store_451_x03_y28.yap" SimListenPort="9551" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_452.xml b/share/regions/config_452.xml
new file mode 100644
index 0000000..e2d8006
--- /dev/null
+++ b/share/regions/config_452.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c4" SimName="452" SimLocationX="1004" SimLocationY="1014" Datastore="store_452_x04_y28.yap" SimListenPort="9552" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_453.xml b/share/regions/config_453.xml
new file mode 100644
index 0000000..207829e
--- /dev/null
+++ b/share/regions/config_453.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c5" SimName="453" SimLocationX="1005" SimLocationY="1014" Datastore="store_453_x05_y28.yap" SimListenPort="9553" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_454.xml b/share/regions/config_454.xml
new file mode 100644
index 0000000..d216735
--- /dev/null
+++ b/share/regions/config_454.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c6" SimName="454" SimLocationX="1006" SimLocationY="1014" Datastore="store_454_x06_y28.yap" SimListenPort="9554" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_455.xml b/share/regions/config_455.xml
new file mode 100644
index 0000000..82fae24
--- /dev/null
+++ b/share/regions/config_455.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c7" SimName="455" SimLocationX="1007" SimLocationY="1014" Datastore="store_455_x07_y28.yap" SimListenPort="9555" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_456.xml b/share/regions/config_456.xml
new file mode 100644
index 0000000..0487f14
--- /dev/null
+++ b/share/regions/config_456.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c8" SimName="456" SimLocationX="1008" SimLocationY="1014" Datastore="store_456_x08_y28.yap" SimListenPort="9556" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_457.xml b/share/regions/config_457.xml
new file mode 100644
index 0000000..858c3e0
--- /dev/null
+++ b/share/regions/config_457.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1c9" SimName="457" SimLocationX="1009" SimLocationY="1014" Datastore="store_457_x09_y28.yap" SimListenPort="9557" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_458.xml b/share/regions/config_458.xml
new file mode 100644
index 0000000..09e4a6c
--- /dev/null
+++ b/share/regions/config_458.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ca" SimName="458" SimLocationX="1010" SimLocationY="1014" Datastore="store_458_x10_y28.yap" SimListenPort="9558" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_459.xml b/share/regions/config_459.xml
new file mode 100644
index 0000000..f0f069c
--- /dev/null
+++ b/share/regions/config_459.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1cb" SimName="459" SimLocationX="1011" SimLocationY="1014" Datastore="store_459_x11_y28.yap" SimListenPort="9559" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_46.xml b/share/regions/config_46.xml
new file mode 100644
index 0000000..e2b865c
--- /dev/null
+++ b/share/regions/config_46.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf02e" SimName="46" SimLocationX="1014" SimLocationY="1001" Datastore="store_46_x14_y02.yap" SimListenPort="9146" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_460.xml b/share/regions/config_460.xml
new file mode 100644
index 0000000..d90b4d2
--- /dev/null
+++ b/share/regions/config_460.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1cc" SimName="460" SimLocationX="1012" SimLocationY="1014" Datastore="store_460_x12_y28.yap" SimListenPort="9560" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_461.xml b/share/regions/config_461.xml
new file mode 100644
index 0000000..18bc3d7
--- /dev/null
+++ b/share/regions/config_461.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1cd" SimName="461" SimLocationX="1013" SimLocationY="1014" Datastore="store_461_x13_y28.yap" SimListenPort="9561" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_462.xml b/share/regions/config_462.xml
new file mode 100644
index 0000000..1d89c58
--- /dev/null
+++ b/share/regions/config_462.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ce" SimName="462" SimLocationX="1014" SimLocationY="1014" Datastore="store_462_x14_y28.yap" SimListenPort="9562" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_463.xml b/share/regions/config_463.xml
new file mode 100644
index 0000000..55c5dfd
--- /dev/null
+++ b/share/regions/config_463.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1cf" SimName="463" SimLocationX="1015" SimLocationY="1014" Datastore="store_463_x15_y28.yap" SimListenPort="9563" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_464.xml b/share/regions/config_464.xml
new file mode 100644
index 0000000..0831e89
--- /dev/null
+++ b/share/regions/config_464.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d0" SimName="464" SimLocationX="1016" SimLocationY="1014" Datastore="store_464_x00_y29.yap" SimListenPort="9564" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_465.xml b/share/regions/config_465.xml
new file mode 100644
index 0000000..0f5c04b
--- /dev/null
+++ b/share/regions/config_465.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d1" SimName="465" SimLocationX="1017" SimLocationY="1014" Datastore="store_465_x01_y29.yap" SimListenPort="9565" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_466.xml b/share/regions/config_466.xml
new file mode 100644
index 0000000..6ae69b0
--- /dev/null
+++ b/share/regions/config_466.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d2" SimName="466" SimLocationX="1018" SimLocationY="1014" Datastore="store_466_x02_y29.yap" SimListenPort="9566" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_467.xml b/share/regions/config_467.xml
new file mode 100644
index 0000000..b9904a3
--- /dev/null
+++ b/share/regions/config_467.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d3" SimName="467" SimLocationX="1019" SimLocationY="1014" Datastore="store_467_x03_y29.yap" SimListenPort="9567" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_468.xml b/share/regions/config_468.xml
new file mode 100644
index 0000000..94ed66a
--- /dev/null
+++ b/share/regions/config_468.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d4" SimName="468" SimLocationX="1020" SimLocationY="1014" Datastore="store_468_x04_y29.yap" SimListenPort="9568" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_469.xml b/share/regions/config_469.xml
new file mode 100644
index 0000000..5ac092e
--- /dev/null
+++ b/share/regions/config_469.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d5" SimName="469" SimLocationX="1021" SimLocationY="1014" Datastore="store_469_x05_y29.yap" SimListenPort="9569" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_47.xml b/share/regions/config_47.xml
new file mode 100644
index 0000000..b0efa2b
--- /dev/null
+++ b/share/regions/config_47.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf02f" SimName="47" SimLocationX="1015" SimLocationY="1001" Datastore="store_47_x15_y02.yap" SimListenPort="9147" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y13.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_470.xml b/share/regions/config_470.xml
new file mode 100644
index 0000000..c1d592a
--- /dev/null
+++ b/share/regions/config_470.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d6" SimName="470" SimLocationX="1022" SimLocationY="1014" Datastore="store_470_x06_y29.yap" SimListenPort="9570" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_471.xml b/share/regions/config_471.xml
new file mode 100644
index 0000000..4a53f11
--- /dev/null
+++ b/share/regions/config_471.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d7" SimName="471" SimLocationX="1023" SimLocationY="1014" Datastore="store_471_x07_y29.yap" SimListenPort="9571" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_472.xml b/share/regions/config_472.xml
new file mode 100644
index 0000000..e5e387c
--- /dev/null
+++ b/share/regions/config_472.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d8" SimName="472" SimLocationX="1024" SimLocationY="1014" Datastore="store_472_x08_y29.yap" SimListenPort="9572" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_473.xml b/share/regions/config_473.xml
new file mode 100644
index 0000000..4303c15
--- /dev/null
+++ b/share/regions/config_473.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1d9" SimName="473" SimLocationX="1025" SimLocationY="1014" Datastore="store_473_x09_y29.yap" SimListenPort="9573" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_474.xml b/share/regions/config_474.xml
new file mode 100644
index 0000000..77c264f
--- /dev/null
+++ b/share/regions/config_474.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1da" SimName="474" SimLocationX="1026" SimLocationY="1014" Datastore="store_474_x10_y29.yap" SimListenPort="9574" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_475.xml b/share/regions/config_475.xml
new file mode 100644
index 0000000..d1d660f
--- /dev/null
+++ b/share/regions/config_475.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1db" SimName="475" SimLocationX="1027" SimLocationY="1014" Datastore="store_475_x11_y29.yap" SimListenPort="9575" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_476.xml b/share/regions/config_476.xml
new file mode 100644
index 0000000..7daed61
--- /dev/null
+++ b/share/regions/config_476.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1dc" SimName="476" SimLocationX="1028" SimLocationY="1014" Datastore="store_476_x12_y29.yap" SimListenPort="9576" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_477.xml b/share/regions/config_477.xml
new file mode 100644
index 0000000..d146e10
--- /dev/null
+++ b/share/regions/config_477.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1dd" SimName="477" SimLocationX="1029" SimLocationY="1014" Datastore="store_477_x13_y29.yap" SimListenPort="9577" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_478.xml b/share/regions/config_478.xml
new file mode 100644
index 0000000..e1d4b30
--- /dev/null
+++ b/share/regions/config_478.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1de" SimName="478" SimLocationX="1030" SimLocationY="1014" Datastore="store_478_x14_y29.yap" SimListenPort="9578" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_479.xml b/share/regions/config_479.xml
new file mode 100644
index 0000000..8b8d0a8
--- /dev/null
+++ b/share/regions/config_479.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1df" SimName="479" SimLocationX="1031" SimLocationY="1014" Datastore="store_479_x15_y29.yap" SimListenPort="9579" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-14.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_48.xml b/share/regions/config_48.xml
new file mode 100644
index 0000000..ce31b09
--- /dev/null
+++ b/share/regions/config_48.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf030" SimName="48" SimLocationX="1016" SimLocationY="1001" Datastore="store_48_x00_y03.yap" SimListenPort="9148" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_480.xml b/share/regions/config_480.xml
new file mode 100644
index 0000000..b6fecdc
--- /dev/null
+++ b/share/regions/config_480.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e0" SimName="480" SimLocationX="1000" SimLocationY="1015" Datastore="store_480_x00_y30.yap" SimListenPort="9580" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_481.xml b/share/regions/config_481.xml
new file mode 100644
index 0000000..ec438e5
--- /dev/null
+++ b/share/regions/config_481.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e1" SimName="481" SimLocationX="1001" SimLocationY="1015" Datastore="store_481_x01_y30.yap" SimListenPort="9581" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_482.xml b/share/regions/config_482.xml
new file mode 100644
index 0000000..c684968
--- /dev/null
+++ b/share/regions/config_482.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e2" SimName="482" SimLocationX="1002" SimLocationY="1015" Datastore="store_482_x02_y30.yap" SimListenPort="9582" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_483.xml b/share/regions/config_483.xml
new file mode 100644
index 0000000..a22c870
--- /dev/null
+++ b/share/regions/config_483.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e3" SimName="483" SimLocationX="1003" SimLocationY="1015" Datastore="store_483_x03_y30.yap" SimListenPort="9583" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_484.xml b/share/regions/config_484.xml
new file mode 100644
index 0000000..27d3e36
--- /dev/null
+++ b/share/regions/config_484.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e4" SimName="484" SimLocationX="1004" SimLocationY="1015" Datastore="store_484_x04_y30.yap" SimListenPort="9584" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_485.xml b/share/regions/config_485.xml
new file mode 100644
index 0000000..cd85329
--- /dev/null
+++ b/share/regions/config_485.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e5" SimName="485" SimLocationX="1005" SimLocationY="1015" Datastore="store_485_x05_y30.yap" SimListenPort="9585" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_486.xml b/share/regions/config_486.xml
new file mode 100644
index 0000000..4c6667a
--- /dev/null
+++ b/share/regions/config_486.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e6" SimName="486" SimLocationX="1006" SimLocationY="1015" Datastore="store_486_x06_y30.yap" SimListenPort="9586" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_487.xml b/share/regions/config_487.xml
new file mode 100644
index 0000000..96a2da7
--- /dev/null
+++ b/share/regions/config_487.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e7" SimName="487" SimLocationX="1007" SimLocationY="1015" Datastore="store_487_x07_y30.yap" SimListenPort="9587" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_488.xml b/share/regions/config_488.xml
new file mode 100644
index 0000000..f8e7e04
--- /dev/null
+++ b/share/regions/config_488.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e8" SimName="488" SimLocationX="1008" SimLocationY="1015" Datastore="store_488_x08_y30.yap" SimListenPort="9588" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_489.xml b/share/regions/config_489.xml
new file mode 100644
index 0000000..1209ee0
--- /dev/null
+++ b/share/regions/config_489.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1e9" SimName="489" SimLocationX="1009" SimLocationY="1015" Datastore="store_489_x09_y30.yap" SimListenPort="9589" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_49.xml b/share/regions/config_49.xml
new file mode 100644
index 0000000..4c775f0
--- /dev/null
+++ b/share/regions/config_49.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf031" SimName="49" SimLocationX="1017" SimLocationY="1001" Datastore="store_49_x01_y03.yap" SimListenPort="9149" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_490.xml b/share/regions/config_490.xml
new file mode 100644
index 0000000..4f125ac
--- /dev/null
+++ b/share/regions/config_490.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ea" SimName="490" SimLocationX="1010" SimLocationY="1015" Datastore="store_490_x10_y30.yap" SimListenPort="9590" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_491.xml b/share/regions/config_491.xml
new file mode 100644
index 0000000..7ed67c4
--- /dev/null
+++ b/share/regions/config_491.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1eb" SimName="491" SimLocationX="1011" SimLocationY="1015" Datastore="store_491_x11_y30.yap" SimListenPort="9591" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_492.xml b/share/regions/config_492.xml
new file mode 100644
index 0000000..8a8bbaa
--- /dev/null
+++ b/share/regions/config_492.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ec" SimName="492" SimLocationX="1012" SimLocationY="1015" Datastore="store_492_x12_y30.yap" SimListenPort="9592" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_493.xml b/share/regions/config_493.xml
new file mode 100644
index 0000000..b6238a3
--- /dev/null
+++ b/share/regions/config_493.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ed" SimName="493" SimLocationX="1013" SimLocationY="1015" Datastore="store_493_x13_y30.yap" SimListenPort="9593" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_494.xml b/share/regions/config_494.xml
new file mode 100644
index 0000000..2c4e400
--- /dev/null
+++ b/share/regions/config_494.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ee" SimName="494" SimLocationX="1014" SimLocationY="1015" Datastore="store_494_x14_y30.yap" SimListenPort="9594" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_495.xml b/share/regions/config_495.xml
new file mode 100644
index 0000000..f249907
--- /dev/null
+++ b/share/regions/config_495.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ef" SimName="495" SimLocationX="1015" SimLocationY="1015" Datastore="store_495_x15_y30.yap" SimListenPort="9595" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_496.xml b/share/regions/config_496.xml
new file mode 100644
index 0000000..c5870f2
--- /dev/null
+++ b/share/regions/config_496.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f0" SimName="496" SimLocationX="1016" SimLocationY="1015" Datastore="store_496_x00_y31.yap" SimListenPort="9596" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_497.xml b/share/regions/config_497.xml
new file mode 100644
index 0000000..efeeda6
--- /dev/null
+++ b/share/regions/config_497.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f1" SimName="497" SimLocationX="1017" SimLocationY="1015" Datastore="store_497_x01_y31.yap" SimListenPort="9597" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_498.xml b/share/regions/config_498.xml
new file mode 100644
index 0000000..257e3a4
--- /dev/null
+++ b/share/regions/config_498.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f2" SimName="498" SimLocationX="1018" SimLocationY="1015" Datastore="store_498_x02_y31.yap" SimListenPort="9598" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_499.xml b/share/regions/config_499.xml
new file mode 100644
index 0000000..b42f29b
--- /dev/null
+++ b/share/regions/config_499.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f3" SimName="499" SimLocationX="1019" SimLocationY="1015" Datastore="store_499_x03_y31.yap" SimListenPort="9599" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_5.xml b/share/regions/config_5.xml
new file mode 100644
index 0000000..b32cb4b
--- /dev/null
+++ b/share/regions/config_5.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf005" SimName="5" SimLocationX="1005" SimLocationY="1000" Datastore="store_5_x05_y00.yap" SimListenPort="9105" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_50.xml b/share/regions/config_50.xml
new file mode 100644
index 0000000..bd3138f
--- /dev/null
+++ b/share/regions/config_50.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf032" SimName="50" SimLocationX="1018" SimLocationY="1001" Datastore="store_50_x02_y03.yap" SimListenPort="9150" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_500.xml b/share/regions/config_500.xml
new file mode 100644
index 0000000..d272b8f
--- /dev/null
+++ b/share/regions/config_500.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f4" SimName="500" SimLocationX="1020" SimLocationY="1015" Datastore="store_500_x04_y31.yap" SimListenPort="9600" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_501.xml b/share/regions/config_501.xml
new file mode 100644
index 0000000..70701c3
--- /dev/null
+++ b/share/regions/config_501.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f5" SimName="501" SimLocationX="1021" SimLocationY="1015" Datastore="store_501_x05_y31.yap" SimListenPort="9601" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_502.xml b/share/regions/config_502.xml
new file mode 100644
index 0000000..f29d78f
--- /dev/null
+++ b/share/regions/config_502.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f6" SimName="502" SimLocationX="1022" SimLocationY="1015" Datastore="store_502_x06_y31.yap" SimListenPort="9602" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_503.xml b/share/regions/config_503.xml
new file mode 100644
index 0000000..fc27205
--- /dev/null
+++ b/share/regions/config_503.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f7" SimName="503" SimLocationX="1023" SimLocationY="1015" Datastore="store_503_x07_y31.yap" SimListenPort="9603" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_504.xml b/share/regions/config_504.xml
new file mode 100644
index 0000000..4324371
--- /dev/null
+++ b/share/regions/config_504.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f8" SimName="504" SimLocationX="1024" SimLocationY="1015" Datastore="store_504_x08_y31.yap" SimListenPort="9604" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_505.xml b/share/regions/config_505.xml
new file mode 100644
index 0000000..b5d7933
--- /dev/null
+++ b/share/regions/config_505.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1f9" SimName="505" SimLocationX="1025" SimLocationY="1015" Datastore="store_505_x09_y31.yap" SimListenPort="9605" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_506.xml b/share/regions/config_506.xml
new file mode 100644
index 0000000..9c34e60
--- /dev/null
+++ b/share/regions/config_506.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1fa" SimName="506" SimLocationX="1026" SimLocationY="1015" Datastore="store_506_x10_y31.yap" SimListenPort="9606" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_507.xml b/share/regions/config_507.xml
new file mode 100644
index 0000000..8cf3e32
--- /dev/null
+++ b/share/regions/config_507.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1fb" SimName="507" SimLocationX="1027" SimLocationY="1015" Datastore="store_507_x11_y31.yap" SimListenPort="9607" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_508.xml b/share/regions/config_508.xml
new file mode 100644
index 0000000..629dc2f
--- /dev/null
+++ b/share/regions/config_508.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1fc" SimName="508" SimLocationX="1028" SimLocationY="1015" Datastore="store_508_x12_y31.yap" SimListenPort="9608" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_509.xml b/share/regions/config_509.xml
new file mode 100644
index 0000000..f850296
--- /dev/null
+++ b/share/regions/config_509.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1fd" SimName="509" SimLocationX="1029" SimLocationY="1015" Datastore="store_509_x13_y31.yap" SimListenPort="9609" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_51.xml b/share/regions/config_51.xml
new file mode 100644
index 0000000..f40bd4e
--- /dev/null
+++ b/share/regions/config_51.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf033" SimName="51" SimLocationX="1019" SimLocationY="1001" Datastore="store_51_x03_y03.yap" SimListenPort="9151" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_510.xml b/share/regions/config_510.xml
new file mode 100644
index 0000000..84c7aa3
--- /dev/null
+++ b/share/regions/config_510.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1fe" SimName="510" SimLocationX="1030" SimLocationY="1015" Datastore="store_510_x14_y31.yap" SimListenPort="9610" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_511.xml b/share/regions/config_511.xml
new file mode 100644
index 0000000..e802fe9
--- /dev/null
+++ b/share/regions/config_511.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf1ff" SimName="511" SimLocationX="1031" SimLocationY="1015" Datastore="store_511_x15_y31.yap" SimListenPort="9611" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-16.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_512.xml b/share/regions/config_512.xml
new file mode 100644
index 0000000..2c7f382
--- /dev/null
+++ b/share/regions/config_512.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf200" SimName="512" SimLocationX="1000" SimLocationY="1016" Datastore="store_512_x00_y32.yap" SimListenPort="9612" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_513.xml b/share/regions/config_513.xml
new file mode 100644
index 0000000..3f8b78e
--- /dev/null
+++ b/share/regions/config_513.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf201" SimName="513" SimLocationX="1001" SimLocationY="1016" Datastore="store_513_x01_y32.yap" SimListenPort="9613" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_514.xml b/share/regions/config_514.xml
new file mode 100644
index 0000000..ce0b6c3
--- /dev/null
+++ b/share/regions/config_514.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf202" SimName="514" SimLocationX="1002" SimLocationY="1016" Datastore="store_514_x02_y32.yap" SimListenPort="9614" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_515.xml b/share/regions/config_515.xml
new file mode 100644
index 0000000..bbea25c
--- /dev/null
+++ b/share/regions/config_515.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf203" SimName="515" SimLocationX="1003" SimLocationY="1016" Datastore="store_515_x03_y32.yap" SimListenPort="9615" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_516.xml b/share/regions/config_516.xml
new file mode 100644
index 0000000..b71f9c9
--- /dev/null
+++ b/share/regions/config_516.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf204" SimName="516" SimLocationX="1004" SimLocationY="1016" Datastore="store_516_x04_y32.yap" SimListenPort="9616" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_517.xml b/share/regions/config_517.xml
new file mode 100644
index 0000000..6c113bd
--- /dev/null
+++ b/share/regions/config_517.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf205" SimName="517" SimLocationX="1005" SimLocationY="1016" Datastore="store_517_x05_y32.yap" SimListenPort="9617" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_518.xml b/share/regions/config_518.xml
new file mode 100644
index 0000000..0091020
--- /dev/null
+++ b/share/regions/config_518.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf206" SimName="518" SimLocationX="1006" SimLocationY="1016" Datastore="store_518_x06_y32.yap" SimListenPort="9618" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_519.xml b/share/regions/config_519.xml
new file mode 100644
index 0000000..deb4357
--- /dev/null
+++ b/share/regions/config_519.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf207" SimName="519" SimLocationX="1007" SimLocationY="1016" Datastore="store_519_x07_y32.yap" SimListenPort="9619" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_52.xml b/share/regions/config_52.xml
new file mode 100644
index 0000000..32b8f45
--- /dev/null
+++ b/share/regions/config_52.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf034" SimName="52" SimLocationX="1020" SimLocationY="1001" Datastore="store_52_x04_y03.yap" SimListenPort="9152" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_520.xml b/share/regions/config_520.xml
new file mode 100644
index 0000000..a6bbdfc
--- /dev/null
+++ b/share/regions/config_520.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf208" SimName="520" SimLocationX="1008" SimLocationY="1016" Datastore="store_520_x08_y32.yap" SimListenPort="9620" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_521.xml b/share/regions/config_521.xml
new file mode 100644
index 0000000..11bb267
--- /dev/null
+++ b/share/regions/config_521.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf209" SimName="521" SimLocationX="1009" SimLocationY="1016" Datastore="store_521_x09_y32.yap" SimListenPort="9621" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_522.xml b/share/regions/config_522.xml
new file mode 100644
index 0000000..4bd3d4c
--- /dev/null
+++ b/share/regions/config_522.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf20a" SimName="522" SimLocationX="1010" SimLocationY="1016" Datastore="store_522_x10_y32.yap" SimListenPort="9622" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_523.xml b/share/regions/config_523.xml
new file mode 100644
index 0000000..9b71352
--- /dev/null
+++ b/share/regions/config_523.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf20b" SimName="523" SimLocationX="1011" SimLocationY="1016" Datastore="store_523_x11_y32.yap" SimListenPort="9623" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_524.xml b/share/regions/config_524.xml
new file mode 100644
index 0000000..bdac61a
--- /dev/null
+++ b/share/regions/config_524.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf20c" SimName="524" SimLocationX="1012" SimLocationY="1016" Datastore="store_524_x12_y32.yap" SimListenPort="9624" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_525.xml b/share/regions/config_525.xml
new file mode 100644
index 0000000..4bffa37
--- /dev/null
+++ b/share/regions/config_525.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf20d" SimName="525" SimLocationX="1013" SimLocationY="1016" Datastore="store_525_x13_y32.yap" SimListenPort="9625" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_526.xml b/share/regions/config_526.xml
new file mode 100644
index 0000000..a85625e
--- /dev/null
+++ b/share/regions/config_526.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf20e" SimName="526" SimLocationX="1014" SimLocationY="1016" Datastore="store_526_x14_y32.yap" SimListenPort="9626" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_527.xml b/share/regions/config_527.xml
new file mode 100644
index 0000000..0ca64ea
--- /dev/null
+++ b/share/regions/config_527.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf20f" SimName="527" SimLocationX="1015" SimLocationY="1016" Datastore="store_527_x15_y32.yap" SimListenPort="9627" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-17.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_528.xml b/share/regions/config_528.xml
new file mode 100644
index 0000000..8bf8a53
--- /dev/null
+++ b/share/regions/config_528.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf210" SimName="528" SimLocationX="1016" SimLocationY="1016" Datastore="store_528_x00_y33.yap" SimListenPort="9628" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_529.xml b/share/regions/config_529.xml
new file mode 100644
index 0000000..d09b185
--- /dev/null
+++ b/share/regions/config_529.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf211" SimName="529" SimLocationX="1017" SimLocationY="1016" Datastore="store_529_x01_y33.yap" SimListenPort="9629" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_53.xml b/share/regions/config_53.xml
new file mode 100644
index 0000000..8ae55e1
--- /dev/null
+++ b/share/regions/config_53.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf035" SimName="53" SimLocationX="1021" SimLocationY="1001" Datastore="store_53_x05_y03.yap" SimListenPort="9153" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_530.xml b/share/regions/config_530.xml
new file mode 100644
index 0000000..aed5fbc
--- /dev/null
+++ b/share/regions/config_530.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf212" SimName="530" SimLocationX="1018" SimLocationY="1016" Datastore="store_530_x02_y33.yap" SimListenPort="9630" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_531.xml b/share/regions/config_531.xml
new file mode 100644
index 0000000..2ad352f
--- /dev/null
+++ b/share/regions/config_531.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf213" SimName="531" SimLocationX="1019" SimLocationY="1016" Datastore="store_531_x03_y33.yap" SimListenPort="9631" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_532.xml b/share/regions/config_532.xml
new file mode 100644
index 0000000..7650354
--- /dev/null
+++ b/share/regions/config_532.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf214" SimName="532" SimLocationX="1020" SimLocationY="1016" Datastore="store_532_x04_y33.yap" SimListenPort="9632" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_533.xml b/share/regions/config_533.xml
new file mode 100644
index 0000000..2bcfe71
--- /dev/null
+++ b/share/regions/config_533.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf215" SimName="533" SimLocationX="1021" SimLocationY="1016" Datastore="store_533_x05_y33.yap" SimListenPort="9633" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_534.xml b/share/regions/config_534.xml
new file mode 100644
index 0000000..2484ebc
--- /dev/null
+++ b/share/regions/config_534.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf216" SimName="534" SimLocationX="1022" SimLocationY="1016" Datastore="store_534_x06_y33.yap" SimListenPort="9634" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_535.xml b/share/regions/config_535.xml
new file mode 100644
index 0000000..c3310dd
--- /dev/null
+++ b/share/regions/config_535.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf217" SimName="535" SimLocationX="1023" SimLocationY="1016" Datastore="store_535_x07_y33.yap" SimListenPort="9635" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_536.xml b/share/regions/config_536.xml
new file mode 100644
index 0000000..a2733cf
--- /dev/null
+++ b/share/regions/config_536.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf218" SimName="536" SimLocationX="1024" SimLocationY="1016" Datastore="store_536_x08_y33.yap" SimListenPort="9636" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_537.xml b/share/regions/config_537.xml
new file mode 100644
index 0000000..fb04dc7
--- /dev/null
+++ b/share/regions/config_537.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf219" SimName="537" SimLocationX="1025" SimLocationY="1016" Datastore="store_537_x09_y33.yap" SimListenPort="9637" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_538.xml b/share/regions/config_538.xml
new file mode 100644
index 0000000..5c027f5
--- /dev/null
+++ b/share/regions/config_538.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf21a" SimName="538" SimLocationX="1026" SimLocationY="1016" Datastore="store_538_x10_y33.yap" SimListenPort="9638" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_539.xml b/share/regions/config_539.xml
new file mode 100644
index 0000000..6f892e1
--- /dev/null
+++ b/share/regions/config_539.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf21b" SimName="539" SimLocationX="1027" SimLocationY="1016" Datastore="store_539_x11_y33.yap" SimListenPort="9639" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_54.xml b/share/regions/config_54.xml
new file mode 100644
index 0000000..79e56bf
--- /dev/null
+++ b/share/regions/config_54.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf036" SimName="54" SimLocationX="1022" SimLocationY="1001" Datastore="store_54_x06_y03.yap" SimListenPort="9154" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_540.xml b/share/regions/config_540.xml
new file mode 100644
index 0000000..f9a02ba
--- /dev/null
+++ b/share/regions/config_540.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf21c" SimName="540" SimLocationX="1028" SimLocationY="1016" Datastore="store_540_x12_y33.yap" SimListenPort="9640" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_541.xml b/share/regions/config_541.xml
new file mode 100644
index 0000000..0f16ce2
--- /dev/null
+++ b/share/regions/config_541.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf21d" SimName="541" SimLocationX="1029" SimLocationY="1016" Datastore="store_541_x13_y33.yap" SimListenPort="9641" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_542.xml b/share/regions/config_542.xml
new file mode 100644
index 0000000..0d2800b
--- /dev/null
+++ b/share/regions/config_542.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf21e" SimName="542" SimLocationX="1030" SimLocationY="1016" Datastore="store_542_x14_y33.yap" SimListenPort="9642" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_543.xml b/share/regions/config_543.xml
new file mode 100644
index 0000000..e523447
--- /dev/null
+++ b/share/regions/config_543.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf21f" SimName="543" SimLocationX="1031" SimLocationY="1016" Datastore="store_543_x15_y33.yap" SimListenPort="9643" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-18.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_544.xml b/share/regions/config_544.xml
new file mode 100644
index 0000000..e778d54
--- /dev/null
+++ b/share/regions/config_544.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf220" SimName="544" SimLocationX="1000" SimLocationY="1017" Datastore="store_544_x00_y34.yap" SimListenPort="9644" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_545.xml b/share/regions/config_545.xml
new file mode 100644
index 0000000..d3361b2
--- /dev/null
+++ b/share/regions/config_545.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf221" SimName="545" SimLocationX="1001" SimLocationY="1017" Datastore="store_545_x01_y34.yap" SimListenPort="9645" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_546.xml b/share/regions/config_546.xml
new file mode 100644
index 0000000..4421558
--- /dev/null
+++ b/share/regions/config_546.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf222" SimName="546" SimLocationX="1002" SimLocationY="1017" Datastore="store_546_x02_y34.yap" SimListenPort="9646" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_547.xml b/share/regions/config_547.xml
new file mode 100644
index 0000000..90ec378
--- /dev/null
+++ b/share/regions/config_547.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf223" SimName="547" SimLocationX="1003" SimLocationY="1017" Datastore="store_547_x03_y34.yap" SimListenPort="9647" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_548.xml b/share/regions/config_548.xml
new file mode 100644
index 0000000..c7c5ab9
--- /dev/null
+++ b/share/regions/config_548.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf224" SimName="548" SimLocationX="1004" SimLocationY="1017" Datastore="store_548_x04_y34.yap" SimListenPort="9648" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_549.xml b/share/regions/config_549.xml
new file mode 100644
index 0000000..23f426f
--- /dev/null
+++ b/share/regions/config_549.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf225" SimName="549" SimLocationX="1005" SimLocationY="1017" Datastore="store_549_x05_y34.yap" SimListenPort="9649" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_55.xml b/share/regions/config_55.xml
new file mode 100644
index 0000000..1c95a26
--- /dev/null
+++ b/share/regions/config_55.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf037" SimName="55" SimLocationX="1023" SimLocationY="1001" Datastore="store_55_x07_y03.yap" SimListenPort="9155" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_550.xml b/share/regions/config_550.xml
new file mode 100644
index 0000000..9200dde
--- /dev/null
+++ b/share/regions/config_550.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf226" SimName="550" SimLocationX="1006" SimLocationY="1017" Datastore="store_550_x06_y34.yap" SimListenPort="9650" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_551.xml b/share/regions/config_551.xml
new file mode 100644
index 0000000..b0afa2e
--- /dev/null
+++ b/share/regions/config_551.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf227" SimName="551" SimLocationX="1007" SimLocationY="1017" Datastore="store_551_x07_y34.yap" SimListenPort="9651" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_552.xml b/share/regions/config_552.xml
new file mode 100644
index 0000000..a2ff8ce
--- /dev/null
+++ b/share/regions/config_552.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf228" SimName="552" SimLocationX="1008" SimLocationY="1017" Datastore="store_552_x08_y34.yap" SimListenPort="9652" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_553.xml b/share/regions/config_553.xml
new file mode 100644
index 0000000..504c70b
--- /dev/null
+++ b/share/regions/config_553.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf229" SimName="553" SimLocationX="1009" SimLocationY="1017" Datastore="store_553_x09_y34.yap" SimListenPort="9653" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_554.xml b/share/regions/config_554.xml
new file mode 100644
index 0000000..0f07c23
--- /dev/null
+++ b/share/regions/config_554.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf22a" SimName="554" SimLocationX="1010" SimLocationY="1017" Datastore="store_554_x10_y34.yap" SimListenPort="9654" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_555.xml b/share/regions/config_555.xml
new file mode 100644
index 0000000..780a240
--- /dev/null
+++ b/share/regions/config_555.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf22b" SimName="555" SimLocationX="1011" SimLocationY="1017" Datastore="store_555_x11_y34.yap" SimListenPort="9655" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_556.xml b/share/regions/config_556.xml
new file mode 100644
index 0000000..cc01dff
--- /dev/null
+++ b/share/regions/config_556.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf22c" SimName="556" SimLocationX="1012" SimLocationY="1017" Datastore="store_556_x12_y34.yap" SimListenPort="9656" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_557.xml b/share/regions/config_557.xml
new file mode 100644
index 0000000..af57ec2
--- /dev/null
+++ b/share/regions/config_557.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf22d" SimName="557" SimLocationX="1013" SimLocationY="1017" Datastore="store_557_x13_y34.yap" SimListenPort="9657" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_558.xml b/share/regions/config_558.xml
new file mode 100644
index 0000000..f34c431
--- /dev/null
+++ b/share/regions/config_558.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf22e" SimName="558" SimLocationX="1014" SimLocationY="1017" Datastore="store_558_x14_y34.yap" SimListenPort="9658" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_559.xml b/share/regions/config_559.xml
new file mode 100644
index 0000000..11ba4a5
--- /dev/null
+++ b/share/regions/config_559.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf22f" SimName="559" SimLocationX="1015" SimLocationY="1017" Datastore="store_559_x15_y34.yap" SimListenPort="9659" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-19.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_56.xml b/share/regions/config_56.xml
new file mode 100644
index 0000000..22d3547
--- /dev/null
+++ b/share/regions/config_56.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf038" SimName="56" SimLocationX="1024" SimLocationY="1001" Datastore="store_56_x08_y03.yap" SimListenPort="9156" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_560.xml b/share/regions/config_560.xml
new file mode 100644
index 0000000..62d856b
--- /dev/null
+++ b/share/regions/config_560.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf230" SimName="560" SimLocationX="1016" SimLocationY="1017" Datastore="store_560_x00_y35.yap" SimListenPort="9660" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_561.xml b/share/regions/config_561.xml
new file mode 100644
index 0000000..823f3aa
--- /dev/null
+++ b/share/regions/config_561.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf231" SimName="561" SimLocationX="1017" SimLocationY="1017" Datastore="store_561_x01_y35.yap" SimListenPort="9661" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_562.xml b/share/regions/config_562.xml
new file mode 100644
index 0000000..c364231
--- /dev/null
+++ b/share/regions/config_562.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf232" SimName="562" SimLocationX="1018" SimLocationY="1017" Datastore="store_562_x02_y35.yap" SimListenPort="9662" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_563.xml b/share/regions/config_563.xml
new file mode 100644
index 0000000..26e60c7
--- /dev/null
+++ b/share/regions/config_563.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf233" SimName="563" SimLocationX="1019" SimLocationY="1017" Datastore="store_563_x03_y35.yap" SimListenPort="9663" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_564.xml b/share/regions/config_564.xml
new file mode 100644
index 0000000..98f671b
--- /dev/null
+++ b/share/regions/config_564.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf234" SimName="564" SimLocationX="1020" SimLocationY="1017" Datastore="store_564_x04_y35.yap" SimListenPort="9664" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_565.xml b/share/regions/config_565.xml
new file mode 100644
index 0000000..40877b1
--- /dev/null
+++ b/share/regions/config_565.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf235" SimName="565" SimLocationX="1021" SimLocationY="1017" Datastore="store_565_x05_y35.yap" SimListenPort="9665" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_566.xml b/share/regions/config_566.xml
new file mode 100644
index 0000000..efeaf26
--- /dev/null
+++ b/share/regions/config_566.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf236" SimName="566" SimLocationX="1022" SimLocationY="1017" Datastore="store_566_x06_y35.yap" SimListenPort="9666" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_567.xml b/share/regions/config_567.xml
new file mode 100644
index 0000000..5937c5f
--- /dev/null
+++ b/share/regions/config_567.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf237" SimName="567" SimLocationX="1023" SimLocationY="1017" Datastore="store_567_x07_y35.yap" SimListenPort="9667" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_568.xml b/share/regions/config_568.xml
new file mode 100644
index 0000000..62a019e
--- /dev/null
+++ b/share/regions/config_568.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf238" SimName="568" SimLocationX="1024" SimLocationY="1017" Datastore="store_568_x08_y35.yap" SimListenPort="9668" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_569.xml b/share/regions/config_569.xml
new file mode 100644
index 0000000..e8e2d4c
--- /dev/null
+++ b/share/regions/config_569.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf239" SimName="569" SimLocationX="1025" SimLocationY="1017" Datastore="store_569_x09_y35.yap" SimListenPort="9669" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_57.xml b/share/regions/config_57.xml
new file mode 100644
index 0000000..57366a8
--- /dev/null
+++ b/share/regions/config_57.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf039" SimName="57" SimLocationX="1025" SimLocationY="1001" Datastore="store_57_x09_y03.yap" SimListenPort="9157" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_570.xml b/share/regions/config_570.xml
new file mode 100644
index 0000000..4f71090
--- /dev/null
+++ b/share/regions/config_570.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf23a" SimName="570" SimLocationX="1026" SimLocationY="1017" Datastore="store_570_x10_y35.yap" SimListenPort="9670" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_571.xml b/share/regions/config_571.xml
new file mode 100644
index 0000000..4aee950
--- /dev/null
+++ b/share/regions/config_571.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf23b" SimName="571" SimLocationX="1027" SimLocationY="1017" Datastore="store_571_x11_y35.yap" SimListenPort="9671" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_572.xml b/share/regions/config_572.xml
new file mode 100644
index 0000000..fb784b8
--- /dev/null
+++ b/share/regions/config_572.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf23c" SimName="572" SimLocationX="1028" SimLocationY="1017" Datastore="store_572_x12_y35.yap" SimListenPort="9672" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_573.xml b/share/regions/config_573.xml
new file mode 100644
index 0000000..ecfdb93
--- /dev/null
+++ b/share/regions/config_573.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf23d" SimName="573" SimLocationX="1029" SimLocationY="1017" Datastore="store_573_x13_y35.yap" SimListenPort="9673" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_574.xml b/share/regions/config_574.xml
new file mode 100644
index 0000000..4ac455d
--- /dev/null
+++ b/share/regions/config_574.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf23e" SimName="574" SimLocationX="1030" SimLocationY="1017" Datastore="store_574_x14_y35.yap" SimListenPort="9674" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_575.xml b/share/regions/config_575.xml
new file mode 100644
index 0000000..2dce467
--- /dev/null
+++ b/share/regions/config_575.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf23f" SimName="575" SimLocationX="1031" SimLocationY="1017" Datastore="store_575_x15_y35.yap" SimListenPort="9675" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-20.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_576.xml b/share/regions/config_576.xml
new file mode 100644
index 0000000..f870dcd
--- /dev/null
+++ b/share/regions/config_576.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf240" SimName="576" SimLocationX="1000" SimLocationY="1018" Datastore="store_576_x00_y36.yap" SimListenPort="9676" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_577.xml b/share/regions/config_577.xml
new file mode 100644
index 0000000..349d03b
--- /dev/null
+++ b/share/regions/config_577.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf241" SimName="577" SimLocationX="1001" SimLocationY="1018" Datastore="store_577_x01_y36.yap" SimListenPort="9677" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_578.xml b/share/regions/config_578.xml
new file mode 100644
index 0000000..eebe8bb
--- /dev/null
+++ b/share/regions/config_578.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf242" SimName="578" SimLocationX="1002" SimLocationY="1018" Datastore="store_578_x02_y36.yap" SimListenPort="9678" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_579.xml b/share/regions/config_579.xml
new file mode 100644
index 0000000..5970a14
--- /dev/null
+++ b/share/regions/config_579.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf243" SimName="579" SimLocationX="1003" SimLocationY="1018" Datastore="store_579_x03_y36.yap" SimListenPort="9679" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_58.xml b/share/regions/config_58.xml
new file mode 100644
index 0000000..2e8febd
--- /dev/null
+++ b/share/regions/config_58.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf03a" SimName="58" SimLocationX="1026" SimLocationY="1001" Datastore="store_58_x10_y03.yap" SimListenPort="9158" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_580.xml b/share/regions/config_580.xml
new file mode 100644
index 0000000..ee93b09
--- /dev/null
+++ b/share/regions/config_580.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf244" SimName="580" SimLocationX="1004" SimLocationY="1018" Datastore="store_580_x04_y36.yap" SimListenPort="9680" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_581.xml b/share/regions/config_581.xml
new file mode 100644
index 0000000..3d73d61
--- /dev/null
+++ b/share/regions/config_581.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf245" SimName="581" SimLocationX="1005" SimLocationY="1018" Datastore="store_581_x05_y36.yap" SimListenPort="9681" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_582.xml b/share/regions/config_582.xml
new file mode 100644
index 0000000..98f6b4f
--- /dev/null
+++ b/share/regions/config_582.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf246" SimName="582" SimLocationX="1006" SimLocationY="1018" Datastore="store_582_x06_y36.yap" SimListenPort="9682" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_583.xml b/share/regions/config_583.xml
new file mode 100644
index 0000000..e625c3e
--- /dev/null
+++ b/share/regions/config_583.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf247" SimName="583" SimLocationX="1007" SimLocationY="1018" Datastore="store_583_x07_y36.yap" SimListenPort="9683" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_584.xml b/share/regions/config_584.xml
new file mode 100644
index 0000000..5da7869
--- /dev/null
+++ b/share/regions/config_584.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf248" SimName="584" SimLocationX="1008" SimLocationY="1018" Datastore="store_584_x08_y36.yap" SimListenPort="9684" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_585.xml b/share/regions/config_585.xml
new file mode 100644
index 0000000..0d989a8
--- /dev/null
+++ b/share/regions/config_585.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf249" SimName="585" SimLocationX="1009" SimLocationY="1018" Datastore="store_585_x09_y36.yap" SimListenPort="9685" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_586.xml b/share/regions/config_586.xml
new file mode 100644
index 0000000..17941ae
--- /dev/null
+++ b/share/regions/config_586.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf24a" SimName="586" SimLocationX="1010" SimLocationY="1018" Datastore="store_586_x10_y36.yap" SimListenPort="9686" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_587.xml b/share/regions/config_587.xml
new file mode 100644
index 0000000..dd191d1
--- /dev/null
+++ b/share/regions/config_587.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf24b" SimName="587" SimLocationX="1011" SimLocationY="1018" Datastore="store_587_x11_y36.yap" SimListenPort="9687" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_588.xml b/share/regions/config_588.xml
new file mode 100644
index 0000000..c8e93b2
--- /dev/null
+++ b/share/regions/config_588.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf24c" SimName="588" SimLocationX="1012" SimLocationY="1018" Datastore="store_588_x12_y36.yap" SimListenPort="9688" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_589.xml b/share/regions/config_589.xml
new file mode 100644
index 0000000..bb65f6c
--- /dev/null
+++ b/share/regions/config_589.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf24d" SimName="589" SimLocationX="1013" SimLocationY="1018" Datastore="store_589_x13_y36.yap" SimListenPort="9689" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_59.xml b/share/regions/config_59.xml
new file mode 100644
index 0000000..5c5b754
--- /dev/null
+++ b/share/regions/config_59.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf03b" SimName="59" SimLocationX="1027" SimLocationY="1001" Datastore="store_59_x11_y03.yap" SimListenPort="9159" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_590.xml b/share/regions/config_590.xml
new file mode 100644
index 0000000..82bf00d
--- /dev/null
+++ b/share/regions/config_590.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf24e" SimName="590" SimLocationX="1014" SimLocationY="1018" Datastore="store_590_x14_y36.yap" SimListenPort="9690" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_591.xml b/share/regions/config_591.xml
new file mode 100644
index 0000000..3fb37d4
--- /dev/null
+++ b/share/regions/config_591.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf24f" SimName="591" SimLocationX="1015" SimLocationY="1018" Datastore="store_591_x15_y36.yap" SimListenPort="9691" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-21.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_592.xml b/share/regions/config_592.xml
new file mode 100644
index 0000000..0ffdab8
--- /dev/null
+++ b/share/regions/config_592.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf250" SimName="592" SimLocationX="1016" SimLocationY="1018" Datastore="store_592_x00_y37.yap" SimListenPort="9692" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_593.xml b/share/regions/config_593.xml
new file mode 100644
index 0000000..3e02f70
--- /dev/null
+++ b/share/regions/config_593.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf251" SimName="593" SimLocationX="1017" SimLocationY="1018" Datastore="store_593_x01_y37.yap" SimListenPort="9693" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_594.xml b/share/regions/config_594.xml
new file mode 100644
index 0000000..e75d997
--- /dev/null
+++ b/share/regions/config_594.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf252" SimName="594" SimLocationX="1018" SimLocationY="1018" Datastore="store_594_x02_y37.yap" SimListenPort="9694" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_595.xml b/share/regions/config_595.xml
new file mode 100644
index 0000000..57a58da
--- /dev/null
+++ b/share/regions/config_595.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf253" SimName="595" SimLocationX="1019" SimLocationY="1018" Datastore="store_595_x03_y37.yap" SimListenPort="9695" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_596.xml b/share/regions/config_596.xml
new file mode 100644
index 0000000..0a4f07f
--- /dev/null
+++ b/share/regions/config_596.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf254" SimName="596" SimLocationX="1020" SimLocationY="1018" Datastore="store_596_x04_y37.yap" SimListenPort="9696" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_597.xml b/share/regions/config_597.xml
new file mode 100644
index 0000000..1d74ae4
--- /dev/null
+++ b/share/regions/config_597.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf255" SimName="597" SimLocationX="1021" SimLocationY="1018" Datastore="store_597_x05_y37.yap" SimListenPort="9697" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_598.xml b/share/regions/config_598.xml
new file mode 100644
index 0000000..933d93d
--- /dev/null
+++ b/share/regions/config_598.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf256" SimName="598" SimLocationX="1022" SimLocationY="1018" Datastore="store_598_x06_y37.yap" SimListenPort="9698" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_599.xml b/share/regions/config_599.xml
new file mode 100644
index 0000000..4ed64d0
--- /dev/null
+++ b/share/regions/config_599.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf257" SimName="599" SimLocationX="1023" SimLocationY="1018" Datastore="store_599_x07_y37.yap" SimListenPort="9699" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_6.xml b/share/regions/config_6.xml
new file mode 100644
index 0000000..e5a52ac
--- /dev/null
+++ b/share/regions/config_6.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf006" SimName="6" SimLocationX="1006" SimLocationY="1000" Datastore="store_6_x06_y00.yap" SimListenPort="9106" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_60.xml b/share/regions/config_60.xml
new file mode 100644
index 0000000..8159d99
--- /dev/null
+++ b/share/regions/config_60.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf03c" SimName="60" SimLocationX="1028" SimLocationY="1001" Datastore="store_60_x12_y03.yap" SimListenPort="9160" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_600.xml b/share/regions/config_600.xml
new file mode 100644
index 0000000..1fd886e
--- /dev/null
+++ b/share/regions/config_600.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf258" SimName="600" SimLocationX="1024" SimLocationY="1018" Datastore="store_600_x08_y37.yap" SimListenPort="9700" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_601.xml b/share/regions/config_601.xml
new file mode 100644
index 0000000..e5ccd9d
--- /dev/null
+++ b/share/regions/config_601.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf259" SimName="601" SimLocationX="1025" SimLocationY="1018" Datastore="store_601_x09_y37.yap" SimListenPort="9701" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_602.xml b/share/regions/config_602.xml
new file mode 100644
index 0000000..97ebf22
--- /dev/null
+++ b/share/regions/config_602.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf25a" SimName="602" SimLocationX="1026" SimLocationY="1018" Datastore="store_602_x10_y37.yap" SimListenPort="9702" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_603.xml b/share/regions/config_603.xml
new file mode 100644
index 0000000..c4abec1
--- /dev/null
+++ b/share/regions/config_603.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf25b" SimName="603" SimLocationX="1027" SimLocationY="1018" Datastore="store_603_x11_y37.yap" SimListenPort="9703" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_604.xml b/share/regions/config_604.xml
new file mode 100644
index 0000000..f8fb610
--- /dev/null
+++ b/share/regions/config_604.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf25c" SimName="604" SimLocationX="1028" SimLocationY="1018" Datastore="store_604_x12_y37.yap" SimListenPort="9704" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_605.xml b/share/regions/config_605.xml
new file mode 100644
index 0000000..9fe0d84
--- /dev/null
+++ b/share/regions/config_605.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf25d" SimName="605" SimLocationX="1029" SimLocationY="1018" Datastore="store_605_x13_y37.yap" SimListenPort="9705" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_606.xml b/share/regions/config_606.xml
new file mode 100644
index 0000000..221310d
--- /dev/null
+++ b/share/regions/config_606.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf25e" SimName="606" SimLocationX="1030" SimLocationY="1018" Datastore="store_606_x14_y37.yap" SimListenPort="9706" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_607.xml b/share/regions/config_607.xml
new file mode 100644
index 0000000..77e16e4
--- /dev/null
+++ b/share/regions/config_607.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf25f" SimName="607" SimLocationX="1031" SimLocationY="1018" Datastore="store_607_x15_y37.yap" SimListenPort="9707" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-22.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_608.xml b/share/regions/config_608.xml
new file mode 100644
index 0000000..2e75ba6
--- /dev/null
+++ b/share/regions/config_608.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf260" SimName="608" SimLocationX="1000" SimLocationY="1019" Datastore="store_608_x00_y38.yap" SimListenPort="9708" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_609.xml b/share/regions/config_609.xml
new file mode 100644
index 0000000..232d072
--- /dev/null
+++ b/share/regions/config_609.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf261" SimName="609" SimLocationX="1001" SimLocationY="1019" Datastore="store_609_x01_y38.yap" SimListenPort="9709" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_61.xml b/share/regions/config_61.xml
new file mode 100644
index 0000000..55a8c64
--- /dev/null
+++ b/share/regions/config_61.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf03d" SimName="61" SimLocationX="1029" SimLocationY="1001" Datastore="store_61_x13_y03.yap" SimListenPort="9161" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_610.xml b/share/regions/config_610.xml
new file mode 100644
index 0000000..f0bc96b
--- /dev/null
+++ b/share/regions/config_610.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf262" SimName="610" SimLocationX="1002" SimLocationY="1019" Datastore="store_610_x02_y38.yap" SimListenPort="9710" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_611.xml b/share/regions/config_611.xml
new file mode 100644
index 0000000..e6340c4
--- /dev/null
+++ b/share/regions/config_611.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf263" SimName="611" SimLocationX="1003" SimLocationY="1019" Datastore="store_611_x03_y38.yap" SimListenPort="9711" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_612.xml b/share/regions/config_612.xml
new file mode 100644
index 0000000..f233f89
--- /dev/null
+++ b/share/regions/config_612.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf264" SimName="612" SimLocationX="1004" SimLocationY="1019" Datastore="store_612_x04_y38.yap" SimListenPort="9712" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_613.xml b/share/regions/config_613.xml
new file mode 100644
index 0000000..ec6ae40
--- /dev/null
+++ b/share/regions/config_613.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf265" SimName="613" SimLocationX="1005" SimLocationY="1019" Datastore="store_613_x05_y38.yap" SimListenPort="9713" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_614.xml b/share/regions/config_614.xml
new file mode 100644
index 0000000..4a6eb03
--- /dev/null
+++ b/share/regions/config_614.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf266" SimName="614" SimLocationX="1006" SimLocationY="1019" Datastore="store_614_x06_y38.yap" SimListenPort="9714" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_615.xml b/share/regions/config_615.xml
new file mode 100644
index 0000000..dc4c2f9
--- /dev/null
+++ b/share/regions/config_615.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf267" SimName="615" SimLocationX="1007" SimLocationY="1019" Datastore="store_615_x07_y38.yap" SimListenPort="9715" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_616.xml b/share/regions/config_616.xml
new file mode 100644
index 0000000..34ce6d6
--- /dev/null
+++ b/share/regions/config_616.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf268" SimName="616" SimLocationX="1008" SimLocationY="1019" Datastore="store_616_x08_y38.yap" SimListenPort="9716" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_617.xml b/share/regions/config_617.xml
new file mode 100644
index 0000000..b4903c2
--- /dev/null
+++ b/share/regions/config_617.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf269" SimName="617" SimLocationX="1009" SimLocationY="1019" Datastore="store_617_x09_y38.yap" SimListenPort="9717" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_618.xml b/share/regions/config_618.xml
new file mode 100644
index 0000000..78b23b5
--- /dev/null
+++ b/share/regions/config_618.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf26a" SimName="618" SimLocationX="1010" SimLocationY="1019" Datastore="store_618_x10_y38.yap" SimListenPort="9718" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_619.xml b/share/regions/config_619.xml
new file mode 100644
index 0000000..6b14d81
--- /dev/null
+++ b/share/regions/config_619.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf26b" SimName="619" SimLocationX="1011" SimLocationY="1019" Datastore="store_619_x11_y38.yap" SimListenPort="9719" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_62.xml b/share/regions/config_62.xml
new file mode 100644
index 0000000..e35c51f
--- /dev/null
+++ b/share/regions/config_62.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf03e" SimName="62" SimLocationX="1030" SimLocationY="1001" Datastore="store_62_x14_y03.yap" SimListenPort="9162" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_620.xml b/share/regions/config_620.xml
new file mode 100644
index 0000000..660b624
--- /dev/null
+++ b/share/regions/config_620.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf26c" SimName="620" SimLocationX="1012" SimLocationY="1019" Datastore="store_620_x12_y38.yap" SimListenPort="9720" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_621.xml b/share/regions/config_621.xml
new file mode 100644
index 0000000..d4d7767
--- /dev/null
+++ b/share/regions/config_621.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf26d" SimName="621" SimLocationX="1013" SimLocationY="1019" Datastore="store_621_x13_y38.yap" SimListenPort="9721" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_622.xml b/share/regions/config_622.xml
new file mode 100644
index 0000000..ee45a34
--- /dev/null
+++ b/share/regions/config_622.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf26e" SimName="622" SimLocationX="1014" SimLocationY="1019" Datastore="store_622_x14_y38.yap" SimListenPort="9722" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_623.xml b/share/regions/config_623.xml
new file mode 100644
index 0000000..0919d49
--- /dev/null
+++ b/share/regions/config_623.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf26f" SimName="623" SimLocationX="1015" SimLocationY="1019" Datastore="store_623_x15_y38.yap" SimListenPort="9723" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-23.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_624.xml b/share/regions/config_624.xml
new file mode 100644
index 0000000..572a48f
--- /dev/null
+++ b/share/regions/config_624.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf270" SimName="624" SimLocationX="1016" SimLocationY="1019" Datastore="store_624_x00_y39.yap" SimListenPort="9724" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_625.xml b/share/regions/config_625.xml
new file mode 100644
index 0000000..98bec19
--- /dev/null
+++ b/share/regions/config_625.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf271" SimName="625" SimLocationX="1017" SimLocationY="1019" Datastore="store_625_x01_y39.yap" SimListenPort="9725" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_626.xml b/share/regions/config_626.xml
new file mode 100644
index 0000000..a64fb56
--- /dev/null
+++ b/share/regions/config_626.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf272" SimName="626" SimLocationX="1018" SimLocationY="1019" Datastore="store_626_x02_y39.yap" SimListenPort="9726" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_627.xml b/share/regions/config_627.xml
new file mode 100644
index 0000000..a388684
--- /dev/null
+++ b/share/regions/config_627.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf273" SimName="627" SimLocationX="1019" SimLocationY="1019" Datastore="store_627_x03_y39.yap" SimListenPort="9727" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_628.xml b/share/regions/config_628.xml
new file mode 100644
index 0000000..786bf6e
--- /dev/null
+++ b/share/regions/config_628.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf274" SimName="628" SimLocationX="1020" SimLocationY="1019" Datastore="store_628_x04_y39.yap" SimListenPort="9728" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_629.xml b/share/regions/config_629.xml
new file mode 100644
index 0000000..bc815b7
--- /dev/null
+++ b/share/regions/config_629.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf275" SimName="629" SimLocationX="1021" SimLocationY="1019" Datastore="store_629_x05_y39.yap" SimListenPort="9729" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_63.xml b/share/regions/config_63.xml
new file mode 100644
index 0000000..bd9992b
--- /dev/null
+++ b/share/regions/config_63.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf03f" SimName="63" SimLocationX="1031" SimLocationY="1001" Datastore="store_63_x15_y03.yap" SimListenPort="9163" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y12.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_630.xml b/share/regions/config_630.xml
new file mode 100644
index 0000000..f654ce4
--- /dev/null
+++ b/share/regions/config_630.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf276" SimName="630" SimLocationX="1022" SimLocationY="1019" Datastore="store_630_x06_y39.yap" SimListenPort="9730" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_631.xml b/share/regions/config_631.xml
new file mode 100644
index 0000000..fbc2bf9
--- /dev/null
+++ b/share/regions/config_631.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf277" SimName="631" SimLocationX="1023" SimLocationY="1019" Datastore="store_631_x07_y39.yap" SimListenPort="9731" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_632.xml b/share/regions/config_632.xml
new file mode 100644
index 0000000..9530a63
--- /dev/null
+++ b/share/regions/config_632.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf278" SimName="632" SimLocationX="1024" SimLocationY="1019" Datastore="store_632_x08_y39.yap" SimListenPort="9732" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_633.xml b/share/regions/config_633.xml
new file mode 100644
index 0000000..35babf2
--- /dev/null
+++ b/share/regions/config_633.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf279" SimName="633" SimLocationX="1025" SimLocationY="1019" Datastore="store_633_x09_y39.yap" SimListenPort="9733" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_634.xml b/share/regions/config_634.xml
new file mode 100644
index 0000000..ee3965d
--- /dev/null
+++ b/share/regions/config_634.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf27a" SimName="634" SimLocationX="1026" SimLocationY="1019" Datastore="store_634_x10_y39.yap" SimListenPort="9734" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_635.xml b/share/regions/config_635.xml
new file mode 100644
index 0000000..10e388f
--- /dev/null
+++ b/share/regions/config_635.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf27b" SimName="635" SimLocationX="1027" SimLocationY="1019" Datastore="store_635_x11_y39.yap" SimListenPort="9735" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_636.xml b/share/regions/config_636.xml
new file mode 100644
index 0000000..b4a962c
--- /dev/null
+++ b/share/regions/config_636.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf27c" SimName="636" SimLocationX="1028" SimLocationY="1019" Datastore="store_636_x12_y39.yap" SimListenPort="9736" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_637.xml b/share/regions/config_637.xml
new file mode 100644
index 0000000..1d0ccfc
--- /dev/null
+++ b/share/regions/config_637.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf27d" SimName="637" SimLocationX="1029" SimLocationY="1019" Datastore="store_637_x13_y39.yap" SimListenPort="9737" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_638.xml b/share/regions/config_638.xml
new file mode 100644
index 0000000..a4ebf85
--- /dev/null
+++ b/share/regions/config_638.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf27e" SimName="638" SimLocationX="1030" SimLocationY="1019" Datastore="store_638_x14_y39.yap" SimListenPort="9738" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_639.xml b/share/regions/config_639.xml
new file mode 100644
index 0000000..99d42e4
--- /dev/null
+++ b/share/regions/config_639.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf27f" SimName="639" SimLocationX="1031" SimLocationY="1019" Datastore="store_639_x15_y39.yap" SimListenPort="9739" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-24.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_64.xml b/share/regions/config_64.xml
new file mode 100644
index 0000000..669676c
--- /dev/null
+++ b/share/regions/config_64.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf040" SimName="64" SimLocationX="1000" SimLocationY="1002" Datastore="store_64_x00_y04.yap" SimListenPort="9164" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_640.xml b/share/regions/config_640.xml
new file mode 100644
index 0000000..e32bc2e
--- /dev/null
+++ b/share/regions/config_640.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf280" SimName="640" SimLocationX="1000" SimLocationY="1020" Datastore="store_640_x00_y40.yap" SimListenPort="9740" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_641.xml b/share/regions/config_641.xml
new file mode 100644
index 0000000..da68ff4
--- /dev/null
+++ b/share/regions/config_641.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf281" SimName="641" SimLocationX="1001" SimLocationY="1020" Datastore="store_641_x01_y40.yap" SimListenPort="9741" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_642.xml b/share/regions/config_642.xml
new file mode 100644
index 0000000..a90333f
--- /dev/null
+++ b/share/regions/config_642.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf282" SimName="642" SimLocationX="1002" SimLocationY="1020" Datastore="store_642_x02_y40.yap" SimListenPort="9742" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_643.xml b/share/regions/config_643.xml
new file mode 100644
index 0000000..7912a3c
--- /dev/null
+++ b/share/regions/config_643.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf283" SimName="643" SimLocationX="1003" SimLocationY="1020" Datastore="store_643_x03_y40.yap" SimListenPort="9743" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_644.xml b/share/regions/config_644.xml
new file mode 100644
index 0000000..89a302b
--- /dev/null
+++ b/share/regions/config_644.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf284" SimName="644" SimLocationX="1004" SimLocationY="1020" Datastore="store_644_x04_y40.yap" SimListenPort="9744" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_645.xml b/share/regions/config_645.xml
new file mode 100644
index 0000000..f5fd1b6
--- /dev/null
+++ b/share/regions/config_645.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf285" SimName="645" SimLocationX="1005" SimLocationY="1020" Datastore="store_645_x05_y40.yap" SimListenPort="9745" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_646.xml b/share/regions/config_646.xml
new file mode 100644
index 0000000..8cd3548
--- /dev/null
+++ b/share/regions/config_646.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf286" SimName="646" SimLocationX="1006" SimLocationY="1020" Datastore="store_646_x06_y40.yap" SimListenPort="9746" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_647.xml b/share/regions/config_647.xml
new file mode 100644
index 0000000..8d82b10
--- /dev/null
+++ b/share/regions/config_647.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf287" SimName="647" SimLocationX="1007" SimLocationY="1020" Datastore="store_647_x07_y40.yap" SimListenPort="9747" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_648.xml b/share/regions/config_648.xml
new file mode 100644
index 0000000..d02a8df
--- /dev/null
+++ b/share/regions/config_648.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf288" SimName="648" SimLocationX="1008" SimLocationY="1020" Datastore="store_648_x08_y40.yap" SimListenPort="9748" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_649.xml b/share/regions/config_649.xml
new file mode 100644
index 0000000..407e855
--- /dev/null
+++ b/share/regions/config_649.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf289" SimName="649" SimLocationX="1009" SimLocationY="1020" Datastore="store_649_x09_y40.yap" SimListenPort="9749" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_65.xml b/share/regions/config_65.xml
new file mode 100644
index 0000000..d502fda
--- /dev/null
+++ b/share/regions/config_65.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf041" SimName="65" SimLocationX="1001" SimLocationY="1002" Datastore="store_65_x01_y04.yap" SimListenPort="9165" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_650.xml b/share/regions/config_650.xml
new file mode 100644
index 0000000..ff9ecf2
--- /dev/null
+++ b/share/regions/config_650.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf28a" SimName="650" SimLocationX="1010" SimLocationY="1020" Datastore="store_650_x10_y40.yap" SimListenPort="9750" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_651.xml b/share/regions/config_651.xml
new file mode 100644
index 0000000..07643d3
--- /dev/null
+++ b/share/regions/config_651.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf28b" SimName="651" SimLocationX="1011" SimLocationY="1020" Datastore="store_651_x11_y40.yap" SimListenPort="9751" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_652.xml b/share/regions/config_652.xml
new file mode 100644
index 0000000..f3bb531
--- /dev/null
+++ b/share/regions/config_652.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf28c" SimName="652" SimLocationX="1012" SimLocationY="1020" Datastore="store_652_x12_y40.yap" SimListenPort="9752" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_653.xml b/share/regions/config_653.xml
new file mode 100644
index 0000000..6e7c4b8
--- /dev/null
+++ b/share/regions/config_653.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf28d" SimName="653" SimLocationX="1013" SimLocationY="1020" Datastore="store_653_x13_y40.yap" SimListenPort="9753" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_654.xml b/share/regions/config_654.xml
new file mode 100644
index 0000000..0346807
--- /dev/null
+++ b/share/regions/config_654.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf28e" SimName="654" SimLocationX="1014" SimLocationY="1020" Datastore="store_654_x14_y40.yap" SimListenPort="9754" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_655.xml b/share/regions/config_655.xml
new file mode 100644
index 0000000..5113188
--- /dev/null
+++ b/share/regions/config_655.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf28f" SimName="655" SimLocationX="1015" SimLocationY="1020" Datastore="store_655_x15_y40.yap" SimListenPort="9755" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-25.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_656.xml b/share/regions/config_656.xml
new file mode 100644
index 0000000..f7d1ca4
--- /dev/null
+++ b/share/regions/config_656.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf290" SimName="656" SimLocationX="1016" SimLocationY="1020" Datastore="store_656_x00_y41.yap" SimListenPort="9756" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_657.xml b/share/regions/config_657.xml
new file mode 100644
index 0000000..04cdf41
--- /dev/null
+++ b/share/regions/config_657.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf291" SimName="657" SimLocationX="1017" SimLocationY="1020" Datastore="store_657_x01_y41.yap" SimListenPort="9757" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_658.xml b/share/regions/config_658.xml
new file mode 100644
index 0000000..9682b36
--- /dev/null
+++ b/share/regions/config_658.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf292" SimName="658" SimLocationX="1018" SimLocationY="1020" Datastore="store_658_x02_y41.yap" SimListenPort="9758" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_659.xml b/share/regions/config_659.xml
new file mode 100644
index 0000000..a5380c4
--- /dev/null
+++ b/share/regions/config_659.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf293" SimName="659" SimLocationX="1019" SimLocationY="1020" Datastore="store_659_x03_y41.yap" SimListenPort="9759" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_66.xml b/share/regions/config_66.xml
new file mode 100644
index 0000000..5cf1043
--- /dev/null
+++ b/share/regions/config_66.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf042" SimName="66" SimLocationX="1002" SimLocationY="1002" Datastore="store_66_x02_y04.yap" SimListenPort="9166" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_660.xml b/share/regions/config_660.xml
new file mode 100644
index 0000000..7801bcb
--- /dev/null
+++ b/share/regions/config_660.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf294" SimName="660" SimLocationX="1020" SimLocationY="1020" Datastore="store_660_x04_y41.yap" SimListenPort="9760" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_661.xml b/share/regions/config_661.xml
new file mode 100644
index 0000000..3ff4ef9
--- /dev/null
+++ b/share/regions/config_661.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf295" SimName="661" SimLocationX="1021" SimLocationY="1020" Datastore="store_661_x05_y41.yap" SimListenPort="9761" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_662.xml b/share/regions/config_662.xml
new file mode 100644
index 0000000..6b0ffb3
--- /dev/null
+++ b/share/regions/config_662.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf296" SimName="662" SimLocationX="1022" SimLocationY="1020" Datastore="store_662_x06_y41.yap" SimListenPort="9762" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_663.xml b/share/regions/config_663.xml
new file mode 100644
index 0000000..2efec8d
--- /dev/null
+++ b/share/regions/config_663.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf297" SimName="663" SimLocationX="1023" SimLocationY="1020" Datastore="store_663_x07_y41.yap" SimListenPort="9763" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_664.xml b/share/regions/config_664.xml
new file mode 100644
index 0000000..1535dd4
--- /dev/null
+++ b/share/regions/config_664.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf298" SimName="664" SimLocationX="1024" SimLocationY="1020" Datastore="store_664_x08_y41.yap" SimListenPort="9764" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_665.xml b/share/regions/config_665.xml
new file mode 100644
index 0000000..4a7c0e5
--- /dev/null
+++ b/share/regions/config_665.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf299" SimName="665" SimLocationX="1025" SimLocationY="1020" Datastore="store_665_x09_y41.yap" SimListenPort="9765" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_666.xml b/share/regions/config_666.xml
new file mode 100644
index 0000000..3dd6225
--- /dev/null
+++ b/share/regions/config_666.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf29a" SimName="666" SimLocationX="1026" SimLocationY="1020" Datastore="store_666_x10_y41.yap" SimListenPort="9766" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_667.xml b/share/regions/config_667.xml
new file mode 100644
index 0000000..0bd4d2f
--- /dev/null
+++ b/share/regions/config_667.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf29b" SimName="667" SimLocationX="1027" SimLocationY="1020" Datastore="store_667_x11_y41.yap" SimListenPort="9767" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_668.xml b/share/regions/config_668.xml
new file mode 100644
index 0000000..872ca80
--- /dev/null
+++ b/share/regions/config_668.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf29c" SimName="668" SimLocationX="1028" SimLocationY="1020" Datastore="store_668_x12_y41.yap" SimListenPort="9768" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_669.xml b/share/regions/config_669.xml
new file mode 100644
index 0000000..3b04eea
--- /dev/null
+++ b/share/regions/config_669.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf29d" SimName="669" SimLocationX="1029" SimLocationY="1020" Datastore="store_669_x13_y41.yap" SimListenPort="9769" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_67.xml b/share/regions/config_67.xml
new file mode 100644
index 0000000..ce0b3be
--- /dev/null
+++ b/share/regions/config_67.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf043" SimName="67" SimLocationX="1003" SimLocationY="1002" Datastore="store_67_x03_y04.yap" SimListenPort="9167" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_670.xml b/share/regions/config_670.xml
new file mode 100644
index 0000000..ba31ce9
--- /dev/null
+++ b/share/regions/config_670.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf29e" SimName="670" SimLocationX="1030" SimLocationY="1020" Datastore="store_670_x14_y41.yap" SimListenPort="9770" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_671.xml b/share/regions/config_671.xml
new file mode 100644
index 0000000..99260f5
--- /dev/null
+++ b/share/regions/config_671.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf29f" SimName="671" SimLocationX="1031" SimLocationY="1020" Datastore="store_671_x15_y41.yap" SimListenPort="9771" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-26.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_672.xml b/share/regions/config_672.xml
new file mode 100644
index 0000000..faa4e9f
--- /dev/null
+++ b/share/regions/config_672.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a0" SimName="672" SimLocationX="1000" SimLocationY="1021" Datastore="store_672_x00_y42.yap" SimListenPort="9772" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_673.xml b/share/regions/config_673.xml
new file mode 100644
index 0000000..304dee4
--- /dev/null
+++ b/share/regions/config_673.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a1" SimName="673" SimLocationX="1001" SimLocationY="1021" Datastore="store_673_x01_y42.yap" SimListenPort="9773" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_674.xml b/share/regions/config_674.xml
new file mode 100644
index 0000000..d7224ad
--- /dev/null
+++ b/share/regions/config_674.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a2" SimName="674" SimLocationX="1002" SimLocationY="1021" Datastore="store_674_x02_y42.yap" SimListenPort="9774" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_675.xml b/share/regions/config_675.xml
new file mode 100644
index 0000000..713354f
--- /dev/null
+++ b/share/regions/config_675.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a3" SimName="675" SimLocationX="1003" SimLocationY="1021" Datastore="store_675_x03_y42.yap" SimListenPort="9775" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_676.xml b/share/regions/config_676.xml
new file mode 100644
index 0000000..6e5eea0
--- /dev/null
+++ b/share/regions/config_676.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a4" SimName="676" SimLocationX="1004" SimLocationY="1021" Datastore="store_676_x04_y42.yap" SimListenPort="9776" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_677.xml b/share/regions/config_677.xml
new file mode 100644
index 0000000..dc85b78
--- /dev/null
+++ b/share/regions/config_677.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a5" SimName="677" SimLocationX="1005" SimLocationY="1021" Datastore="store_677_x05_y42.yap" SimListenPort="9777" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_678.xml b/share/regions/config_678.xml
new file mode 100644
index 0000000..238a63c
--- /dev/null
+++ b/share/regions/config_678.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a6" SimName="678" SimLocationX="1006" SimLocationY="1021" Datastore="store_678_x06_y42.yap" SimListenPort="9778" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_679.xml b/share/regions/config_679.xml
new file mode 100644
index 0000000..8afb0de
--- /dev/null
+++ b/share/regions/config_679.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a7" SimName="679" SimLocationX="1007" SimLocationY="1021" Datastore="store_679_x07_y42.yap" SimListenPort="9779" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_68.xml b/share/regions/config_68.xml
new file mode 100644
index 0000000..e3e4b40
--- /dev/null
+++ b/share/regions/config_68.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf044" SimName="68" SimLocationX="1004" SimLocationY="1002" Datastore="store_68_x04_y04.yap" SimListenPort="9168" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_680.xml b/share/regions/config_680.xml
new file mode 100644
index 0000000..3afcc52
--- /dev/null
+++ b/share/regions/config_680.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a8" SimName="680" SimLocationX="1008" SimLocationY="1021" Datastore="store_680_x08_y42.yap" SimListenPort="9780" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_681.xml b/share/regions/config_681.xml
new file mode 100644
index 0000000..f5c6f7b
--- /dev/null
+++ b/share/regions/config_681.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2a9" SimName="681" SimLocationX="1009" SimLocationY="1021" Datastore="store_681_x09_y42.yap" SimListenPort="9781" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_682.xml b/share/regions/config_682.xml
new file mode 100644
index 0000000..f88d81c
--- /dev/null
+++ b/share/regions/config_682.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2aa" SimName="682" SimLocationX="1010" SimLocationY="1021" Datastore="store_682_x10_y42.yap" SimListenPort="9782" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_683.xml b/share/regions/config_683.xml
new file mode 100644
index 0000000..315e47c
--- /dev/null
+++ b/share/regions/config_683.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ab" SimName="683" SimLocationX="1011" SimLocationY="1021" Datastore="store_683_x11_y42.yap" SimListenPort="9783" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_684.xml b/share/regions/config_684.xml
new file mode 100644
index 0000000..cef1951
--- /dev/null
+++ b/share/regions/config_684.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ac" SimName="684" SimLocationX="1012" SimLocationY="1021" Datastore="store_684_x12_y42.yap" SimListenPort="9784" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_685.xml b/share/regions/config_685.xml
new file mode 100644
index 0000000..fce8917
--- /dev/null
+++ b/share/regions/config_685.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ad" SimName="685" SimLocationX="1013" SimLocationY="1021" Datastore="store_685_x13_y42.yap" SimListenPort="9785" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_686.xml b/share/regions/config_686.xml
new file mode 100644
index 0000000..20c19dc
--- /dev/null
+++ b/share/regions/config_686.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ae" SimName="686" SimLocationX="1014" SimLocationY="1021" Datastore="store_686_x14_y42.yap" SimListenPort="9786" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_687.xml b/share/regions/config_687.xml
new file mode 100644
index 0000000..8604eaf
--- /dev/null
+++ b/share/regions/config_687.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2af" SimName="687" SimLocationX="1015" SimLocationY="1021" Datastore="store_687_x15_y42.yap" SimListenPort="9787" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-27.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_688.xml b/share/regions/config_688.xml
new file mode 100644
index 0000000..12033c9
--- /dev/null
+++ b/share/regions/config_688.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b0" SimName="688" SimLocationX="1016" SimLocationY="1021" Datastore="store_688_x00_y43.yap" SimListenPort="9788" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_689.xml b/share/regions/config_689.xml
new file mode 100644
index 0000000..bda5afb
--- /dev/null
+++ b/share/regions/config_689.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b1" SimName="689" SimLocationX="1017" SimLocationY="1021" Datastore="store_689_x01_y43.yap" SimListenPort="9789" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_69.xml b/share/regions/config_69.xml
new file mode 100644
index 0000000..55e75ab
--- /dev/null
+++ b/share/regions/config_69.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf045" SimName="69" SimLocationX="1005" SimLocationY="1002" Datastore="store_69_x05_y04.yap" SimListenPort="9169" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_690.xml b/share/regions/config_690.xml
new file mode 100644
index 0000000..fd1ed38
--- /dev/null
+++ b/share/regions/config_690.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b2" SimName="690" SimLocationX="1018" SimLocationY="1021" Datastore="store_690_x02_y43.yap" SimListenPort="9790" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_691.xml b/share/regions/config_691.xml
new file mode 100644
index 0000000..8c6f56e
--- /dev/null
+++ b/share/regions/config_691.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b3" SimName="691" SimLocationX="1019" SimLocationY="1021" Datastore="store_691_x03_y43.yap" SimListenPort="9791" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_692.xml b/share/regions/config_692.xml
new file mode 100644
index 0000000..2b6133b
--- /dev/null
+++ b/share/regions/config_692.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b4" SimName="692" SimLocationX="1020" SimLocationY="1021" Datastore="store_692_x04_y43.yap" SimListenPort="9792" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_693.xml b/share/regions/config_693.xml
new file mode 100644
index 0000000..1fa28f4
--- /dev/null
+++ b/share/regions/config_693.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b5" SimName="693" SimLocationX="1021" SimLocationY="1021" Datastore="store_693_x05_y43.yap" SimListenPort="9793" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_694.xml b/share/regions/config_694.xml
new file mode 100644
index 0000000..7ea9a56
--- /dev/null
+++ b/share/regions/config_694.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b6" SimName="694" SimLocationX="1022" SimLocationY="1021" Datastore="store_694_x06_y43.yap" SimListenPort="9794" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_695.xml b/share/regions/config_695.xml
new file mode 100644
index 0000000..6e57b7a
--- /dev/null
+++ b/share/regions/config_695.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b7" SimName="695" SimLocationX="1023" SimLocationY="1021" Datastore="store_695_x07_y43.yap" SimListenPort="9795" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_696.xml b/share/regions/config_696.xml
new file mode 100644
index 0000000..5311547
--- /dev/null
+++ b/share/regions/config_696.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b8" SimName="696" SimLocationX="1024" SimLocationY="1021" Datastore="store_696_x08_y43.yap" SimListenPort="9796" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_697.xml b/share/regions/config_697.xml
new file mode 100644
index 0000000..a549fac
--- /dev/null
+++ b/share/regions/config_697.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2b9" SimName="697" SimLocationX="1025" SimLocationY="1021" Datastore="store_697_x09_y43.yap" SimListenPort="9797" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_698.xml b/share/regions/config_698.xml
new file mode 100644
index 0000000..07aa253
--- /dev/null
+++ b/share/regions/config_698.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ba" SimName="698" SimLocationX="1026" SimLocationY="1021" Datastore="store_698_x10_y43.yap" SimListenPort="9798" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_699.xml b/share/regions/config_699.xml
new file mode 100644
index 0000000..e85dc5c
--- /dev/null
+++ b/share/regions/config_699.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2bb" SimName="699" SimLocationX="1027" SimLocationY="1021" Datastore="store_699_x11_y43.yap" SimListenPort="9799" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_7.xml b/share/regions/config_7.xml
new file mode 100644
index 0000000..fb8b2a4
--- /dev/null
+++ b/share/regions/config_7.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf007" SimName="7" SimLocationX="1007" SimLocationY="1000" Datastore="store_7_x07_y00.yap" SimListenPort="9107" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_70.xml b/share/regions/config_70.xml
new file mode 100644
index 0000000..bce1dc1
--- /dev/null
+++ b/share/regions/config_70.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf046" SimName="70" SimLocationX="1006" SimLocationY="1002" Datastore="store_70_x06_y04.yap" SimListenPort="9170" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_700.xml b/share/regions/config_700.xml
new file mode 100644
index 0000000..d315e2f
--- /dev/null
+++ b/share/regions/config_700.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2bc" SimName="700" SimLocationX="1028" SimLocationY="1021" Datastore="store_700_x12_y43.yap" SimListenPort="9800" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_701.xml b/share/regions/config_701.xml
new file mode 100644
index 0000000..2c2ee68
--- /dev/null
+++ b/share/regions/config_701.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2bd" SimName="701" SimLocationX="1029" SimLocationY="1021" Datastore="store_701_x13_y43.yap" SimListenPort="9801" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_702.xml b/share/regions/config_702.xml
new file mode 100644
index 0000000..b2f6b63
--- /dev/null
+++ b/share/regions/config_702.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2be" SimName="702" SimLocationX="1030" SimLocationY="1021" Datastore="store_702_x14_y43.yap" SimListenPort="9802" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_703.xml b/share/regions/config_703.xml
new file mode 100644
index 0000000..3ad5f15
--- /dev/null
+++ b/share/regions/config_703.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2bf" SimName="703" SimLocationX="1031" SimLocationY="1021" Datastore="store_703_x15_y43.yap" SimListenPort="9803" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-28.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_704.xml b/share/regions/config_704.xml
new file mode 100644
index 0000000..94dc04e
--- /dev/null
+++ b/share/regions/config_704.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c0" SimName="704" SimLocationX="1000" SimLocationY="1022" Datastore="store_704_x00_y44.yap" SimListenPort="9804" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_705.xml b/share/regions/config_705.xml
new file mode 100644
index 0000000..00b9909
--- /dev/null
+++ b/share/regions/config_705.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c1" SimName="705" SimLocationX="1001" SimLocationY="1022" Datastore="store_705_x01_y44.yap" SimListenPort="9805" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_706.xml b/share/regions/config_706.xml
new file mode 100644
index 0000000..729934d
--- /dev/null
+++ b/share/regions/config_706.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c2" SimName="706" SimLocationX="1002" SimLocationY="1022" Datastore="store_706_x02_y44.yap" SimListenPort="9806" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_707.xml b/share/regions/config_707.xml
new file mode 100644
index 0000000..c65288a
--- /dev/null
+++ b/share/regions/config_707.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c3" SimName="707" SimLocationX="1003" SimLocationY="1022" Datastore="store_707_x03_y44.yap" SimListenPort="9807" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_708.xml b/share/regions/config_708.xml
new file mode 100644
index 0000000..bcdbd8a
--- /dev/null
+++ b/share/regions/config_708.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c4" SimName="708" SimLocationX="1004" SimLocationY="1022" Datastore="store_708_x04_y44.yap" SimListenPort="9808" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_709.xml b/share/regions/config_709.xml
new file mode 100644
index 0000000..e385e33
--- /dev/null
+++ b/share/regions/config_709.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c5" SimName="709" SimLocationX="1005" SimLocationY="1022" Datastore="store_709_x05_y44.yap" SimListenPort="9809" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_71.xml b/share/regions/config_71.xml
new file mode 100644
index 0000000..dc746dc
--- /dev/null
+++ b/share/regions/config_71.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf047" SimName="71" SimLocationX="1007" SimLocationY="1002" Datastore="store_71_x07_y04.yap" SimListenPort="9171" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_710.xml b/share/regions/config_710.xml
new file mode 100644
index 0000000..25c91de
--- /dev/null
+++ b/share/regions/config_710.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c6" SimName="710" SimLocationX="1006" SimLocationY="1022" Datastore="store_710_x06_y44.yap" SimListenPort="9810" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_711.xml b/share/regions/config_711.xml
new file mode 100644
index 0000000..3cfc51d
--- /dev/null
+++ b/share/regions/config_711.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c7" SimName="711" SimLocationX="1007" SimLocationY="1022" Datastore="store_711_x07_y44.yap" SimListenPort="9811" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_712.xml b/share/regions/config_712.xml
new file mode 100644
index 0000000..7ef6107
--- /dev/null
+++ b/share/regions/config_712.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c8" SimName="712" SimLocationX="1008" SimLocationY="1022" Datastore="store_712_x08_y44.yap" SimListenPort="9812" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_713.xml b/share/regions/config_713.xml
new file mode 100644
index 0000000..5a81394
--- /dev/null
+++ b/share/regions/config_713.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2c9" SimName="713" SimLocationX="1009" SimLocationY="1022" Datastore="store_713_x09_y44.yap" SimListenPort="9813" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_714.xml b/share/regions/config_714.xml
new file mode 100644
index 0000000..d4738a7
--- /dev/null
+++ b/share/regions/config_714.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ca" SimName="714" SimLocationX="1010" SimLocationY="1022" Datastore="store_714_x10_y44.yap" SimListenPort="9814" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_715.xml b/share/regions/config_715.xml
new file mode 100644
index 0000000..d86bf2b
--- /dev/null
+++ b/share/regions/config_715.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2cb" SimName="715" SimLocationX="1011" SimLocationY="1022" Datastore="store_715_x11_y44.yap" SimListenPort="9815" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_716.xml b/share/regions/config_716.xml
new file mode 100644
index 0000000..e57720d
--- /dev/null
+++ b/share/regions/config_716.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2cc" SimName="716" SimLocationX="1012" SimLocationY="1022" Datastore="store_716_x12_y44.yap" SimListenPort="9816" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_717.xml b/share/regions/config_717.xml
new file mode 100644
index 0000000..c2ad944
--- /dev/null
+++ b/share/regions/config_717.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2cd" SimName="717" SimLocationX="1013" SimLocationY="1022" Datastore="store_717_x13_y44.yap" SimListenPort="9817" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_718.xml b/share/regions/config_718.xml
new file mode 100644
index 0000000..33211bc
--- /dev/null
+++ b/share/regions/config_718.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ce" SimName="718" SimLocationX="1014" SimLocationY="1022" Datastore="store_718_x14_y44.yap" SimListenPort="9818" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_719.xml b/share/regions/config_719.xml
new file mode 100644
index 0000000..a3a32d2
--- /dev/null
+++ b/share/regions/config_719.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2cf" SimName="719" SimLocationX="1015" SimLocationY="1022" Datastore="store_719_x15_y44.yap" SimListenPort="9819" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-29.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_72.xml b/share/regions/config_72.xml
new file mode 100644
index 0000000..132db9a
--- /dev/null
+++ b/share/regions/config_72.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf048" SimName="72" SimLocationX="1008" SimLocationY="1002" Datastore="store_72_x08_y04.yap" SimListenPort="9172" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_720.xml b/share/regions/config_720.xml
new file mode 100644
index 0000000..898cd57
--- /dev/null
+++ b/share/regions/config_720.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d0" SimName="720" SimLocationX="1016" SimLocationY="1022" Datastore="store_720_x00_y45.yap" SimListenPort="9820" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_721.xml b/share/regions/config_721.xml
new file mode 100644
index 0000000..30ec038
--- /dev/null
+++ b/share/regions/config_721.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d1" SimName="721" SimLocationX="1017" SimLocationY="1022" Datastore="store_721_x01_y45.yap" SimListenPort="9821" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_722.xml b/share/regions/config_722.xml
new file mode 100644
index 0000000..56f5e4a
--- /dev/null
+++ b/share/regions/config_722.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d2" SimName="722" SimLocationX="1018" SimLocationY="1022" Datastore="store_722_x02_y45.yap" SimListenPort="9822" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_723.xml b/share/regions/config_723.xml
new file mode 100644
index 0000000..ce8fbf9
--- /dev/null
+++ b/share/regions/config_723.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d3" SimName="723" SimLocationX="1019" SimLocationY="1022" Datastore="store_723_x03_y45.yap" SimListenPort="9823" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_724.xml b/share/regions/config_724.xml
new file mode 100644
index 0000000..0a72dbc
--- /dev/null
+++ b/share/regions/config_724.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d4" SimName="724" SimLocationX="1020" SimLocationY="1022" Datastore="store_724_x04_y45.yap" SimListenPort="9824" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_725.xml b/share/regions/config_725.xml
new file mode 100644
index 0000000..8608f8b
--- /dev/null
+++ b/share/regions/config_725.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d5" SimName="725" SimLocationX="1021" SimLocationY="1022" Datastore="store_725_x05_y45.yap" SimListenPort="9825" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_726.xml b/share/regions/config_726.xml
new file mode 100644
index 0000000..5766227
--- /dev/null
+++ b/share/regions/config_726.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d6" SimName="726" SimLocationX="1022" SimLocationY="1022" Datastore="store_726_x06_y45.yap" SimListenPort="9826" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_727.xml b/share/regions/config_727.xml
new file mode 100644
index 0000000..6553367
--- /dev/null
+++ b/share/regions/config_727.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d7" SimName="727" SimLocationX="1023" SimLocationY="1022" Datastore="store_727_x07_y45.yap" SimListenPort="9827" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_728.xml b/share/regions/config_728.xml
new file mode 100644
index 0000000..867cdd1
--- /dev/null
+++ b/share/regions/config_728.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d8" SimName="728" SimLocationX="1024" SimLocationY="1022" Datastore="store_728_x08_y45.yap" SimListenPort="9828" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_729.xml b/share/regions/config_729.xml
new file mode 100644
index 0000000..4c3f3bf
--- /dev/null
+++ b/share/regions/config_729.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2d9" SimName="729" SimLocationX="1025" SimLocationY="1022" Datastore="store_729_x09_y45.yap" SimListenPort="9829" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_73.xml b/share/regions/config_73.xml
new file mode 100644
index 0000000..a9dff11
--- /dev/null
+++ b/share/regions/config_73.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf049" SimName="73" SimLocationX="1009" SimLocationY="1002" Datastore="store_73_x09_y04.yap" SimListenPort="9173" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_730.xml b/share/regions/config_730.xml
new file mode 100644
index 0000000..95567f3
--- /dev/null
+++ b/share/regions/config_730.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2da" SimName="730" SimLocationX="1026" SimLocationY="1022" Datastore="store_730_x10_y45.yap" SimListenPort="9830" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_731.xml b/share/regions/config_731.xml
new file mode 100644
index 0000000..b1eac25
--- /dev/null
+++ b/share/regions/config_731.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2db" SimName="731" SimLocationX="1027" SimLocationY="1022" Datastore="store_731_x11_y45.yap" SimListenPort="9831" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_732.xml b/share/regions/config_732.xml
new file mode 100644
index 0000000..df6ab85
--- /dev/null
+++ b/share/regions/config_732.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2dc" SimName="732" SimLocationX="1028" SimLocationY="1022" Datastore="store_732_x12_y45.yap" SimListenPort="9832" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_733.xml b/share/regions/config_733.xml
new file mode 100644
index 0000000..cba3b47
--- /dev/null
+++ b/share/regions/config_733.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2dd" SimName="733" SimLocationX="1029" SimLocationY="1022" Datastore="store_733_x13_y45.yap" SimListenPort="9833" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_734.xml b/share/regions/config_734.xml
new file mode 100644
index 0000000..21cad95
--- /dev/null
+++ b/share/regions/config_734.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2de" SimName="734" SimLocationX="1030" SimLocationY="1022" Datastore="store_734_x14_y45.yap" SimListenPort="9834" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_735.xml b/share/regions/config_735.xml
new file mode 100644
index 0000000..78386fe
--- /dev/null
+++ b/share/regions/config_735.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2df" SimName="735" SimLocationX="1031" SimLocationY="1022" Datastore="store_735_x15_y45.yap" SimListenPort="9835" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-30.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_736.xml b/share/regions/config_736.xml
new file mode 100644
index 0000000..2001880
--- /dev/null
+++ b/share/regions/config_736.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e0" SimName="736" SimLocationX="1000" SimLocationY="1023" Datastore="store_736_x00_y46.yap" SimListenPort="9836" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_737.xml b/share/regions/config_737.xml
new file mode 100644
index 0000000..8e73b25
--- /dev/null
+++ b/share/regions/config_737.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e1" SimName="737" SimLocationX="1001" SimLocationY="1023" Datastore="store_737_x01_y46.yap" SimListenPort="9837" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_738.xml b/share/regions/config_738.xml
new file mode 100644
index 0000000..c27bea7
--- /dev/null
+++ b/share/regions/config_738.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e2" SimName="738" SimLocationX="1002" SimLocationY="1023" Datastore="store_738_x02_y46.yap" SimListenPort="9838" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_739.xml b/share/regions/config_739.xml
new file mode 100644
index 0000000..2a59512
--- /dev/null
+++ b/share/regions/config_739.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e3" SimName="739" SimLocationX="1003" SimLocationY="1023" Datastore="store_739_x03_y46.yap" SimListenPort="9839" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_74.xml b/share/regions/config_74.xml
new file mode 100644
index 0000000..d1955d5
--- /dev/null
+++ b/share/regions/config_74.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf04a" SimName="74" SimLocationX="1010" SimLocationY="1002" Datastore="store_74_x10_y04.yap" SimListenPort="9174" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_740.xml b/share/regions/config_740.xml
new file mode 100644
index 0000000..21948b2
--- /dev/null
+++ b/share/regions/config_740.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e4" SimName="740" SimLocationX="1004" SimLocationY="1023" Datastore="store_740_x04_y46.yap" SimListenPort="9840" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_741.xml b/share/regions/config_741.xml
new file mode 100644
index 0000000..f3c5719
--- /dev/null
+++ b/share/regions/config_741.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e5" SimName="741" SimLocationX="1005" SimLocationY="1023" Datastore="store_741_x05_y46.yap" SimListenPort="9841" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_742.xml b/share/regions/config_742.xml
new file mode 100644
index 0000000..d545076
--- /dev/null
+++ b/share/regions/config_742.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e6" SimName="742" SimLocationX="1006" SimLocationY="1023" Datastore="store_742_x06_y46.yap" SimListenPort="9842" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_743.xml b/share/regions/config_743.xml
new file mode 100644
index 0000000..6bc85e7
--- /dev/null
+++ b/share/regions/config_743.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e7" SimName="743" SimLocationX="1007" SimLocationY="1023" Datastore="store_743_x07_y46.yap" SimListenPort="9843" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_744.xml b/share/regions/config_744.xml
new file mode 100644
index 0000000..c6b0084
--- /dev/null
+++ b/share/regions/config_744.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e8" SimName="744" SimLocationX="1008" SimLocationY="1023" Datastore="store_744_x08_y46.yap" SimListenPort="9844" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_745.xml b/share/regions/config_745.xml
new file mode 100644
index 0000000..726cbe4
--- /dev/null
+++ b/share/regions/config_745.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2e9" SimName="745" SimLocationX="1009" SimLocationY="1023" Datastore="store_745_x09_y46.yap" SimListenPort="9845" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_746.xml b/share/regions/config_746.xml
new file mode 100644
index 0000000..8352089
--- /dev/null
+++ b/share/regions/config_746.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ea" SimName="746" SimLocationX="1010" SimLocationY="1023" Datastore="store_746_x10_y46.yap" SimListenPort="9846" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_747.xml b/share/regions/config_747.xml
new file mode 100644
index 0000000..6b3f7bb
--- /dev/null
+++ b/share/regions/config_747.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2eb" SimName="747" SimLocationX="1011" SimLocationY="1023" Datastore="store_747_x11_y46.yap" SimListenPort="9847" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_748.xml b/share/regions/config_748.xml
new file mode 100644
index 0000000..df21b05
--- /dev/null
+++ b/share/regions/config_748.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ec" SimName="748" SimLocationX="1012" SimLocationY="1023" Datastore="store_748_x12_y46.yap" SimListenPort="9848" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_749.xml b/share/regions/config_749.xml
new file mode 100644
index 0000000..ef66c7b
--- /dev/null
+++ b/share/regions/config_749.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ed" SimName="749" SimLocationX="1013" SimLocationY="1023" Datastore="store_749_x13_y46.yap" SimListenPort="9849" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_75.xml b/share/regions/config_75.xml
new file mode 100644
index 0000000..6849f9e
--- /dev/null
+++ b/share/regions/config_75.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf04b" SimName="75" SimLocationX="1011" SimLocationY="1002" Datastore="store_75_x11_y04.yap" SimListenPort="9175" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_750.xml b/share/regions/config_750.xml
new file mode 100644
index 0000000..d86e2af
--- /dev/null
+++ b/share/regions/config_750.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ee" SimName="750" SimLocationX="1014" SimLocationY="1023" Datastore="store_750_x14_y46.yap" SimListenPort="9850" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_751.xml b/share/regions/config_751.xml
new file mode 100644
index 0000000..84d4b55
--- /dev/null
+++ b/share/regions/config_751.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ef" SimName="751" SimLocationX="1015" SimLocationY="1023" Datastore="store_751_x15_y46.yap" SimListenPort="9851" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-31.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_752.xml b/share/regions/config_752.xml
new file mode 100644
index 0000000..4c29c01
--- /dev/null
+++ b/share/regions/config_752.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f0" SimName="752" SimLocationX="1016" SimLocationY="1023" Datastore="store_752_x00_y47.yap" SimListenPort="9852" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_753.xml b/share/regions/config_753.xml
new file mode 100644
index 0000000..4967672
--- /dev/null
+++ b/share/regions/config_753.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f1" SimName="753" SimLocationX="1017" SimLocationY="1023" Datastore="store_753_x01_y47.yap" SimListenPort="9853" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_754.xml b/share/regions/config_754.xml
new file mode 100644
index 0000000..9963821
--- /dev/null
+++ b/share/regions/config_754.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f2" SimName="754" SimLocationX="1018" SimLocationY="1023" Datastore="store_754_x02_y47.yap" SimListenPort="9854" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_755.xml b/share/regions/config_755.xml
new file mode 100644
index 0000000..f4dc0a0
--- /dev/null
+++ b/share/regions/config_755.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f3" SimName="755" SimLocationX="1019" SimLocationY="1023" Datastore="store_755_x03_y47.yap" SimListenPort="9855" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_756.xml b/share/regions/config_756.xml
new file mode 100644
index 0000000..027d8fd
--- /dev/null
+++ b/share/regions/config_756.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f4" SimName="756" SimLocationX="1020" SimLocationY="1023" Datastore="store_756_x04_y47.yap" SimListenPort="9856" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_757.xml b/share/regions/config_757.xml
new file mode 100644
index 0000000..053ad3f
--- /dev/null
+++ b/share/regions/config_757.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f5" SimName="757" SimLocationX="1021" SimLocationY="1023" Datastore="store_757_x05_y47.yap" SimListenPort="9857" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_758.xml b/share/regions/config_758.xml
new file mode 100644
index 0000000..2a9f270
--- /dev/null
+++ b/share/regions/config_758.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f6" SimName="758" SimLocationX="1022" SimLocationY="1023" Datastore="store_758_x06_y47.yap" SimListenPort="9858" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_759.xml b/share/regions/config_759.xml
new file mode 100644
index 0000000..fb00e58
--- /dev/null
+++ b/share/regions/config_759.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f7" SimName="759" SimLocationX="1023" SimLocationY="1023" Datastore="store_759_x07_y47.yap" SimListenPort="9859" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_76.xml b/share/regions/config_76.xml
new file mode 100644
index 0000000..55cb583
--- /dev/null
+++ b/share/regions/config_76.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf04c" SimName="76" SimLocationX="1012" SimLocationY="1002" Datastore="store_76_x12_y04.yap" SimListenPort="9176" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_760.xml b/share/regions/config_760.xml
new file mode 100644
index 0000000..da23a264
--- /dev/null
+++ b/share/regions/config_760.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f8" SimName="760" SimLocationX="1024" SimLocationY="1023" Datastore="store_760_x08_y47.yap" SimListenPort="9860" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_761.xml b/share/regions/config_761.xml
new file mode 100644
index 0000000..fd1d1bf
--- /dev/null
+++ b/share/regions/config_761.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2f9" SimName="761" SimLocationX="1025" SimLocationY="1023" Datastore="store_761_x09_y47.yap" SimListenPort="9861" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_762.xml b/share/regions/config_762.xml
new file mode 100644
index 0000000..9da782a
--- /dev/null
+++ b/share/regions/config_762.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2fa" SimName="762" SimLocationX="1026" SimLocationY="1023" Datastore="store_762_x10_y47.yap" SimListenPort="9862" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_763.xml b/share/regions/config_763.xml
new file mode 100644
index 0000000..eb8ae20
--- /dev/null
+++ b/share/regions/config_763.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2fb" SimName="763" SimLocationX="1027" SimLocationY="1023" Datastore="store_763_x11_y47.yap" SimListenPort="9863" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_764.xml b/share/regions/config_764.xml
new file mode 100644
index 0000000..db700e8
--- /dev/null
+++ b/share/regions/config_764.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2fc" SimName="764" SimLocationX="1028" SimLocationY="1023" Datastore="store_764_x12_y47.yap" SimListenPort="9864" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_765.xml b/share/regions/config_765.xml
new file mode 100644
index 0000000..dcd8fb5
--- /dev/null
+++ b/share/regions/config_765.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2fd" SimName="765" SimLocationX="1029" SimLocationY="1023" Datastore="store_765_x13_y47.yap" SimListenPort="9865" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_766.xml b/share/regions/config_766.xml
new file mode 100644
index 0000000..42d7ca1
--- /dev/null
+++ b/share/regions/config_766.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2fe" SimName="766" SimLocationX="1030" SimLocationY="1023" Datastore="store_766_x14_y47.yap" SimListenPort="9866" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_767.xml b/share/regions/config_767.xml
new file mode 100644
index 0000000..26c871f
--- /dev/null
+++ b/share/regions/config_767.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf2ff" SimName="767" SimLocationX="1031" SimLocationY="1023" Datastore="store_767_x15_y47.yap" SimListenPort="9867" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-32.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_768.xml b/share/regions/config_768.xml
new file mode 100644
index 0000000..2f03610
--- /dev/null
+++ b/share/regions/config_768.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf300" SimName="768" SimLocationX="1000" SimLocationY="1024" Datastore="store_768_x00_y48.yap" SimListenPort="9868" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_769.xml b/share/regions/config_769.xml
new file mode 100644
index 0000000..e203642
--- /dev/null
+++ b/share/regions/config_769.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf301" SimName="769" SimLocationX="1001" SimLocationY="1024" Datastore="store_769_x01_y48.yap" SimListenPort="9869" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_77.xml b/share/regions/config_77.xml
new file mode 100644
index 0000000..098fadb
--- /dev/null
+++ b/share/regions/config_77.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf04d" SimName="77" SimLocationX="1013" SimLocationY="1002" Datastore="store_77_x13_y04.yap" SimListenPort="9177" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_770.xml b/share/regions/config_770.xml
new file mode 100644
index 0000000..4ba6aca
--- /dev/null
+++ b/share/regions/config_770.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf302" SimName="770" SimLocationX="1002" SimLocationY="1024" Datastore="store_770_x02_y48.yap" SimListenPort="9870" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_771.xml b/share/regions/config_771.xml
new file mode 100644
index 0000000..930228b
--- /dev/null
+++ b/share/regions/config_771.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf303" SimName="771" SimLocationX="1003" SimLocationY="1024" Datastore="store_771_x03_y48.yap" SimListenPort="9871" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_772.xml b/share/regions/config_772.xml
new file mode 100644
index 0000000..89b63c7
--- /dev/null
+++ b/share/regions/config_772.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf304" SimName="772" SimLocationX="1004" SimLocationY="1024" Datastore="store_772_x04_y48.yap" SimListenPort="9872" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_773.xml b/share/regions/config_773.xml
new file mode 100644
index 0000000..3fd3ebb
--- /dev/null
+++ b/share/regions/config_773.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf305" SimName="773" SimLocationX="1005" SimLocationY="1024" Datastore="store_773_x05_y48.yap" SimListenPort="9873" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_774.xml b/share/regions/config_774.xml
new file mode 100644
index 0000000..00bc7ea
--- /dev/null
+++ b/share/regions/config_774.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf306" SimName="774" SimLocationX="1006" SimLocationY="1024" Datastore="store_774_x06_y48.yap" SimListenPort="9874" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_775.xml b/share/regions/config_775.xml
new file mode 100644
index 0000000..8b5a0e4
--- /dev/null
+++ b/share/regions/config_775.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf307" SimName="775" SimLocationX="1007" SimLocationY="1024" Datastore="store_775_x07_y48.yap" SimListenPort="9875" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_776.xml b/share/regions/config_776.xml
new file mode 100644
index 0000000..6ce71f7
--- /dev/null
+++ b/share/regions/config_776.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf308" SimName="776" SimLocationX="1008" SimLocationY="1024" Datastore="store_776_x08_y48.yap" SimListenPort="9876" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_777.xml b/share/regions/config_777.xml
new file mode 100644
index 0000000..3dc2da2
--- /dev/null
+++ b/share/regions/config_777.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf309" SimName="777" SimLocationX="1009" SimLocationY="1024" Datastore="store_777_x09_y48.yap" SimListenPort="9877" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_778.xml b/share/regions/config_778.xml
new file mode 100644
index 0000000..90c422e
--- /dev/null
+++ b/share/regions/config_778.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf30a" SimName="778" SimLocationX="1010" SimLocationY="1024" Datastore="store_778_x10_y48.yap" SimListenPort="9878" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_779.xml b/share/regions/config_779.xml
new file mode 100644
index 0000000..61bc661
--- /dev/null
+++ b/share/regions/config_779.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf30b" SimName="779" SimLocationX="1011" SimLocationY="1024" Datastore="store_779_x11_y48.yap" SimListenPort="9879" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_78.xml b/share/regions/config_78.xml
new file mode 100644
index 0000000..ad83220
--- /dev/null
+++ b/share/regions/config_78.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf04e" SimName="78" SimLocationX="1014" SimLocationY="1002" Datastore="store_78_x14_y04.yap" SimListenPort="9178" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_780.xml b/share/regions/config_780.xml
new file mode 100644
index 0000000..2a37177
--- /dev/null
+++ b/share/regions/config_780.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf30c" SimName="780" SimLocationX="1012" SimLocationY="1024" Datastore="store_780_x12_y48.yap" SimListenPort="9880" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_781.xml b/share/regions/config_781.xml
new file mode 100644
index 0000000..27abcfb
--- /dev/null
+++ b/share/regions/config_781.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf30d" SimName="781" SimLocationX="1013" SimLocationY="1024" Datastore="store_781_x13_y48.yap" SimListenPort="9881" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_782.xml b/share/regions/config_782.xml
new file mode 100644
index 0000000..7307283
--- /dev/null
+++ b/share/regions/config_782.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf30e" SimName="782" SimLocationX="1014" SimLocationY="1024" Datastore="store_782_x14_y48.yap" SimListenPort="9882" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_783.xml b/share/regions/config_783.xml
new file mode 100644
index 0000000..b27f4cc
--- /dev/null
+++ b/share/regions/config_783.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf30f" SimName="783" SimLocationX="1015" SimLocationY="1024" Datastore="store_783_x15_y48.yap" SimListenPort="9883" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-33.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_784.xml b/share/regions/config_784.xml
new file mode 100644
index 0000000..50c1d5a
--- /dev/null
+++ b/share/regions/config_784.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf310" SimName="784" SimLocationX="1016" SimLocationY="1024" Datastore="store_784_x00_y49.yap" SimListenPort="9884" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_785.xml b/share/regions/config_785.xml
new file mode 100644
index 0000000..4449502
--- /dev/null
+++ b/share/regions/config_785.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf311" SimName="785" SimLocationX="1017" SimLocationY="1024" Datastore="store_785_x01_y49.yap" SimListenPort="9885" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_786.xml b/share/regions/config_786.xml
new file mode 100644
index 0000000..3987f24
--- /dev/null
+++ b/share/regions/config_786.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf312" SimName="786" SimLocationX="1018" SimLocationY="1024" Datastore="store_786_x02_y49.yap" SimListenPort="9886" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_787.xml b/share/regions/config_787.xml
new file mode 100644
index 0000000..226675a
--- /dev/null
+++ b/share/regions/config_787.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf313" SimName="787" SimLocationX="1019" SimLocationY="1024" Datastore="store_787_x03_y49.yap" SimListenPort="9887" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_788.xml b/share/regions/config_788.xml
new file mode 100644
index 0000000..0d2b063
--- /dev/null
+++ b/share/regions/config_788.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf314" SimName="788" SimLocationX="1020" SimLocationY="1024" Datastore="store_788_x04_y49.yap" SimListenPort="9888" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_789.xml b/share/regions/config_789.xml
new file mode 100644
index 0000000..340351d
--- /dev/null
+++ b/share/regions/config_789.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf315" SimName="789" SimLocationX="1021" SimLocationY="1024" Datastore="store_789_x05_y49.yap" SimListenPort="9889" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_79.xml b/share/regions/config_79.xml
new file mode 100644
index 0000000..04cbad1
--- /dev/null
+++ b/share/regions/config_79.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf04f" SimName="79" SimLocationX="1015" SimLocationY="1002" Datastore="store_79_x15_y04.yap" SimListenPort="9179" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y11.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_790.xml b/share/regions/config_790.xml
new file mode 100644
index 0000000..5a0f061
--- /dev/null
+++ b/share/regions/config_790.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf316" SimName="790" SimLocationX="1022" SimLocationY="1024" Datastore="store_790_x06_y49.yap" SimListenPort="9890" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_791.xml b/share/regions/config_791.xml
new file mode 100644
index 0000000..712e3e4
--- /dev/null
+++ b/share/regions/config_791.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf317" SimName="791" SimLocationX="1023" SimLocationY="1024" Datastore="store_791_x07_y49.yap" SimListenPort="9891" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_792.xml b/share/regions/config_792.xml
new file mode 100644
index 0000000..36d1b4f
--- /dev/null
+++ b/share/regions/config_792.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf318" SimName="792" SimLocationX="1024" SimLocationY="1024" Datastore="store_792_x08_y49.yap" SimListenPort="9892" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_793.xml b/share/regions/config_793.xml
new file mode 100644
index 0000000..777df87
--- /dev/null
+++ b/share/regions/config_793.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf319" SimName="793" SimLocationX="1025" SimLocationY="1024" Datastore="store_793_x09_y49.yap" SimListenPort="9893" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_794.xml b/share/regions/config_794.xml
new file mode 100644
index 0000000..0fe4c96
--- /dev/null
+++ b/share/regions/config_794.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf31a" SimName="794" SimLocationX="1026" SimLocationY="1024" Datastore="store_794_x10_y49.yap" SimListenPort="9894" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_795.xml b/share/regions/config_795.xml
new file mode 100644
index 0000000..a830ff1
--- /dev/null
+++ b/share/regions/config_795.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf31b" SimName="795" SimLocationX="1027" SimLocationY="1024" Datastore="store_795_x11_y49.yap" SimListenPort="9895" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_796.xml b/share/regions/config_796.xml
new file mode 100644
index 0000000..4bb7ead
--- /dev/null
+++ b/share/regions/config_796.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf31c" SimName="796" SimLocationX="1028" SimLocationY="1024" Datastore="store_796_x12_y49.yap" SimListenPort="9896" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_797.xml b/share/regions/config_797.xml
new file mode 100644
index 0000000..84465a3
--- /dev/null
+++ b/share/regions/config_797.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf31d" SimName="797" SimLocationX="1029" SimLocationY="1024" Datastore="store_797_x13_y49.yap" SimListenPort="9897" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_798.xml b/share/regions/config_798.xml
new file mode 100644
index 0000000..b7327c6
--- /dev/null
+++ b/share/regions/config_798.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf31e" SimName="798" SimLocationX="1030" SimLocationY="1024" Datastore="store_798_x14_y49.yap" SimListenPort="9898" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_799.xml b/share/regions/config_799.xml
new file mode 100644
index 0000000..d810bcd
--- /dev/null
+++ b/share/regions/config_799.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf31f" SimName="799" SimLocationX="1031" SimLocationY="1024" Datastore="store_799_x15_y49.yap" SimListenPort="9899" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-34.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_8.xml b/share/regions/config_8.xml
new file mode 100644
index 0000000..b4be610
--- /dev/null
+++ b/share/regions/config_8.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf008" SimName="8" SimLocationX="1008" SimLocationY="1000" Datastore="store_8_x08_y00.yap" SimListenPort="9108" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_80.xml b/share/regions/config_80.xml
new file mode 100644
index 0000000..f3613ce
--- /dev/null
+++ b/share/regions/config_80.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf050" SimName="80" SimLocationX="1016" SimLocationY="1002" Datastore="store_80_x00_y05.yap" SimListenPort="9180" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_800.xml b/share/regions/config_800.xml
new file mode 100644
index 0000000..3d467d7
--- /dev/null
+++ b/share/regions/config_800.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf320" SimName="800" SimLocationX="1000" SimLocationY="1025" Datastore="store_800_x00_y50.yap" SimListenPort="9900" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_801.xml b/share/regions/config_801.xml
new file mode 100644
index 0000000..8e58788
--- /dev/null
+++ b/share/regions/config_801.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf321" SimName="801" SimLocationX="1001" SimLocationY="1025" Datastore="store_801_x01_y50.yap" SimListenPort="9901" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_802.xml b/share/regions/config_802.xml
new file mode 100644
index 0000000..b91ee06
--- /dev/null
+++ b/share/regions/config_802.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf322" SimName="802" SimLocationX="1002" SimLocationY="1025" Datastore="store_802_x02_y50.yap" SimListenPort="9902" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_803.xml b/share/regions/config_803.xml
new file mode 100644
index 0000000..797e25b
--- /dev/null
+++ b/share/regions/config_803.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf323" SimName="803" SimLocationX="1003" SimLocationY="1025" Datastore="store_803_x03_y50.yap" SimListenPort="9903" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_804.xml b/share/regions/config_804.xml
new file mode 100644
index 0000000..fbb552b
--- /dev/null
+++ b/share/regions/config_804.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf324" SimName="804" SimLocationX="1004" SimLocationY="1025" Datastore="store_804_x04_y50.yap" SimListenPort="9904" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_805.xml b/share/regions/config_805.xml
new file mode 100644
index 0000000..c2813a7
--- /dev/null
+++ b/share/regions/config_805.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf325" SimName="805" SimLocationX="1005" SimLocationY="1025" Datastore="store_805_x05_y50.yap" SimListenPort="9905" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_806.xml b/share/regions/config_806.xml
new file mode 100644
index 0000000..5ddfcb4
--- /dev/null
+++ b/share/regions/config_806.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf326" SimName="806" SimLocationX="1006" SimLocationY="1025" Datastore="store_806_x06_y50.yap" SimListenPort="9906" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_807.xml b/share/regions/config_807.xml
new file mode 100644
index 0000000..ebb9b3e
--- /dev/null
+++ b/share/regions/config_807.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf327" SimName="807" SimLocationX="1007" SimLocationY="1025" Datastore="store_807_x07_y50.yap" SimListenPort="9907" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_808.xml b/share/regions/config_808.xml
new file mode 100644
index 0000000..6718f13
--- /dev/null
+++ b/share/regions/config_808.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf328" SimName="808" SimLocationX="1008" SimLocationY="1025" Datastore="store_808_x08_y50.yap" SimListenPort="9908" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_809.xml b/share/regions/config_809.xml
new file mode 100644
index 0000000..cbe981a
--- /dev/null
+++ b/share/regions/config_809.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf329" SimName="809" SimLocationX="1009" SimLocationY="1025" Datastore="store_809_x09_y50.yap" SimListenPort="9909" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_81.xml b/share/regions/config_81.xml
new file mode 100644
index 0000000..ee52bf7
--- /dev/null
+++ b/share/regions/config_81.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf051" SimName="81" SimLocationX="1017" SimLocationY="1002" Datastore="store_81_x01_y05.yap" SimListenPort="9181" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_810.xml b/share/regions/config_810.xml
new file mode 100644
index 0000000..8dfcdec
--- /dev/null
+++ b/share/regions/config_810.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf32a" SimName="810" SimLocationX="1010" SimLocationY="1025" Datastore="store_810_x10_y50.yap" SimListenPort="9910" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_811.xml b/share/regions/config_811.xml
new file mode 100644
index 0000000..1eaaa83
--- /dev/null
+++ b/share/regions/config_811.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf32b" SimName="811" SimLocationX="1011" SimLocationY="1025" Datastore="store_811_x11_y50.yap" SimListenPort="9911" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_812.xml b/share/regions/config_812.xml
new file mode 100644
index 0000000..a5e7f49
--- /dev/null
+++ b/share/regions/config_812.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf32c" SimName="812" SimLocationX="1012" SimLocationY="1025" Datastore="store_812_x12_y50.yap" SimListenPort="9912" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_813.xml b/share/regions/config_813.xml
new file mode 100644
index 0000000..991d105
--- /dev/null
+++ b/share/regions/config_813.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf32d" SimName="813" SimLocationX="1013" SimLocationY="1025" Datastore="store_813_x13_y50.yap" SimListenPort="9913" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_814.xml b/share/regions/config_814.xml
new file mode 100644
index 0000000..c7ea360
--- /dev/null
+++ b/share/regions/config_814.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf32e" SimName="814" SimLocationX="1014" SimLocationY="1025" Datastore="store_814_x14_y50.yap" SimListenPort="9914" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_815.xml b/share/regions/config_815.xml
new file mode 100644
index 0000000..813f64b
--- /dev/null
+++ b/share/regions/config_815.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf32f" SimName="815" SimLocationX="1015" SimLocationY="1025" Datastore="store_815_x15_y50.yap" SimListenPort="9915" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-35.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_816.xml b/share/regions/config_816.xml
new file mode 100644
index 0000000..a15e217
--- /dev/null
+++ b/share/regions/config_816.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf330" SimName="816" SimLocationX="1016" SimLocationY="1025" Datastore="store_816_x00_y51.yap" SimListenPort="9916" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_817.xml b/share/regions/config_817.xml
new file mode 100644
index 0000000..81e6c67
--- /dev/null
+++ b/share/regions/config_817.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf331" SimName="817" SimLocationX="1017" SimLocationY="1025" Datastore="store_817_x01_y51.yap" SimListenPort="9917" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_818.xml b/share/regions/config_818.xml
new file mode 100644
index 0000000..18a9086
--- /dev/null
+++ b/share/regions/config_818.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf332" SimName="818" SimLocationX="1018" SimLocationY="1025" Datastore="store_818_x02_y51.yap" SimListenPort="9918" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_819.xml b/share/regions/config_819.xml
new file mode 100644
index 0000000..7b207ad
--- /dev/null
+++ b/share/regions/config_819.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf333" SimName="819" SimLocationX="1019" SimLocationY="1025" Datastore="store_819_x03_y51.yap" SimListenPort="9919" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_82.xml b/share/regions/config_82.xml
new file mode 100644
index 0000000..d74644d
--- /dev/null
+++ b/share/regions/config_82.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf052" SimName="82" SimLocationX="1018" SimLocationY="1002" Datastore="store_82_x02_y05.yap" SimListenPort="9182" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_820.xml b/share/regions/config_820.xml
new file mode 100644
index 0000000..d6b65c5
--- /dev/null
+++ b/share/regions/config_820.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf334" SimName="820" SimLocationX="1020" SimLocationY="1025" Datastore="store_820_x04_y51.yap" SimListenPort="9920" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_821.xml b/share/regions/config_821.xml
new file mode 100644
index 0000000..49cf8ba
--- /dev/null
+++ b/share/regions/config_821.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf335" SimName="821" SimLocationX="1021" SimLocationY="1025" Datastore="store_821_x05_y51.yap" SimListenPort="9921" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_822.xml b/share/regions/config_822.xml
new file mode 100644
index 0000000..2ef23f1
--- /dev/null
+++ b/share/regions/config_822.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf336" SimName="822" SimLocationX="1022" SimLocationY="1025" Datastore="store_822_x06_y51.yap" SimListenPort="9922" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_823.xml b/share/regions/config_823.xml
new file mode 100644
index 0000000..f317ab9
--- /dev/null
+++ b/share/regions/config_823.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf337" SimName="823" SimLocationX="1023" SimLocationY="1025" Datastore="store_823_x07_y51.yap" SimListenPort="9923" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_824.xml b/share/regions/config_824.xml
new file mode 100644
index 0000000..b0e22a4
--- /dev/null
+++ b/share/regions/config_824.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf338" SimName="824" SimLocationX="1024" SimLocationY="1025" Datastore="store_824_x08_y51.yap" SimListenPort="9924" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_825.xml b/share/regions/config_825.xml
new file mode 100644
index 0000000..282bd47
--- /dev/null
+++ b/share/regions/config_825.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf339" SimName="825" SimLocationX="1025" SimLocationY="1025" Datastore="store_825_x09_y51.yap" SimListenPort="9925" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_826.xml b/share/regions/config_826.xml
new file mode 100644
index 0000000..3093150
--- /dev/null
+++ b/share/regions/config_826.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf33a" SimName="826" SimLocationX="1026" SimLocationY="1025" Datastore="store_826_x10_y51.yap" SimListenPort="9926" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_827.xml b/share/regions/config_827.xml
new file mode 100644
index 0000000..4608a28
--- /dev/null
+++ b/share/regions/config_827.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf33b" SimName="827" SimLocationX="1027" SimLocationY="1025" Datastore="store_827_x11_y51.yap" SimListenPort="9927" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_828.xml b/share/regions/config_828.xml
new file mode 100644
index 0000000..4bba5e4
--- /dev/null
+++ b/share/regions/config_828.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf33c" SimName="828" SimLocationX="1028" SimLocationY="1025" Datastore="store_828_x12_y51.yap" SimListenPort="9928" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_829.xml b/share/regions/config_829.xml
new file mode 100644
index 0000000..bd0e7db
--- /dev/null
+++ b/share/regions/config_829.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf33d" SimName="829" SimLocationX="1029" SimLocationY="1025" Datastore="store_829_x13_y51.yap" SimListenPort="9929" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_83.xml b/share/regions/config_83.xml
new file mode 100644
index 0000000..eea085c
--- /dev/null
+++ b/share/regions/config_83.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf053" SimName="83" SimLocationX="1019" SimLocationY="1002" Datastore="store_83_x03_y05.yap" SimListenPort="9183" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_830.xml b/share/regions/config_830.xml
new file mode 100644
index 0000000..118864d
--- /dev/null
+++ b/share/regions/config_830.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf33e" SimName="830" SimLocationX="1030" SimLocationY="1025" Datastore="store_830_x14_y51.yap" SimListenPort="9930" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_831.xml b/share/regions/config_831.xml
new file mode 100644
index 0000000..6f3b420
--- /dev/null
+++ b/share/regions/config_831.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf33f" SimName="831" SimLocationX="1031" SimLocationY="1025" Datastore="store_831_x15_y51.yap" SimListenPort="9931" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-36.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_832.xml b/share/regions/config_832.xml
new file mode 100644
index 0000000..7578fa6
--- /dev/null
+++ b/share/regions/config_832.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf340" SimName="832" SimLocationX="1000" SimLocationY="1026" Datastore="store_832_x00_y52.yap" SimListenPort="9932" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_833.xml b/share/regions/config_833.xml
new file mode 100644
index 0000000..e526d62
--- /dev/null
+++ b/share/regions/config_833.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf341" SimName="833" SimLocationX="1001" SimLocationY="1026" Datastore="store_833_x01_y52.yap" SimListenPort="9933" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_834.xml b/share/regions/config_834.xml
new file mode 100644
index 0000000..d7b6c57
--- /dev/null
+++ b/share/regions/config_834.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf342" SimName="834" SimLocationX="1002" SimLocationY="1026" Datastore="store_834_x02_y52.yap" SimListenPort="9934" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_835.xml b/share/regions/config_835.xml
new file mode 100644
index 0000000..0dc42d2
--- /dev/null
+++ b/share/regions/config_835.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf343" SimName="835" SimLocationX="1003" SimLocationY="1026" Datastore="store_835_x03_y52.yap" SimListenPort="9935" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_836.xml b/share/regions/config_836.xml
new file mode 100644
index 0000000..a937d60
--- /dev/null
+++ b/share/regions/config_836.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf344" SimName="836" SimLocationX="1004" SimLocationY="1026" Datastore="store_836_x04_y52.yap" SimListenPort="9936" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_837.xml b/share/regions/config_837.xml
new file mode 100644
index 0000000..b9900fc
--- /dev/null
+++ b/share/regions/config_837.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf345" SimName="837" SimLocationX="1005" SimLocationY="1026" Datastore="store_837_x05_y52.yap" SimListenPort="9937" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_838.xml b/share/regions/config_838.xml
new file mode 100644
index 0000000..9c4c909
--- /dev/null
+++ b/share/regions/config_838.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf346" SimName="838" SimLocationX="1006" SimLocationY="1026" Datastore="store_838_x06_y52.yap" SimListenPort="9938" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_839.xml b/share/regions/config_839.xml
new file mode 100644
index 0000000..b9e76e6
--- /dev/null
+++ b/share/regions/config_839.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf347" SimName="839" SimLocationX="1007" SimLocationY="1026" Datastore="store_839_x07_y52.yap" SimListenPort="9939" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_84.xml b/share/regions/config_84.xml
new file mode 100644
index 0000000..c5ecb24
--- /dev/null
+++ b/share/regions/config_84.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf054" SimName="84" SimLocationX="1020" SimLocationY="1002" Datastore="store_84_x04_y05.yap" SimListenPort="9184" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_840.xml b/share/regions/config_840.xml
new file mode 100644
index 0000000..89d5da2
--- /dev/null
+++ b/share/regions/config_840.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf348" SimName="840" SimLocationX="1008" SimLocationY="1026" Datastore="store_840_x08_y52.yap" SimListenPort="9940" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_841.xml b/share/regions/config_841.xml
new file mode 100644
index 0000000..f1727da
--- /dev/null
+++ b/share/regions/config_841.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf349" SimName="841" SimLocationX="1009" SimLocationY="1026" Datastore="store_841_x09_y52.yap" SimListenPort="9941" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_842.xml b/share/regions/config_842.xml
new file mode 100644
index 0000000..b3cb8c3
--- /dev/null
+++ b/share/regions/config_842.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf34a" SimName="842" SimLocationX="1010" SimLocationY="1026" Datastore="store_842_x10_y52.yap" SimListenPort="9942" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_843.xml b/share/regions/config_843.xml
new file mode 100644
index 0000000..aca572c
--- /dev/null
+++ b/share/regions/config_843.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf34b" SimName="843" SimLocationX="1011" SimLocationY="1026" Datastore="store_843_x11_y52.yap" SimListenPort="9943" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_844.xml b/share/regions/config_844.xml
new file mode 100644
index 0000000..7fddd7e
--- /dev/null
+++ b/share/regions/config_844.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf34c" SimName="844" SimLocationX="1012" SimLocationY="1026" Datastore="store_844_x12_y52.yap" SimListenPort="9944" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_845.xml b/share/regions/config_845.xml
new file mode 100644
index 0000000..fe70502
--- /dev/null
+++ b/share/regions/config_845.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf34d" SimName="845" SimLocationX="1013" SimLocationY="1026" Datastore="store_845_x13_y52.yap" SimListenPort="9945" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_846.xml b/share/regions/config_846.xml
new file mode 100644
index 0000000..f2230ff
--- /dev/null
+++ b/share/regions/config_846.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf34e" SimName="846" SimLocationX="1014" SimLocationY="1026" Datastore="store_846_x14_y52.yap" SimListenPort="9946" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_847.xml b/share/regions/config_847.xml
new file mode 100644
index 0000000..433bbc0
--- /dev/null
+++ b/share/regions/config_847.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf34f" SimName="847" SimLocationX="1015" SimLocationY="1026" Datastore="store_847_x15_y52.yap" SimListenPort="9947" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-37.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_848.xml b/share/regions/config_848.xml
new file mode 100644
index 0000000..ef82380
--- /dev/null
+++ b/share/regions/config_848.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf350" SimName="848" SimLocationX="1016" SimLocationY="1026" Datastore="store_848_x00_y53.yap" SimListenPort="9948" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_849.xml b/share/regions/config_849.xml
new file mode 100644
index 0000000..991e279
--- /dev/null
+++ b/share/regions/config_849.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf351" SimName="849" SimLocationX="1017" SimLocationY="1026" Datastore="store_849_x01_y53.yap" SimListenPort="9949" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_85.xml b/share/regions/config_85.xml
new file mode 100644
index 0000000..c180750
--- /dev/null
+++ b/share/regions/config_85.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf055" SimName="85" SimLocationX="1021" SimLocationY="1002" Datastore="store_85_x05_y05.yap" SimListenPort="9185" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_850.xml b/share/regions/config_850.xml
new file mode 100644
index 0000000..440eb71
--- /dev/null
+++ b/share/regions/config_850.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf352" SimName="850" SimLocationX="1018" SimLocationY="1026" Datastore="store_850_x02_y53.yap" SimListenPort="9950" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_851.xml b/share/regions/config_851.xml
new file mode 100644
index 0000000..5fe3b64
--- /dev/null
+++ b/share/regions/config_851.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf353" SimName="851" SimLocationX="1019" SimLocationY="1026" Datastore="store_851_x03_y53.yap" SimListenPort="9951" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_852.xml b/share/regions/config_852.xml
new file mode 100644
index 0000000..a1513ba
--- /dev/null
+++ b/share/regions/config_852.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf354" SimName="852" SimLocationX="1020" SimLocationY="1026" Datastore="store_852_x04_y53.yap" SimListenPort="9952" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_853.xml b/share/regions/config_853.xml
new file mode 100644
index 0000000..b2e572a
--- /dev/null
+++ b/share/regions/config_853.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf355" SimName="853" SimLocationX="1021" SimLocationY="1026" Datastore="store_853_x05_y53.yap" SimListenPort="9953" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_854.xml b/share/regions/config_854.xml
new file mode 100644
index 0000000..aff8b91
--- /dev/null
+++ b/share/regions/config_854.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf356" SimName="854" SimLocationX="1022" SimLocationY="1026" Datastore="store_854_x06_y53.yap" SimListenPort="9954" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_855.xml b/share/regions/config_855.xml
new file mode 100644
index 0000000..115e960
--- /dev/null
+++ b/share/regions/config_855.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf357" SimName="855" SimLocationX="1023" SimLocationY="1026" Datastore="store_855_x07_y53.yap" SimListenPort="9955" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_856.xml b/share/regions/config_856.xml
new file mode 100644
index 0000000..40b79fd
--- /dev/null
+++ b/share/regions/config_856.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf358" SimName="856" SimLocationX="1024" SimLocationY="1026" Datastore="store_856_x08_y53.yap" SimListenPort="9956" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_857.xml b/share/regions/config_857.xml
new file mode 100644
index 0000000..a4e114c
--- /dev/null
+++ b/share/regions/config_857.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf359" SimName="857" SimLocationX="1025" SimLocationY="1026" Datastore="store_857_x09_y53.yap" SimListenPort="9957" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_858.xml b/share/regions/config_858.xml
new file mode 100644
index 0000000..2881865
--- /dev/null
+++ b/share/regions/config_858.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf35a" SimName="858" SimLocationX="1026" SimLocationY="1026" Datastore="store_858_x10_y53.yap" SimListenPort="9958" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_859.xml b/share/regions/config_859.xml
new file mode 100644
index 0000000..865a470
--- /dev/null
+++ b/share/regions/config_859.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf35b" SimName="859" SimLocationX="1027" SimLocationY="1026" Datastore="store_859_x11_y53.yap" SimListenPort="9959" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_86.xml b/share/regions/config_86.xml
new file mode 100644
index 0000000..9b14bb1
--- /dev/null
+++ b/share/regions/config_86.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf056" SimName="86" SimLocationX="1022" SimLocationY="1002" Datastore="store_86_x06_y05.yap" SimListenPort="9186" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_860.xml b/share/regions/config_860.xml
new file mode 100644
index 0000000..71062cd
--- /dev/null
+++ b/share/regions/config_860.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf35c" SimName="860" SimLocationX="1028" SimLocationY="1026" Datastore="store_860_x12_y53.yap" SimListenPort="9960" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_861.xml b/share/regions/config_861.xml
new file mode 100644
index 0000000..d828145
--- /dev/null
+++ b/share/regions/config_861.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf35d" SimName="861" SimLocationX="1029" SimLocationY="1026" Datastore="store_861_x13_y53.yap" SimListenPort="9961" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_862.xml b/share/regions/config_862.xml
new file mode 100644
index 0000000..0700999
--- /dev/null
+++ b/share/regions/config_862.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf35e" SimName="862" SimLocationX="1030" SimLocationY="1026" Datastore="store_862_x14_y53.yap" SimListenPort="9962" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_863.xml b/share/regions/config_863.xml
new file mode 100644
index 0000000..954d08c
--- /dev/null
+++ b/share/regions/config_863.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf35f" SimName="863" SimLocationX="1031" SimLocationY="1026" Datastore="store_863_x15_y53.yap" SimListenPort="9963" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-38.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_864.xml b/share/regions/config_864.xml
new file mode 100644
index 0000000..68918af
--- /dev/null
+++ b/share/regions/config_864.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf360" SimName="864" SimLocationX="1000" SimLocationY="1027" Datastore="store_864_x00_y54.yap" SimListenPort="9964" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_865.xml b/share/regions/config_865.xml
new file mode 100644
index 0000000..adff624
--- /dev/null
+++ b/share/regions/config_865.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf361" SimName="865" SimLocationX="1001" SimLocationY="1027" Datastore="store_865_x01_y54.yap" SimListenPort="9965" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_866.xml b/share/regions/config_866.xml
new file mode 100644
index 0000000..0ffd723
--- /dev/null
+++ b/share/regions/config_866.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf362" SimName="866" SimLocationX="1002" SimLocationY="1027" Datastore="store_866_x02_y54.yap" SimListenPort="9966" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_867.xml b/share/regions/config_867.xml
new file mode 100644
index 0000000..94e112f
--- /dev/null
+++ b/share/regions/config_867.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf363" SimName="867" SimLocationX="1003" SimLocationY="1027" Datastore="store_867_x03_y54.yap" SimListenPort="9967" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_868.xml b/share/regions/config_868.xml
new file mode 100644
index 0000000..9b794ed
--- /dev/null
+++ b/share/regions/config_868.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf364" SimName="868" SimLocationX="1004" SimLocationY="1027" Datastore="store_868_x04_y54.yap" SimListenPort="9968" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_869.xml b/share/regions/config_869.xml
new file mode 100644
index 0000000..c2b5405
--- /dev/null
+++ b/share/regions/config_869.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf365" SimName="869" SimLocationX="1005" SimLocationY="1027" Datastore="store_869_x05_y54.yap" SimListenPort="9969" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_87.xml b/share/regions/config_87.xml
new file mode 100644
index 0000000..bd39935
--- /dev/null
+++ b/share/regions/config_87.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf057" SimName="87" SimLocationX="1023" SimLocationY="1002" Datastore="store_87_x07_y05.yap" SimListenPort="9187" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_870.xml b/share/regions/config_870.xml
new file mode 100644
index 0000000..6220e45
--- /dev/null
+++ b/share/regions/config_870.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf366" SimName="870" SimLocationX="1006" SimLocationY="1027" Datastore="store_870_x06_y54.yap" SimListenPort="9970" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_871.xml b/share/regions/config_871.xml
new file mode 100644
index 0000000..79be33d
--- /dev/null
+++ b/share/regions/config_871.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf367" SimName="871" SimLocationX="1007" SimLocationY="1027" Datastore="store_871_x07_y54.yap" SimListenPort="9971" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_872.xml b/share/regions/config_872.xml
new file mode 100644
index 0000000..4d864d5
--- /dev/null
+++ b/share/regions/config_872.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf368" SimName="872" SimLocationX="1008" SimLocationY="1027" Datastore="store_872_x08_y54.yap" SimListenPort="9972" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_873.xml b/share/regions/config_873.xml
new file mode 100644
index 0000000..592fa53
--- /dev/null
+++ b/share/regions/config_873.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf369" SimName="873" SimLocationX="1009" SimLocationY="1027" Datastore="store_873_x09_y54.yap" SimListenPort="9973" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_874.xml b/share/regions/config_874.xml
new file mode 100644
index 0000000..6347776
--- /dev/null
+++ b/share/regions/config_874.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf36a" SimName="874" SimLocationX="1010" SimLocationY="1027" Datastore="store_874_x10_y54.yap" SimListenPort="9974" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_875.xml b/share/regions/config_875.xml
new file mode 100644
index 0000000..2c91a9f
--- /dev/null
+++ b/share/regions/config_875.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf36b" SimName="875" SimLocationX="1011" SimLocationY="1027" Datastore="store_875_x11_y54.yap" SimListenPort="9975" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_876.xml b/share/regions/config_876.xml
new file mode 100644
index 0000000..662ece3
--- /dev/null
+++ b/share/regions/config_876.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf36c" SimName="876" SimLocationX="1012" SimLocationY="1027" Datastore="store_876_x12_y54.yap" SimListenPort="9976" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_877.xml b/share/regions/config_877.xml
new file mode 100644
index 0000000..4015a98
--- /dev/null
+++ b/share/regions/config_877.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf36d" SimName="877" SimLocationX="1013" SimLocationY="1027" Datastore="store_877_x13_y54.yap" SimListenPort="9977" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_878.xml b/share/regions/config_878.xml
new file mode 100644
index 0000000..49d452c
--- /dev/null
+++ b/share/regions/config_878.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf36e" SimName="878" SimLocationX="1014" SimLocationY="1027" Datastore="store_878_x14_y54.yap" SimListenPort="9978" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_879.xml b/share/regions/config_879.xml
new file mode 100644
index 0000000..363e9b0
--- /dev/null
+++ b/share/regions/config_879.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf36f" SimName="879" SimLocationX="1015" SimLocationY="1027" Datastore="store_879_x15_y54.yap" SimListenPort="9979" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-39.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_88.xml b/share/regions/config_88.xml
new file mode 100644
index 0000000..a180aee
--- /dev/null
+++ b/share/regions/config_88.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf058" SimName="88" SimLocationX="1024" SimLocationY="1002" Datastore="store_88_x08_y05.yap" SimListenPort="9188" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_880.xml b/share/regions/config_880.xml
new file mode 100644
index 0000000..8f00bd3
--- /dev/null
+++ b/share/regions/config_880.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf370" SimName="880" SimLocationX="1016" SimLocationY="1027" Datastore="store_880_x00_y55.yap" SimListenPort="9980" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_881.xml b/share/regions/config_881.xml
new file mode 100644
index 0000000..bec63f2
--- /dev/null
+++ b/share/regions/config_881.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf371" SimName="881" SimLocationX="1017" SimLocationY="1027" Datastore="store_881_x01_y55.yap" SimListenPort="9981" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_882.xml b/share/regions/config_882.xml
new file mode 100644
index 0000000..745f1b2
--- /dev/null
+++ b/share/regions/config_882.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf372" SimName="882" SimLocationX="1018" SimLocationY="1027" Datastore="store_882_x02_y55.yap" SimListenPort="9982" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_883.xml b/share/regions/config_883.xml
new file mode 100644
index 0000000..4d88d25
--- /dev/null
+++ b/share/regions/config_883.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf373" SimName="883" SimLocationX="1019" SimLocationY="1027" Datastore="store_883_x03_y55.yap" SimListenPort="9983" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_884.xml b/share/regions/config_884.xml
new file mode 100644
index 0000000..bc1e55b
--- /dev/null
+++ b/share/regions/config_884.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf374" SimName="884" SimLocationX="1020" SimLocationY="1027" Datastore="store_884_x04_y55.yap" SimListenPort="9984" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_885.xml b/share/regions/config_885.xml
new file mode 100644
index 0000000..e0e94a8
--- /dev/null
+++ b/share/regions/config_885.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf375" SimName="885" SimLocationX="1021" SimLocationY="1027" Datastore="store_885_x05_y55.yap" SimListenPort="9985" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_886.xml b/share/regions/config_886.xml
new file mode 100644
index 0000000..1f18106
--- /dev/null
+++ b/share/regions/config_886.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf376" SimName="886" SimLocationX="1022" SimLocationY="1027" Datastore="store_886_x06_y55.yap" SimListenPort="9986" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_887.xml b/share/regions/config_887.xml
new file mode 100644
index 0000000..318304a
--- /dev/null
+++ b/share/regions/config_887.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf377" SimName="887" SimLocationX="1023" SimLocationY="1027" Datastore="store_887_x07_y55.yap" SimListenPort="9987" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_888.xml b/share/regions/config_888.xml
new file mode 100644
index 0000000..c073f6d
--- /dev/null
+++ b/share/regions/config_888.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf378" SimName="888" SimLocationX="1024" SimLocationY="1027" Datastore="store_888_x08_y55.yap" SimListenPort="9988" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_889.xml b/share/regions/config_889.xml
new file mode 100644
index 0000000..944bff7
--- /dev/null
+++ b/share/regions/config_889.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf379" SimName="889" SimLocationX="1025" SimLocationY="1027" Datastore="store_889_x09_y55.yap" SimListenPort="9989" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_89.xml b/share/regions/config_89.xml
new file mode 100644
index 0000000..8a50594
--- /dev/null
+++ b/share/regions/config_89.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf059" SimName="89" SimLocationX="1025" SimLocationY="1002" Datastore="store_89_x09_y05.yap" SimListenPort="9189" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_890.xml b/share/regions/config_890.xml
new file mode 100644
index 0000000..a587c10
--- /dev/null
+++ b/share/regions/config_890.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf37a" SimName="890" SimLocationX="1026" SimLocationY="1027" Datastore="store_890_x10_y55.yap" SimListenPort="9990" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_891.xml b/share/regions/config_891.xml
new file mode 100644
index 0000000..16b1c82
--- /dev/null
+++ b/share/regions/config_891.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf37b" SimName="891" SimLocationX="1027" SimLocationY="1027" Datastore="store_891_x11_y55.yap" SimListenPort="9991" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_892.xml b/share/regions/config_892.xml
new file mode 100644
index 0000000..d1b3545
--- /dev/null
+++ b/share/regions/config_892.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf37c" SimName="892" SimLocationX="1028" SimLocationY="1027" Datastore="store_892_x12_y55.yap" SimListenPort="9992" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_893.xml b/share/regions/config_893.xml
new file mode 100644
index 0000000..77e3e51
--- /dev/null
+++ b/share/regions/config_893.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf37d" SimName="893" SimLocationX="1029" SimLocationY="1027" Datastore="store_893_x13_y55.yap" SimListenPort="9993" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_894.xml b/share/regions/config_894.xml
new file mode 100644
index 0000000..f313e48
--- /dev/null
+++ b/share/regions/config_894.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf37e" SimName="894" SimLocationX="1030" SimLocationY="1027" Datastore="store_894_x14_y55.yap" SimListenPort="9994" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_895.xml b/share/regions/config_895.xml
new file mode 100644
index 0000000..4e5204c
--- /dev/null
+++ b/share/regions/config_895.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf37f" SimName="895" SimLocationX="1031" SimLocationY="1027" Datastore="store_895_x15_y55.yap" SimListenPort="9995" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-40.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_896.xml b/share/regions/config_896.xml
new file mode 100644
index 0000000..54de294
--- /dev/null
+++ b/share/regions/config_896.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf380" SimName="896" SimLocationX="1000" SimLocationY="1028" Datastore="store_896_x00_y56.yap" SimListenPort="9996" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_897.xml b/share/regions/config_897.xml
new file mode 100644
index 0000000..0a7ca98
--- /dev/null
+++ b/share/regions/config_897.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf381" SimName="897" SimLocationX="1001" SimLocationY="1028" Datastore="store_897_x01_y56.yap" SimListenPort="9997" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_898.xml b/share/regions/config_898.xml
new file mode 100644
index 0000000..919b69e
--- /dev/null
+++ b/share/regions/config_898.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf382" SimName="898" SimLocationX="1002" SimLocationY="1028" Datastore="store_898_x02_y56.yap" SimListenPort="9998" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_899.xml b/share/regions/config_899.xml
new file mode 100644
index 0000000..b379919
--- /dev/null
+++ b/share/regions/config_899.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf383" SimName="899" SimLocationX="1003" SimLocationY="1028" Datastore="store_899_x03_y56.yap" SimListenPort="9999" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_9.xml b/share/regions/config_9.xml
new file mode 100644
index 0000000..ab795c9
--- /dev/null
+++ b/share/regions/config_9.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf009" SimName="9" SimLocationX="1009" SimLocationY="1000" Datastore="store_9_x09_y00.yap" SimListenPort="9109" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y15.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_90.xml b/share/regions/config_90.xml
new file mode 100644
index 0000000..1493d48
--- /dev/null
+++ b/share/regions/config_90.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf05a" SimName="90" SimLocationX="1026" SimLocationY="1002" Datastore="store_90_x10_y05.yap" SimListenPort="9190" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_900.xml b/share/regions/config_900.xml
new file mode 100644
index 0000000..9f0b217
--- /dev/null
+++ b/share/regions/config_900.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf384" SimName="900" SimLocationX="1004" SimLocationY="1028" Datastore="store_900_x04_y56.yap" SimListenPort="10000" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_901.xml b/share/regions/config_901.xml
new file mode 100644
index 0000000..2c7f4d0
--- /dev/null
+++ b/share/regions/config_901.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf385" SimName="901" SimLocationX="1005" SimLocationY="1028" Datastore="store_901_x05_y56.yap" SimListenPort="10001" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_902.xml b/share/regions/config_902.xml
new file mode 100644
index 0000000..4e353df
--- /dev/null
+++ b/share/regions/config_902.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf386" SimName="902" SimLocationX="1006" SimLocationY="1028" Datastore="store_902_x06_y56.yap" SimListenPort="10002" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_903.xml b/share/regions/config_903.xml
new file mode 100644
index 0000000..1c95582
--- /dev/null
+++ b/share/regions/config_903.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf387" SimName="903" SimLocationX="1007" SimLocationY="1028" Datastore="store_903_x07_y56.yap" SimListenPort="10003" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_904.xml b/share/regions/config_904.xml
new file mode 100644
index 0000000..7e007a7
--- /dev/null
+++ b/share/regions/config_904.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf388" SimName="904" SimLocationX="1008" SimLocationY="1028" Datastore="store_904_x08_y56.yap" SimListenPort="10004" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_905.xml b/share/regions/config_905.xml
new file mode 100644
index 0000000..fe91207
--- /dev/null
+++ b/share/regions/config_905.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf389" SimName="905" SimLocationX="1009" SimLocationY="1028" Datastore="store_905_x09_y56.yap" SimListenPort="10005" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_906.xml b/share/regions/config_906.xml
new file mode 100644
index 0000000..5d69d23
--- /dev/null
+++ b/share/regions/config_906.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf38a" SimName="906" SimLocationX="1010" SimLocationY="1028" Datastore="store_906_x10_y56.yap" SimListenPort="10006" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_907.xml b/share/regions/config_907.xml
new file mode 100644
index 0000000..f8efb84
--- /dev/null
+++ b/share/regions/config_907.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf38b" SimName="907" SimLocationX="1011" SimLocationY="1028" Datastore="store_907_x11_y56.yap" SimListenPort="10007" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_908.xml b/share/regions/config_908.xml
new file mode 100644
index 0000000..f17d7b3
--- /dev/null
+++ b/share/regions/config_908.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf38c" SimName="908" SimLocationX="1012" SimLocationY="1028" Datastore="store_908_x12_y56.yap" SimListenPort="10008" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_909.xml b/share/regions/config_909.xml
new file mode 100644
index 0000000..cfd5fb1
--- /dev/null
+++ b/share/regions/config_909.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf38d" SimName="909" SimLocationX="1013" SimLocationY="1028" Datastore="store_909_x13_y56.yap" SimListenPort="10009" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_91.xml b/share/regions/config_91.xml
new file mode 100644
index 0000000..3d25728
--- /dev/null
+++ b/share/regions/config_91.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf05b" SimName="91" SimLocationX="1027" SimLocationY="1002" Datastore="store_91_x11_y05.yap" SimListenPort="9191" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_910.xml b/share/regions/config_910.xml
new file mode 100644
index 0000000..ddaa044
--- /dev/null
+++ b/share/regions/config_910.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf38e" SimName="910" SimLocationX="1014" SimLocationY="1028" Datastore="store_910_x14_y56.yap" SimListenPort="10010" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_911.xml b/share/regions/config_911.xml
new file mode 100644
index 0000000..405cf70
--- /dev/null
+++ b/share/regions/config_911.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf38f" SimName="911" SimLocationX="1015" SimLocationY="1028" Datastore="store_911_x15_y56.yap" SimListenPort="10011" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-41.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_912.xml b/share/regions/config_912.xml
new file mode 100644
index 0000000..88298bd
--- /dev/null
+++ b/share/regions/config_912.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf390" SimName="912" SimLocationX="1016" SimLocationY="1028" Datastore="store_912_x00_y57.yap" SimListenPort="10012" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_913.xml b/share/regions/config_913.xml
new file mode 100644
index 0000000..ae50f3f
--- /dev/null
+++ b/share/regions/config_913.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf391" SimName="913" SimLocationX="1017" SimLocationY="1028" Datastore="store_913_x01_y57.yap" SimListenPort="10013" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_914.xml b/share/regions/config_914.xml
new file mode 100644
index 0000000..bc51b2d
--- /dev/null
+++ b/share/regions/config_914.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf392" SimName="914" SimLocationX="1018" SimLocationY="1028" Datastore="store_914_x02_y57.yap" SimListenPort="10014" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_915.xml b/share/regions/config_915.xml
new file mode 100644
index 0000000..492a463
--- /dev/null
+++ b/share/regions/config_915.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf393" SimName="915" SimLocationX="1019" SimLocationY="1028" Datastore="store_915_x03_y57.yap" SimListenPort="10015" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_916.xml b/share/regions/config_916.xml
new file mode 100644
index 0000000..2d11875
--- /dev/null
+++ b/share/regions/config_916.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf394" SimName="916" SimLocationX="1020" SimLocationY="1028" Datastore="store_916_x04_y57.yap" SimListenPort="10016" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_917.xml b/share/regions/config_917.xml
new file mode 100644
index 0000000..4ff3d2d
--- /dev/null
+++ b/share/regions/config_917.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf395" SimName="917" SimLocationX="1021" SimLocationY="1028" Datastore="store_917_x05_y57.yap" SimListenPort="10017" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_918.xml b/share/regions/config_918.xml
new file mode 100644
index 0000000..985dd0f
--- /dev/null
+++ b/share/regions/config_918.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf396" SimName="918" SimLocationX="1022" SimLocationY="1028" Datastore="store_918_x06_y57.yap" SimListenPort="10018" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_919.xml b/share/regions/config_919.xml
new file mode 100644
index 0000000..6fdace3
--- /dev/null
+++ b/share/regions/config_919.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf397" SimName="919" SimLocationX="1023" SimLocationY="1028" Datastore="store_919_x07_y57.yap" SimListenPort="10019" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_92.xml b/share/regions/config_92.xml
new file mode 100644
index 0000000..7484e94
--- /dev/null
+++ b/share/regions/config_92.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf05c" SimName="92" SimLocationX="1028" SimLocationY="1002" Datastore="store_92_x12_y05.yap" SimListenPort="9192" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_920.xml b/share/regions/config_920.xml
new file mode 100644
index 0000000..a1ae514
--- /dev/null
+++ b/share/regions/config_920.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf398" SimName="920" SimLocationX="1024" SimLocationY="1028" Datastore="store_920_x08_y57.yap" SimListenPort="10020" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_921.xml b/share/regions/config_921.xml
new file mode 100644
index 0000000..44e612a
--- /dev/null
+++ b/share/regions/config_921.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf399" SimName="921" SimLocationX="1025" SimLocationY="1028" Datastore="store_921_x09_y57.yap" SimListenPort="10021" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_922.xml b/share/regions/config_922.xml
new file mode 100644
index 0000000..3d19b64
--- /dev/null
+++ b/share/regions/config_922.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf39a" SimName="922" SimLocationX="1026" SimLocationY="1028" Datastore="store_922_x10_y57.yap" SimListenPort="10022" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_923.xml b/share/regions/config_923.xml
new file mode 100644
index 0000000..343ac3f
--- /dev/null
+++ b/share/regions/config_923.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf39b" SimName="923" SimLocationX="1027" SimLocationY="1028" Datastore="store_923_x11_y57.yap" SimListenPort="10023" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_924.xml b/share/regions/config_924.xml
new file mode 100644
index 0000000..ddcfa10
--- /dev/null
+++ b/share/regions/config_924.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf39c" SimName="924" SimLocationX="1028" SimLocationY="1028" Datastore="store_924_x12_y57.yap" SimListenPort="10024" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_925.xml b/share/regions/config_925.xml
new file mode 100644
index 0000000..bd8308a
--- /dev/null
+++ b/share/regions/config_925.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf39d" SimName="925" SimLocationX="1029" SimLocationY="1028" Datastore="store_925_x13_y57.yap" SimListenPort="10025" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_926.xml b/share/regions/config_926.xml
new file mode 100644
index 0000000..8771df5
--- /dev/null
+++ b/share/regions/config_926.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf39e" SimName="926" SimLocationX="1030" SimLocationY="1028" Datastore="store_926_x14_y57.yap" SimListenPort="10026" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_927.xml b/share/regions/config_927.xml
new file mode 100644
index 0000000..2275d3a
--- /dev/null
+++ b/share/regions/config_927.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf39f" SimName="927" SimLocationX="1031" SimLocationY="1028" Datastore="store_927_x15_y57.yap" SimListenPort="10027" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-42.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_928.xml b/share/regions/config_928.xml
new file mode 100644
index 0000000..347bf87
--- /dev/null
+++ b/share/regions/config_928.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a0" SimName="928" SimLocationX="1000" SimLocationY="1029" Datastore="store_928_x00_y58.yap" SimListenPort="10028" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_929.xml b/share/regions/config_929.xml
new file mode 100644
index 0000000..a7ed82b
--- /dev/null
+++ b/share/regions/config_929.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a1" SimName="929" SimLocationX="1001" SimLocationY="1029" Datastore="store_929_x01_y58.yap" SimListenPort="10029" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_93.xml b/share/regions/config_93.xml
new file mode 100644
index 0000000..922e9c8
--- /dev/null
+++ b/share/regions/config_93.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf05d" SimName="93" SimLocationX="1029" SimLocationY="1002" Datastore="store_93_x13_y05.yap" SimListenPort="9193" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_930.xml b/share/regions/config_930.xml
new file mode 100644
index 0000000..0aa90f7
--- /dev/null
+++ b/share/regions/config_930.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a2" SimName="930" SimLocationX="1002" SimLocationY="1029" Datastore="store_930_x02_y58.yap" SimListenPort="10030" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_931.xml b/share/regions/config_931.xml
new file mode 100644
index 0000000..b8f520b
--- /dev/null
+++ b/share/regions/config_931.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a3" SimName="931" SimLocationX="1003" SimLocationY="1029" Datastore="store_931_x03_y58.yap" SimListenPort="10031" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_932.xml b/share/regions/config_932.xml
new file mode 100644
index 0000000..2bc2aea
--- /dev/null
+++ b/share/regions/config_932.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a4" SimName="932" SimLocationX="1004" SimLocationY="1029" Datastore="store_932_x04_y58.yap" SimListenPort="10032" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_933.xml b/share/regions/config_933.xml
new file mode 100644
index 0000000..a1cdc75
--- /dev/null
+++ b/share/regions/config_933.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a5" SimName="933" SimLocationX="1005" SimLocationY="1029" Datastore="store_933_x05_y58.yap" SimListenPort="10033" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_934.xml b/share/regions/config_934.xml
new file mode 100644
index 0000000..0a893c1
--- /dev/null
+++ b/share/regions/config_934.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a6" SimName="934" SimLocationX="1006" SimLocationY="1029" Datastore="store_934_x06_y58.yap" SimListenPort="10034" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_935.xml b/share/regions/config_935.xml
new file mode 100644
index 0000000..d4de084
--- /dev/null
+++ b/share/regions/config_935.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a7" SimName="935" SimLocationX="1007" SimLocationY="1029" Datastore="store_935_x07_y58.yap" SimListenPort="10035" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_936.xml b/share/regions/config_936.xml
new file mode 100644
index 0000000..70b40b4
--- /dev/null
+++ b/share/regions/config_936.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a8" SimName="936" SimLocationX="1008" SimLocationY="1029" Datastore="store_936_x08_y58.yap" SimListenPort="10036" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_937.xml b/share/regions/config_937.xml
new file mode 100644
index 0000000..6fd7316
--- /dev/null
+++ b/share/regions/config_937.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3a9" SimName="937" SimLocationX="1009" SimLocationY="1029" Datastore="store_937_x09_y58.yap" SimListenPort="10037" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_938.xml b/share/regions/config_938.xml
new file mode 100644
index 0000000..cf8d865
--- /dev/null
+++ b/share/regions/config_938.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3aa" SimName="938" SimLocationX="1010" SimLocationY="1029" Datastore="store_938_x10_y58.yap" SimListenPort="10038" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_939.xml b/share/regions/config_939.xml
new file mode 100644
index 0000000..18e724e
--- /dev/null
+++ b/share/regions/config_939.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ab" SimName="939" SimLocationX="1011" SimLocationY="1029" Datastore="store_939_x11_y58.yap" SimListenPort="10039" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_94.xml b/share/regions/config_94.xml
new file mode 100644
index 0000000..47e8187
--- /dev/null
+++ b/share/regions/config_94.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf05e" SimName="94" SimLocationX="1030" SimLocationY="1002" Datastore="store_94_x14_y05.yap" SimListenPort="9194" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_940.xml b/share/regions/config_940.xml
new file mode 100644
index 0000000..5803c20
--- /dev/null
+++ b/share/regions/config_940.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ac" SimName="940" SimLocationX="1012" SimLocationY="1029" Datastore="store_940_x12_y58.yap" SimListenPort="10040" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_941.xml b/share/regions/config_941.xml
new file mode 100644
index 0000000..186feff
--- /dev/null
+++ b/share/regions/config_941.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ad" SimName="941" SimLocationX="1013" SimLocationY="1029" Datastore="store_941_x13_y58.yap" SimListenPort="10041" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_942.xml b/share/regions/config_942.xml
new file mode 100644
index 0000000..264557b
--- /dev/null
+++ b/share/regions/config_942.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ae" SimName="942" SimLocationX="1014" SimLocationY="1029" Datastore="store_942_x14_y58.yap" SimListenPort="10042" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_943.xml b/share/regions/config_943.xml
new file mode 100644
index 0000000..3f6a272
--- /dev/null
+++ b/share/regions/config_943.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3af" SimName="943" SimLocationX="1015" SimLocationY="1029" Datastore="store_943_x15_y58.yap" SimListenPort="10043" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-43.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_944.xml b/share/regions/config_944.xml
new file mode 100644
index 0000000..f244937
--- /dev/null
+++ b/share/regions/config_944.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b0" SimName="944" SimLocationX="1016" SimLocationY="1029" Datastore="store_944_x00_y59.yap" SimListenPort="10044" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_945.xml b/share/regions/config_945.xml
new file mode 100644
index 0000000..0a0e9e6
--- /dev/null
+++ b/share/regions/config_945.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b1" SimName="945" SimLocationX="1017" SimLocationY="1029" Datastore="store_945_x01_y59.yap" SimListenPort="10045" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_946.xml b/share/regions/config_946.xml
new file mode 100644
index 0000000..dbca9e1
--- /dev/null
+++ b/share/regions/config_946.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b2" SimName="946" SimLocationX="1018" SimLocationY="1029" Datastore="store_946_x02_y59.yap" SimListenPort="10046" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_947.xml b/share/regions/config_947.xml
new file mode 100644
index 0000000..e0d2ef5
--- /dev/null
+++ b/share/regions/config_947.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b3" SimName="947" SimLocationX="1019" SimLocationY="1029" Datastore="store_947_x03_y59.yap" SimListenPort="10047" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_948.xml b/share/regions/config_948.xml
new file mode 100644
index 0000000..92476ef
--- /dev/null
+++ b/share/regions/config_948.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b4" SimName="948" SimLocationX="1020" SimLocationY="1029" Datastore="store_948_x04_y59.yap" SimListenPort="10048" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_949.xml b/share/regions/config_949.xml
new file mode 100644
index 0000000..41a97e7
--- /dev/null
+++ b/share/regions/config_949.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b5" SimName="949" SimLocationX="1021" SimLocationY="1029" Datastore="store_949_x05_y59.yap" SimListenPort="10049" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_95.xml b/share/regions/config_95.xml
new file mode 100644
index 0000000..930a609
--- /dev/null
+++ b/share/regions/config_95.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf05f" SimName="95" SimLocationX="1031" SimLocationY="1002" Datastore="store_95_x15_y05.yap" SimListenPort="9195" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y10.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_950.xml b/share/regions/config_950.xml
new file mode 100644
index 0000000..e772291
--- /dev/null
+++ b/share/regions/config_950.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b6" SimName="950" SimLocationX="1022" SimLocationY="1029" Datastore="store_950_x06_y59.yap" SimListenPort="10050" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_951.xml b/share/regions/config_951.xml
new file mode 100644
index 0000000..50a0631
--- /dev/null
+++ b/share/regions/config_951.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b7" SimName="951" SimLocationX="1023" SimLocationY="1029" Datastore="store_951_x07_y59.yap" SimListenPort="10051" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_952.xml b/share/regions/config_952.xml
new file mode 100644
index 0000000..9c2bc5e
--- /dev/null
+++ b/share/regions/config_952.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b8" SimName="952" SimLocationX="1024" SimLocationY="1029" Datastore="store_952_x08_y59.yap" SimListenPort="10052" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_953.xml b/share/regions/config_953.xml
new file mode 100644
index 0000000..d8342fc
--- /dev/null
+++ b/share/regions/config_953.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3b9" SimName="953" SimLocationX="1025" SimLocationY="1029" Datastore="store_953_x09_y59.yap" SimListenPort="10053" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_954.xml b/share/regions/config_954.xml
new file mode 100644
index 0000000..685d074
--- /dev/null
+++ b/share/regions/config_954.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ba" SimName="954" SimLocationX="1026" SimLocationY="1029" Datastore="store_954_x10_y59.yap" SimListenPort="10054" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_955.xml b/share/regions/config_955.xml
new file mode 100644
index 0000000..52dfa18
--- /dev/null
+++ b/share/regions/config_955.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3bb" SimName="955" SimLocationX="1027" SimLocationY="1029" Datastore="store_955_x11_y59.yap" SimListenPort="10055" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_956.xml b/share/regions/config_956.xml
new file mode 100644
index 0000000..8ed9e2b
--- /dev/null
+++ b/share/regions/config_956.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3bc" SimName="956" SimLocationX="1028" SimLocationY="1029" Datastore="store_956_x12_y59.yap" SimListenPort="10056" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_957.xml b/share/regions/config_957.xml
new file mode 100644
index 0000000..3e9fe73
--- /dev/null
+++ b/share/regions/config_957.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3bd" SimName="957" SimLocationX="1029" SimLocationY="1029" Datastore="store_957_x13_y59.yap" SimListenPort="10057" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_958.xml b/share/regions/config_958.xml
new file mode 100644
index 0000000..3636698
--- /dev/null
+++ b/share/regions/config_958.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3be" SimName="958" SimLocationX="1030" SimLocationY="1029" Datastore="store_958_x14_y59.yap" SimListenPort="10058" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_959.xml b/share/regions/config_959.xml
new file mode 100644
index 0000000..3202187
--- /dev/null
+++ b/share/regions/config_959.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3bf" SimName="959" SimLocationX="1031" SimLocationY="1029" Datastore="store_959_x15_y59.yap" SimListenPort="10059" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-44.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_96.xml b/share/regions/config_96.xml
new file mode 100644
index 0000000..9227a91
--- /dev/null
+++ b/share/regions/config_96.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf060" SimName="96" SimLocationX="1000" SimLocationY="1003" Datastore="store_96_x00_y06.yap" SimListenPort="9196" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_960.xml b/share/regions/config_960.xml
new file mode 100644
index 0000000..8bf372c
--- /dev/null
+++ b/share/regions/config_960.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c0" SimName="960" SimLocationX="1000" SimLocationY="1030" Datastore="store_960_x00_y60.yap" SimListenPort="10060" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_961.xml b/share/regions/config_961.xml
new file mode 100644
index 0000000..2bc4c13
--- /dev/null
+++ b/share/regions/config_961.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c1" SimName="961" SimLocationX="1001" SimLocationY="1030" Datastore="store_961_x01_y60.yap" SimListenPort="10061" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_962.xml b/share/regions/config_962.xml
new file mode 100644
index 0000000..80a3554
--- /dev/null
+++ b/share/regions/config_962.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c2" SimName="962" SimLocationX="1002" SimLocationY="1030" Datastore="store_962_x02_y60.yap" SimListenPort="10062" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_963.xml b/share/regions/config_963.xml
new file mode 100644
index 0000000..17b9f93
--- /dev/null
+++ b/share/regions/config_963.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c3" SimName="963" SimLocationX="1003" SimLocationY="1030" Datastore="store_963_x03_y60.yap" SimListenPort="10063" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_964.xml b/share/regions/config_964.xml
new file mode 100644
index 0000000..823730e
--- /dev/null
+++ b/share/regions/config_964.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c4" SimName="964" SimLocationX="1004" SimLocationY="1030" Datastore="store_964_x04_y60.yap" SimListenPort="10064" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_965.xml b/share/regions/config_965.xml
new file mode 100644
index 0000000..8260f46
--- /dev/null
+++ b/share/regions/config_965.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c5" SimName="965" SimLocationX="1005" SimLocationY="1030" Datastore="store_965_x05_y60.yap" SimListenPort="10065" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_966.xml b/share/regions/config_966.xml
new file mode 100644
index 0000000..16afa28
--- /dev/null
+++ b/share/regions/config_966.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c6" SimName="966" SimLocationX="1006" SimLocationY="1030" Datastore="store_966_x06_y60.yap" SimListenPort="10066" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_967.xml b/share/regions/config_967.xml
new file mode 100644
index 0000000..dd7876a
--- /dev/null
+++ b/share/regions/config_967.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c7" SimName="967" SimLocationX="1007" SimLocationY="1030" Datastore="store_967_x07_y60.yap" SimListenPort="10067" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_968.xml b/share/regions/config_968.xml
new file mode 100644
index 0000000..0e62f7b
--- /dev/null
+++ b/share/regions/config_968.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c8" SimName="968" SimLocationX="1008" SimLocationY="1030" Datastore="store_968_x08_y60.yap" SimListenPort="10068" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_969.xml b/share/regions/config_969.xml
new file mode 100644
index 0000000..69c6091
--- /dev/null
+++ b/share/regions/config_969.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3c9" SimName="969" SimLocationX="1009" SimLocationY="1030" Datastore="store_969_x09_y60.yap" SimListenPort="10069" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_97.xml b/share/regions/config_97.xml
new file mode 100644
index 0000000..533c926
--- /dev/null
+++ b/share/regions/config_97.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf061" SimName="97" SimLocationX="1001" SimLocationY="1003" Datastore="store_97_x01_y06.yap" SimListenPort="9197" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_970.xml b/share/regions/config_970.xml
new file mode 100644
index 0000000..738b338
--- /dev/null
+++ b/share/regions/config_970.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ca" SimName="970" SimLocationX="1010" SimLocationY="1030" Datastore="store_970_x10_y60.yap" SimListenPort="10070" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_971.xml b/share/regions/config_971.xml
new file mode 100644
index 0000000..814ec0b
--- /dev/null
+++ b/share/regions/config_971.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3cb" SimName="971" SimLocationX="1011" SimLocationY="1030" Datastore="store_971_x11_y60.yap" SimListenPort="10071" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_972.xml b/share/regions/config_972.xml
new file mode 100644
index 0000000..5c6c9f2
--- /dev/null
+++ b/share/regions/config_972.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3cc" SimName="972" SimLocationX="1012" SimLocationY="1030" Datastore="store_972_x12_y60.yap" SimListenPort="10072" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_973.xml b/share/regions/config_973.xml
new file mode 100644
index 0000000..c21e807
--- /dev/null
+++ b/share/regions/config_973.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3cd" SimName="973" SimLocationX="1013" SimLocationY="1030" Datastore="store_973_x13_y60.yap" SimListenPort="10073" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_974.xml b/share/regions/config_974.xml
new file mode 100644
index 0000000..159cfc7
--- /dev/null
+++ b/share/regions/config_974.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3ce" SimName="974" SimLocationX="1014" SimLocationY="1030" Datastore="store_974_x14_y60.yap" SimListenPort="10074" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_975.xml b/share/regions/config_975.xml
new file mode 100644
index 0000000..117a250
--- /dev/null
+++ b/share/regions/config_975.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3cf" SimName="975" SimLocationX="1015" SimLocationY="1030" Datastore="store_975_x15_y60.yap" SimListenPort="10075" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-45.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_976.xml b/share/regions/config_976.xml
new file mode 100644
index 0000000..a910b53
--- /dev/null
+++ b/share/regions/config_976.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d0" SimName="976" SimLocationX="1016" SimLocationY="1030" Datastore="store_976_x00_y61.yap" SimListenPort="10076" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_977.xml b/share/regions/config_977.xml
new file mode 100644
index 0000000..67e5c69
--- /dev/null
+++ b/share/regions/config_977.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d1" SimName="977" SimLocationX="1017" SimLocationY="1030" Datastore="store_977_x01_y61.yap" SimListenPort="10077" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_978.xml b/share/regions/config_978.xml
new file mode 100644
index 0000000..5dc48dd
--- /dev/null
+++ b/share/regions/config_978.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d2" SimName="978" SimLocationX="1018" SimLocationY="1030" Datastore="store_978_x02_y61.yap" SimListenPort="10078" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_979.xml b/share/regions/config_979.xml
new file mode 100644
index 0000000..4054954
--- /dev/null
+++ b/share/regions/config_979.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d3" SimName="979" SimLocationX="1019" SimLocationY="1030" Datastore="store_979_x03_y61.yap" SimListenPort="10079" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_98.xml b/share/regions/config_98.xml
new file mode 100644
index 0000000..111c4a9
--- /dev/null
+++ b/share/regions/config_98.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf062" SimName="98" SimLocationX="1002" SimLocationY="1003" Datastore="store_98_x02_y06.yap" SimListenPort="9198" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_980.xml b/share/regions/config_980.xml
new file mode 100644
index 0000000..75b036f
--- /dev/null
+++ b/share/regions/config_980.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d4" SimName="980" SimLocationX="1020" SimLocationY="1030" Datastore="store_980_x04_y61.yap" SimListenPort="10080" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_981.xml b/share/regions/config_981.xml
new file mode 100644
index 0000000..fd71c85
--- /dev/null
+++ b/share/regions/config_981.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d5" SimName="981" SimLocationX="1021" SimLocationY="1030" Datastore="store_981_x05_y61.yap" SimListenPort="10081" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_982.xml b/share/regions/config_982.xml
new file mode 100644
index 0000000..c33fcec
--- /dev/null
+++ b/share/regions/config_982.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d6" SimName="982" SimLocationX="1022" SimLocationY="1030" Datastore="store_982_x06_y61.yap" SimListenPort="10082" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_983.xml b/share/regions/config_983.xml
new file mode 100644
index 0000000..a989801
--- /dev/null
+++ b/share/regions/config_983.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d7" SimName="983" SimLocationX="1023" SimLocationY="1030" Datastore="store_983_x07_y61.yap" SimListenPort="10083" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_984.xml b/share/regions/config_984.xml
new file mode 100644
index 0000000..d494071
--- /dev/null
+++ b/share/regions/config_984.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d8" SimName="984" SimLocationX="1024" SimLocationY="1030" Datastore="store_984_x08_y61.yap" SimListenPort="10084" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x08_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_985.xml b/share/regions/config_985.xml
new file mode 100644
index 0000000..2239f97
--- /dev/null
+++ b/share/regions/config_985.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3d9" SimName="985" SimLocationX="1025" SimLocationY="1030" Datastore="store_985_x09_y61.yap" SimListenPort="10085" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x09_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_986.xml b/share/regions/config_986.xml
new file mode 100644
index 0000000..67bc5b5
--- /dev/null
+++ b/share/regions/config_986.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3da" SimName="986" SimLocationX="1026" SimLocationY="1030" Datastore="store_986_x10_y61.yap" SimListenPort="10086" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x10_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_987.xml b/share/regions/config_987.xml
new file mode 100644
index 0000000..f4d52bb
--- /dev/null
+++ b/share/regions/config_987.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3db" SimName="987" SimLocationX="1027" SimLocationY="1030" Datastore="store_987_x11_y61.yap" SimListenPort="10087" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x11_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_988.xml b/share/regions/config_988.xml
new file mode 100644
index 0000000..ce12b39
--- /dev/null
+++ b/share/regions/config_988.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3dc" SimName="988" SimLocationX="1028" SimLocationY="1030" Datastore="store_988_x12_y61.yap" SimListenPort="10088" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x12_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_989.xml b/share/regions/config_989.xml
new file mode 100644
index 0000000..dc2c44a
--- /dev/null
+++ b/share/regions/config_989.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3dd" SimName="989" SimLocationX="1029" SimLocationY="1030" Datastore="store_989_x13_y61.yap" SimListenPort="10089" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x13_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_99.xml b/share/regions/config_99.xml
new file mode 100644
index 0000000..4be94a1
--- /dev/null
+++ b/share/regions/config_99.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf063" SimName="99" SimLocationX="1003" SimLocationY="1003" Datastore="store_99_x03_y06.yap" SimListenPort="9199" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y09.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_990.xml b/share/regions/config_990.xml
new file mode 100644
index 0000000..79c26ac
--- /dev/null
+++ b/share/regions/config_990.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3de" SimName="990" SimLocationX="1030" SimLocationY="1030" Datastore="store_990_x14_y61.yap" SimListenPort="10090" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x14_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_991.xml b/share/regions/config_991.xml
new file mode 100644
index 0000000..aefaa04
--- /dev/null
+++ b/share/regions/config_991.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3df" SimName="991" SimLocationX="1031" SimLocationY="1030" Datastore="store_991_x15_y61.yap" SimListenPort="10091" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x15_y-46.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_992.xml b/share/regions/config_992.xml
new file mode 100644
index 0000000..5b777ac
--- /dev/null
+++ b/share/regions/config_992.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e0" SimName="992" SimLocationX="1000" SimLocationY="1031" Datastore="store_992_x00_y62.yap" SimListenPort="10092" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x00_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_993.xml b/share/regions/config_993.xml
new file mode 100644
index 0000000..193dc0f
--- /dev/null
+++ b/share/regions/config_993.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e1" SimName="993" SimLocationX="1001" SimLocationY="1031" Datastore="store_993_x01_y62.yap" SimListenPort="10093" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x01_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_994.xml b/share/regions/config_994.xml
new file mode 100644
index 0000000..2481ec9
--- /dev/null
+++ b/share/regions/config_994.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e2" SimName="994" SimLocationX="1002" SimLocationY="1031" Datastore="store_994_x02_y62.yap" SimListenPort="10094" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x02_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_995.xml b/share/regions/config_995.xml
new file mode 100644
index 0000000..0947860
--- /dev/null
+++ b/share/regions/config_995.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e3" SimName="995" SimLocationX="1003" SimLocationY="1031" Datastore="store_995_x03_y62.yap" SimListenPort="10095" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x03_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_996.xml b/share/regions/config_996.xml
new file mode 100644
index 0000000..94e92ab
--- /dev/null
+++ b/share/regions/config_996.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e4" SimName="996" SimLocationX="1004" SimLocationY="1031" Datastore="store_996_x04_y62.yap" SimListenPort="10096" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x04_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_997.xml b/share/regions/config_997.xml
new file mode 100644
index 0000000..59f280a
--- /dev/null
+++ b/share/regions/config_997.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e5" SimName="997" SimLocationX="1005" SimLocationY="1031" Datastore="store_997_x05_y62.yap" SimListenPort="10097" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x05_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_998.xml b/share/regions/config_998.xml
new file mode 100644
index 0000000..ec78c85
--- /dev/null
+++ b/share/regions/config_998.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e6" SimName="998" SimLocationX="1006" SimLocationY="1031" Datastore="store_998_x06_y62.yap" SimListenPort="10098" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x06_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/regions/config_999.xml b/share/regions/config_999.xml
new file mode 100644
index 0000000..4ec70e4
--- /dev/null
+++ b/share/regions/config_999.xml
@@ -0,0 +1,3 @@
+<Root>
+  <Config SimUUID="e24110fd35684a8ba79651a8c81bf3e7" SimName="999" SimLocationX="1007" SimLocationY="1031" Datastore="store_999_x07_y62.yap" SimListenPort="10099" SimListenAddress="SYSTEMIP" TerrainFile="terrain_x07_y-47.r32" TerrainMultiplier="177.8" MasterAvatarFirstName="Adam" MasterAvatarLastName="Omega" MasterAvatarSandboxPassword="bork" />
+</Root>
diff --git a/share/sql/mysql-agents.sql b/share/sql/mysql-agents.sql
new file mode 100644
index 0000000..8194ca9
--- /dev/null
+++ b/share/sql/mysql-agents.sql
@@ -0,0 +1,24 @@
+SET FOREIGN_KEY_CHECKS=0;
+-- ----------------------------
+-- Table structure for agents
+-- ----------------------------
+CREATE TABLE `agents` (
+  `UUID` varchar(36) NOT NULL,
+  `sessionID` varchar(36) NOT NULL,
+  `secureSessionID` varchar(36) NOT NULL,
+  `agentIP` varchar(16) NOT NULL,
+  `agentPort` int(11) NOT NULL,
+  `agentOnline` tinyint(4) NOT NULL,
+  `loginTime` int(11) NOT NULL,
+  `logoutTime` int(11) NOT NULL,
+  `currentRegion` varchar(36) NOT NULL,
+  `currentHandle` bigint(20) unsigned NOT NULL,
+  `currentPos` varchar(64) NOT NULL,
+  PRIMARY KEY  (`UUID`),
+  UNIQUE KEY `session` (`sessionID`),
+  UNIQUE KEY `ssession` (`secureSessionID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Records 
+-- ----------------------------
diff --git a/share/sql/mysql-inventoryfolders.sql b/share/sql/mysql-inventoryfolders.sql
new file mode 100644
index 0000000..c30239e
--- /dev/null
+++ b/share/sql/mysql-inventoryfolders.sql
@@ -0,0 +1,9 @@
+CREATE TABLE `inventoryfolders` (
+  `folderID` varchar(36) NOT NULL default '',
+  `agentID` varchar(36) default NULL,
+  `parentFolderID` varchar(36) default NULL,
+  `folderName` varchar(64) default NULL,
+  PRIMARY KEY  (`folderID`),
+  KEY `owner` (`agentID`),
+  KEY `parent` (`parentFolderID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/share/sql/mysql-inventoryitems.sql b/share/sql/mysql-inventoryitems.sql
new file mode 100644
index 0000000..6e90005
--- /dev/null
+++ b/share/sql/mysql-inventoryitems.sql
@@ -0,0 +1,14 @@
+CREATE TABLE `inventoryitems` (
+  `inventoryID` varchar(36) NOT NULL default '',
+  `assetID` varchar(36) default NULL,
+  `type` int(11) default NULL,
+  `parentFolderID` varchar(36) default NULL,
+  `avatarID` varchar(36) default NULL,
+  `inventoryName` varchar(64) default NULL,
+  `inventoryDescription` varchar(64) default NULL,
+  `inventoryNextPermissions` int(10) unsigned default NULL,
+  `inventoryCurrentPermissions` int(10) unsigned default NULL,
+  PRIMARY KEY  (`inventoryID`),
+  KEY `owner` (`avatarID`),
+  KEY `folder` (`parentFolderID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/share/sql/mysql-logs.sql b/share/sql/mysql-logs.sql
new file mode 100644
index 0000000..05c19e8
--- /dev/null
+++ b/share/sql/mysql-logs.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `logs` (
+  `logID` int(10) unsigned NOT NULL auto_increment,
+  `target` varchar(36) default NULL,
+  `server` varchar(64) default NULL,
+  `method` varchar(64) default NULL,
+  `arguments` varchar(255) default NULL,
+  `priority` int(11) default NULL,
+  `message` text,
+  PRIMARY KEY  (`logID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
\ No newline at end of file
diff --git a/share/sql/mysql-regions.sql b/share/sql/mysql-regions.sql
new file mode 100644
index 0000000..4f98826
--- /dev/null
+++ b/share/sql/mysql-regions.sql
@@ -0,0 +1,29 @@
+CREATE TABLE `regions` (
+  `uuid` varchar(36) NOT NULL,
+  `regionHandle` bigint(20) unsigned NOT NULL,
+  `regionName` varchar(32) default NULL,
+  `regionRecvKey` varchar(128) default NULL,
+  `regionSendKey` varchar(128) default NULL,
+  `regionSecret` varchar(128) default NULL,
+  `regionDataURI` varchar(255) default NULL,
+  `serverIP` varchar(16) default NULL,
+  `serverPort` int(10) unsigned default NULL,
+  `serverURI` varchar(255) default NULL,
+  `locX` int(10) unsigned default NULL,
+  `locY` int(10) unsigned default NULL,
+  `locZ` int(10) unsigned default NULL,
+  `eastOverrideHandle` bigint(20) unsigned default NULL,
+  `westOverrideHandle` bigint(20) unsigned default NULL,
+  `southOverrideHandle` bigint(20) unsigned default NULL,
+  `northOverrideHandle` bigint(20) unsigned default NULL,
+  `regionAssetURI` varchar(255) default NULL,
+  `regionAssetRecvKey` varchar(128) default NULL,
+  `regionAssetSendKey` varchar(128) default NULL,
+  `regionUserURI` varchar(255) default NULL,
+  `regionUserRecvKey` varchar(128) default NULL,
+  `regionUserSendKey` varchar(128) default NULL, `regionMapTexture` varchar(36) default NULL,
+  PRIMARY KEY  (`uuid`),
+  KEY `regionName` (`regionName`),
+  KEY `regionHandle` (`regionHandle`),
+  KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED
\ No newline at end of file
diff --git a/share/sql/mysql-reservations.txt b/share/sql/mysql-reservations.txt
new file mode 100644
index 0000000..d6d84b9
--- /dev/null
+++ b/share/sql/mysql-reservations.txt
@@ -0,0 +1,16 @@
+CREATE TABLE `reservations` (
+  `resID` int(10) unsigned NOT NULL auto_increment,
+  `userUUID` varchar(36) default NULL,
+  `gridSendKey` varchar(64) default NULL,
+  `gridRecvKey` varchar(64) default NULL,
+  `resName` varchar(255) default NULL,
+  `resCompany` varchar(128) default NULL,
+  `resXMin` int(10) unsigned default NULL,
+  `resXMax` int(10) unsigned default NULL,
+  `resYMin` int(10) unsigned default NULL,
+  `resYMax` int(10) unsigned default NULL,
+  `status` int(10) unsigned default NULL,
+  PRIMARY KEY  (`resID`),
+  KEY `resident` (`userUUID`),
+  KEY `coords` (`resXMin`,`resXMax`,`resYMin`,`resYMax`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=32 ;
diff --git a/share/sql/mysql-users.sql b/share/sql/mysql-users.sql
new file mode 100644
index 0000000..5ce4d1c
--- /dev/null
+++ b/share/sql/mysql-users.sql
@@ -0,0 +1,34 @@
+SET FOREIGN_KEY_CHECKS=0;
+-- ----------------------------
+-- Table structure for users
+-- ----------------------------
+CREATE TABLE `users` (
+  `UUID` varchar(36) NOT NULL default '',
+  `username` varchar(32) NOT NULL,
+  `lastname` varchar(32) NOT NULL,
+  `passwordHash` varchar(32) NOT NULL,
+  `passwordSalt` varchar(32) NOT NULL,
+  `homeRegion` bigint(20) unsigned default NULL,
+  `homeLocationX` float default NULL,
+  `homeLocationY` float default NULL,
+  `homeLocationZ` float default NULL,
+  `homeLookAtX` float default NULL,
+  `homeLookAtY` float default NULL,
+  `homeLookAtZ` float default NULL,
+  `created` int(11) NOT NULL,
+  `lastLogin` int(11) NOT NULL,
+  `userInventoryURI` varchar(255) default NULL,
+  `userAssetURI` varchar(255) default NULL,
+  `profileCanDoMask` int(10) unsigned default NULL,
+  `profileWantDoMask` int(10) unsigned default NULL,
+  `profileAboutText` text,
+  `profileFirstText` text,
+  `profileImage` varchar(36) default NULL,
+  `profileFirstImage` varchar(36) default NULL,
+  PRIMARY KEY  (`UUID`),
+  UNIQUE KEY `usernames` (`username`,`lastname`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Records 
+-- ----------------------------
-- 
cgit v1.1


From e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 16:39:11 +0000
Subject: *Some more restructuring/fixing -- should compile, but high chance I
 forgot to add/remove something

---
 OpenSim.sln                                        |   6 +-
 OpenSim.suo                                        | Bin 319018 -> 303104 bytes
 .../Communications.OGS1/GridCommsManager.cs        |  18 --
 .../Communications.OGS1/OGS1GridServices.cs        | 248 ---------------------
 .../Communications.OGS1/OGSInterSimComms.cs        |  70 ------
 .../Communications.OGS1/OGSUserServices.cs         |  25 ---
 .../OpenSim.Framework.Communications.OGS1.csproj   | 142 ------------
 ...enSim.Framework.Communications.OGS1.csproj.user |  12 -
 .../Communications.OGS1/Properties/AssemblyInfo.cs |  35 ---
 OpenSim/Framework/Servers/BaseHttpServer.cs        |   8 +-
 OpenSim/Framework/Servers/CheckSumServer.cs        |   2 +-
 OpenSim/Framework/Servers/IRestHandler.cs          |   2 +-
 OpenSim/Framework/Servers/UDPServerBase.cs         |   2 +-
 OpenSim/Framework/Servers/XmlRpcMethod.cs          |   2 +-
 OpenSim/Region/Application/Application.cs          |   3 +-
 OpenSim/Region/Application/OpenSim.csproj          |  79 +++----
 OpenSim/Region/Application/OpenSimMain.cs          |  28 +--
 OpenSim/Region/Caches/AssetCache.cs                |   2 +-
 OpenSim/Region/Caches/Properties/AssemblyInfo.cs   |   4 +-
 .../Region/ClientStack/Assets/InventoryCache.cs    |   1 +
 .../ClientStack/ClientStackNetworkHandler.cs       |   2 +-
 OpenSim/Region/ClientStack/ClientView.API.cs       |   2 +-
 .../ClientStack/ClientView.AgentAssetUpload.cs     |   4 +-
 .../ClientStack/ClientView.PacketHandlers.cs       |   2 +-
 .../ClientStack/ClientView.ProcessPackets.cs       |   2 +-
 OpenSim/Region/ClientStack/ClientView.cs           |   4 +-
 OpenSim/Region/ClientStack/ClientViewBase.cs       |   2 +-
 OpenSim/Region/ClientStack/PacketServer.cs         |   4 +-
 .../Region/ClientStack/RegionApplicationBase.cs    |   5 +-
 OpenSim/Region/ClientStack/UDPServer.cs            |   7 +-
 OpenSim/Region/ClientStack/VersionInfo.cs          |   2 +-
 OpenSim/Region/Examples/SimpleApp/MyWorld.cs       |  16 +-
 OpenSim/Region/Examples/SimpleApp/Program.cs       |   9 +-
 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj |  71 +++---
 .../LocalCommunications/CommunicationsLocal.cs     |  61 -----
 .../LocalCommunications/LocalBackEndServices.cs    | 209 -----------------
 .../LocalCommunications/LocalUserServices.cs       | 118 ----------
 .../OpenSim.Region.LocalCommunications.csproj      | 121 ----------
 .../OpenSim.Region.LocalCommunications.csproj.user |  12 -
 .../LocalCommunications/Properties/AssemblyInfo.cs |  35 ---
 OpenSim/Region/Simulation/Caps.cs                  |   6 +-
 OpenSim/Region/Simulation/EstateManager.cs         |   8 +-
 .../Simulation/OpenSim.Region.Environment.csproj   | 218 ++++++++++++++++++
 .../Simulation/OpenSim.Region.Simulation.csproj    | 211 ------------------
 .../OpenSim.Region.Simulation.csproj.user          |  12 -
 OpenSim/Region/Simulation/ParcelManager.cs         |   8 +-
 OpenSim/Region/Simulation/RegionManager.cs         |   6 +-
 OpenSim/Region/Simulation/Scenes/Entity.cs         |   4 +-
 .../Region/Simulation/Scenes/IScenePresenceBody.cs |   2 +-
 OpenSim/Region/Simulation/Scenes/Primitive.cs      |   6 +-
 .../Simulation/Scenes/Scene.PacketHandlers.cs      |   6 +-
 .../Region/Simulation/Scenes/Scene.Scripting.cs    |   2 +-
 OpenSim/Region/Simulation/Scenes/Scene.cs          |  14 +-
 OpenSim/Region/Simulation/Scenes/SceneBase.cs      |   6 +-
 OpenSim/Region/Simulation/Scenes/SceneEvents.cs    |   2 +-
 OpenSim/Region/Simulation/Scenes/SceneObject.cs    |   2 +-
 .../Simulation/Scenes/ScenePresence.Animations.cs  |   4 +-
 .../Region/Simulation/Scenes/ScenePresence.Body.cs |   2 +-
 OpenSim/Region/Simulation/Scenes/ScenePresence.cs  |   2 +-
 .../Simulation/Scenes/scripting/IScriptContext.cs  |   2 +-
 .../Simulation/Scenes/scripting/IScriptEntity.cs   |   2 +-
 .../Simulation/Scenes/scripting/IScriptHandler.cs  |  10 +-
 .../Region/Simulation/Scenes/scripting/Script.cs   |   2 +-
 .../Simulation/Scenes/scripting/ScriptFactory.cs   |   2 +-
 .../Scenes/scripting/Scripts/FollowRandomAvatar.cs |   2 +-
 .../LocalStorageBerkeleyDB/BDBLocalStorage.cs      |   2 +-
 .../Storage/LocalStorageDb4o/Db4LocalStorage.cs    |   2 +-
 .../Region/Storage/LocalStorageDb4o/MapStorage.cs  |   2 +-
 .../Storage/LocalStorageDb4o/UUIDParcelQuery.cs    |   2 +-
 .../Storage/LocalStorageDb4o/UUIDPrimQuery.cs      |   2 +-
 .../LocalStorageSQLite/Properties/AssemblyInfo.cs  |   4 +-
 .../LocalStorageSQLite/SQLiteLocalStorage.cs       |   2 +-
 .../OpenSim.Region.Physics.BasicPhysicsPlugin.dll  | Bin 16384 -> 16384 bytes
 bin/Physics/OpenSim.Region.Physics.OdePlugin.dll   | Bin 20480 -> 20480 bytes
 bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll | Bin 20480 -> 20480 bytes
 75 files changed, 417 insertions(+), 1517 deletions(-)
 delete mode 100644 OpenSim/Framework/Communications.OGS1/GridCommsManager.cs
 delete mode 100644 OpenSim/Framework/Communications.OGS1/OGS1GridServices.cs
 delete mode 100644 OpenSim/Framework/Communications.OGS1/OGSInterSimComms.cs
 delete mode 100644 OpenSim/Framework/Communications.OGS1/OGSUserServices.cs
 delete mode 100644 OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj
 delete mode 100644 OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj.user
 delete mode 100644 OpenSim/Framework/Communications.OGS1/Properties/AssemblyInfo.cs
 delete mode 100644 OpenSim/Region/LocalCommunications/CommunicationsLocal.cs
 delete mode 100644 OpenSim/Region/LocalCommunications/LocalBackEndServices.cs
 delete mode 100644 OpenSim/Region/LocalCommunications/LocalUserServices.cs
 delete mode 100644 OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj
 delete mode 100644 OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user
 delete mode 100644 OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
 delete mode 100644 OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj
 delete mode 100644 OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user

diff --git a/OpenSim.sln b/OpenSim.sln
index adbae2b..5d18b3d 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -6,7 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Communications", "OpenSim\Framework\Communications\OpenSim.Framework.Communications.csproj", "{CB52B7E7-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Communications.OGS1", "OpenSim\Framework\Communications.OGS1\OpenSim.Framework.Communications.OGS1.csproj", "{6109024D-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{6109024D-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim\Framework\Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
 EndProject
@@ -28,7 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfac
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Remote", "OpenSim\Region\GridInterfaces\Remote\OpenSim.Region.GridInterfaces.Remote.csproj", "{98C7B681-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.LocalCommunications", "OpenSim\Region\LocalCommunications\OpenSim.Region.LocalCommunications.csproj", "{EB3A1BA8-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.Local", "OpenSim\Region\Communications\Local\OpenSim.Region.Communications.Local.csproj", "{EB3A1BA8-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.BasicPhysicsPlugin", "OpenSim\Region\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj", "{15B4FEF3-0000-0000-0000-000000000000}"
 EndProject
@@ -38,7 +38,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.OdeP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.PhysXPlugin", "OpenSim\Region\Physics\PhysXPlugin\OpenSim.Region.Physics.PhysXPlugin.csproj", "{A6D191D8-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Simulation", "OpenSim\Region\Simulation\OpenSim.Region.Simulation.csproj", "{C0DAB338-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Simulation\OpenSim.Region.Environment.csproj", "{C0DAB338-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageBerkeleyDB", "OpenSim\Region\Storage\LocalStorageBerkeleyDB\OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj", "{A4691E59-0000-0000-0000-000000000000}"
 EndProject
diff --git a/OpenSim.suo b/OpenSim.suo
index 765dc63..1d9597c 100644
Binary files a/OpenSim.suo and b/OpenSim.suo differ
diff --git a/OpenSim/Framework/Communications.OGS1/GridCommsManager.cs b/OpenSim/Framework/Communications.OGS1/GridCommsManager.cs
deleted file mode 100644
index 6687380..0000000
--- a/OpenSim/Framework/Communications.OGS1/GridCommsManager.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications;
-namespace OpenSim.Framework.Communications.OGS1
-{
-    public class GridCommsManager : CommunicationsManager
-    {
-        private OGS1GridServices gridInterComms = new OGS1GridServices();
-        public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
-        {
-            GridServer = gridInterComms;
-            InterRegion = gridInterComms;
-            UserServer = new OGSUserServices();
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications.OGS1/OGS1GridServices.cs b/OpenSim/Framework/Communications.OGS1/OGS1GridServices.cs
deleted file mode 100644
index 408643f..0000000
--- a/OpenSim/Framework/Communications.OGS1/OGS1GridServices.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Text;
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Tcp;
-
-using OpenSim.Servers;
-using OpenSim.Framework;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications;
-
-using Nwc.XmlRpc;
-using libsecondlife;
-
-namespace OpenSim.Framework.Communications.OGS1
-{
-    public class OGS1GridServices : IGridServices, IInterRegionCommunications
-    {
-        public Dictionary<ulong, RegionCommsListener> listeners = new Dictionary<ulong, RegionCommsListener>();
-        public GridInfo grid;
-        public BaseHttpServer httpListener;
-        private bool initialised = false;
-
-        public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo)
-        {
-            Hashtable GridParams = new Hashtable();
-
-            grid = gridInfo;
-
-            // Login / Authentication
-            GridParams["authkey"] = gridInfo.GridServerSendKey;
-            GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();
-            GridParams["sim_ip"] = regionInfo.CommsExternalAddress;
-            GridParams["sim_port"] = regionInfo.CommsIPListenPort.ToString();
-
-            // Package into an XMLRPC Request
-            ArrayList SendParams = new ArrayList(); 
-            SendParams.Add(GridParams);
-
-            // Send Request
-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(gridInfo.GridServerURI, 3000);
-            Hashtable GridRespData = (Hashtable)GridResp.Value;
-            Hashtable griddatahash = GridRespData;
-
-            // Process Response
-            if (GridRespData.ContainsKey("error"))
-            {
-                string errorstring = (string)GridRespData["error"];
-                OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
-                return null;
-            }  
-
-            if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
-            {
-               // initialised = true;
-                httpListener = new BaseHttpServer(regionInfo.CommsIPListenPort);
-                httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);
-                httpListener.Start();
-            }
-
-            // Initialise the background listeners
-            listeners[regionInfo.RegionHandle] = new RegionCommsListener();
-
-            return listeners[regionInfo.RegionHandle];
-        }
-
-        public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
-        {
-            Hashtable respData = MapBlockQuery((int)regionInfo.RegionLocX - 1, (int)regionInfo.RegionLocY - 1, (int)regionInfo.RegionLocX + 1, (int)regionInfo.RegionLocY + 1);
-
-            List<RegionInfo> neighbours = new List<RegionInfo>();
-
-            foreach (Hashtable n in (Hashtable)respData.Values)
-            {
-                RegionInfo neighbour = new RegionInfo();
-
-                //OGS1
-                neighbour.RegionHandle = (ulong)n["regionhandle"];
-                neighbour.RegionLocX = (uint)n["x"];
-                neighbour.RegionLocY = (uint)n["y"];
-                neighbour.RegionName = (string)n["name"];
-
-                //OGS1+
-                neighbour.CommsIPListenAddr = (string)n["sim_ip"];
-                neighbour.CommsIPListenPort = (int)n["sim_port"];
-                neighbour.CommsExternalAddress = (string)n["sim_uri"];
-                neighbour.SimUUID = (string)n["uuid"];
-
-                neighbours.Add(neighbour);
-            }
-
-            return neighbours;
-        }
-
-        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
-        {
-            OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");
-            return null;
-        }
-
-        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            Hashtable respData = MapBlockQuery(minX, minY, maxX, maxY);
-
-            List<MapBlockData> neighbours = new List<MapBlockData>();
-
-            foreach (Hashtable n in (Hashtable)respData.Values)
-            {
-                MapBlockData neighbour = new MapBlockData();
-
-                neighbour.X = (ushort)n["x"];
-                neighbour.Y = (ushort)n["y"];
-
-                neighbour.Name = (string)n["name"];
-                neighbour.Access = (byte)n["access"];
-                neighbour.RegionFlags = (uint)n["region-flags"];
-                neighbour.WaterHeight = (byte)n["water-height"];
-                neighbour.MapImageId = (string)n["map-image-id"];
-
-                neighbours.Add(neighbour);
-            }
-
-            return neighbours;
-        }
-
-        /// <summary>
-        /// Performs a XML-RPC query against the grid server returning mapblock information in the specified coordinates
-        /// </summary>
-        /// <remarks>REDUNDANT - OGS1 is to be phased out in favour of OGS2</remarks>
-        /// <param name="minX">Minimum X value</param>
-        /// <param name="minY">Minimum Y value</param>
-        /// <param name="maxX">Maximum X value</param>
-        /// <param name="maxY">Maximum Y value</param>
-        /// <returns>Hashtable of hashtables containing map data elements</returns>
-        private Hashtable MapBlockQuery(int minX, int minY, int maxX, int maxY)
-        {
-            Hashtable param = new Hashtable();
-            param["xmin"] = minX;
-            param["ymin"] = minY;
-            param["xmax"] = maxX;
-            param["ymax"] = maxY;
-            IList parameters = new ArrayList();
-            parameters.Add(param);
-            XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);
-            XmlRpcResponse resp = req.Send(grid.GridServerURI, 3000);
-            Hashtable respData = (Hashtable)resp.Value;
-            return respData;
-        }
-
-        // Grid Request Processing
-        public XmlRpcResponse ExpectUser(XmlRpcRequest request)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            AgentCircuitData agentData = new AgentCircuitData();
-            agentData.SessionID = new LLUUID((string)requestData["session_id"]);
-            agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
-            agentData.firstname = (string)requestData["firstname"];
-            agentData.lastname = (string)requestData["lastname"];
-            agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
-            agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-            if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
-            {
-                agentData.child = true;
-            }
-            else
-            {
-                agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
-                agentData.child = false;
-
-            }
-
-            if (listeners.ContainsKey((ulong)requestData["regionhandle"]))
-            {
-                this.listeners[(ulong)requestData["regionhandle"]].TriggerExpectUser((ulong)requestData["regionhandle"], agentData);
-            }
-            else
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
-            }
-
-            return new XmlRpcResponse();
-        }
-
-        #region InterRegion Comms
-        private void StartRemoting()
-        {
-            TcpChannel ch = new TcpChannel(8895);
-            ChannelServices.RegisterChannel(ch);
-
-            WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton);
-            RemotingConfiguration.RegisterWellKnownServiceType(wellType);
-            InterRegionSingleton.Instance.OnArrival += this.IncomingArrival;
-            InterRegionSingleton.Instance.OnChildAgent += this.IncomingChildAgent;
-        }
-
-        #region Methods called by regions in this instance
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            if (this.listeners.ContainsKey(regionHandle))
-            {
-                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
-                return true;
-            }
-            //TODO need to see if we know about where this region is and use .net remoting 
-            // to inform it. 
-            return false;
-        }
-
-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (this.listeners.ContainsKey(regionHandle))
-            {
-                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
-                return true;
-            }
-            //TODO need to see if we know about where this region is and use .net remoting 
-            // to inform it. 
-            return false;
-        }
-        #endregion
-
-        #region Methods triggered by calls from external instances
-        public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            if (this.listeners.ContainsKey(regionHandle))
-            {
-                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
-                return true;
-            }
-            return false;
-        }
-
-        public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (this.listeners.ContainsKey(regionHandle))
-            {
-                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
-                return true;
-            }
-            return false;
-        }
-        #endregion
-        #endregion
-    }
-}
diff --git a/OpenSim/Framework/Communications.OGS1/OGSInterSimComms.cs b/OpenSim/Framework/Communications.OGS1/OGSInterSimComms.cs
deleted file mode 100644
index 8ba257e..0000000
--- a/OpenSim/Framework/Communications.OGS1/OGSInterSimComms.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications;
-namespace OpenSim.Framework.Communications.OGS1
-{
-    public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
-    public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
-
-    public sealed class InterRegionSingleton
-    {
-        static readonly InterRegionSingleton instance = new InterRegionSingleton();
-
-        public event InformRegionChild OnChildAgent;
-        public event ExpectArrival OnArrival;
-
-        static InterRegionSingleton()
-        {
-        }
-
-        InterRegionSingleton()
-        {
-        }
-
-        public static InterRegionSingleton Instance
-        {
-            get
-            {
-                return instance;
-            }
-        }
-
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            if (OnChildAgent != null)
-            {
-                return OnChildAgent(regionHandle, agentData);
-            }
-            return false;
-        }
-
-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (OnArrival != null)
-            {
-                return OnArrival(regionHandle, agentID, position);
-            }
-            return false;
-        }
-    }
-
-    public class OGS1InterRegionRemoting : MarshalByRefObject
-    {
-
-        public OGS1InterRegionRemoting()
-        {
-        }
-
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
-        }
-
-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications.OGS1/OGSUserServices.cs b/OpenSim/Framework/Communications.OGS1/OGSUserServices.cs
deleted file mode 100644
index ff5fbbb..0000000
--- a/OpenSim/Framework/Communications.OGS1/OGSUserServices.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Data;
-using libsecondlife;
-
-namespace OpenSim.Framework.Communications.OGS1
-{
-    public class OGSUserServices :IUserServices
-    {
-        public UserProfileData GetUserProfile(string firstName, string lastName)
-        {
-            return null;
-        }
-        public UserProfileData GetUserProfile(string name)
-        {
-            return null;
-        }
-        public UserProfileData GetUserProfile(LLUUID avatarID)
-        {
-            return null;
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj b/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj
deleted file mode 100644
index 3985ee5..0000000
--- a/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6109024D-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Framework.Communications.OGS1</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Framework.Communications.OGS1</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Runtime.Remoting" >
-      <HintPath>System.Runtime.Remoting.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="XMLRPC.dll" >
-      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\General\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Communications\OpenSim.Framework.Communications.csproj">
-      <Name>OpenSim.Framework.Communications</Name>
-      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenSim.Framework.Console</Name>
-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework.Data</Name>
-      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Servers\OpenSim.Framework.Servers.csproj">
-      <Name>OpenSim.Framework.Servers</Name>
-      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GridCommsManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OGS1GridServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OGSInterSimComms.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OGSUserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj.user b/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/Communications.OGS1/OpenSim.Framework.Communications.OGS1.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/Communications.OGS1/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications.OGS1/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0c6f965..0000000
--- a/OpenSim/Framework/Communications.OGS1/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Communications.OGS1")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a8b2b39b-c83b-41e2-b0b5-7ccfc1fddae7")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index e55e33c..bc638dd 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -36,7 +36,7 @@ using Nwc.XmlRpc;
 using System.Collections;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
     public class BaseHttpServer
     {
@@ -171,7 +171,7 @@ namespace OpenSim.Servers
         protected virtual string ParseLLSDXML(string requestBody)
         {
             // dummy function for now - IMPLEMENT ME!
-            Console.WriteLine("LLSD request "+requestBody);
+            //Console.WriteLine("LLSD request "+requestBody);
             string resp = "";
             if (firstcaps)
             {
@@ -195,7 +195,7 @@ namespace OpenSim.Servers
             }
             catch (Exception e)
             {
-                Console.WriteLine(e.ToString());
+                //Console.WriteLine(e.ToString());
             }
             return responseString;
         }
@@ -273,7 +273,7 @@ namespace OpenSim.Servers
             }
             catch (Exception e)
             {
-                Console.WriteLine(e.ToString());
+                //Console.WriteLine(e.ToString());
             }
         }
 
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
index a359205..6aeb58c 100644
--- a/OpenSim/Framework/Servers/CheckSumServer.cs
+++ b/OpenSim/Framework/Servers/CheckSumServer.cs
@@ -40,7 +40,7 @@ using libsecondlife.Packets;
 using OpenSim.Framework.Console;
 
 
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
 /*    public class CheckSumServer : UDPServerBase
     {
diff --git a/OpenSim/Framework/Servers/IRestHandler.cs b/OpenSim/Framework/Servers/IRestHandler.cs
index 3aa508c..a2b6bf0 100644
--- a/OpenSim/Framework/Servers/IRestHandler.cs
+++ b/OpenSim/Framework/Servers/IRestHandler.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
     public delegate string RestMethod( string request, string path, string param );
 }
diff --git a/OpenSim/Framework/Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs
index b472c97..610d23b 100644
--- a/OpenSim/Framework/Servers/UDPServerBase.cs
+++ b/OpenSim/Framework/Servers/UDPServerBase.cs
@@ -38,7 +38,7 @@ using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
 
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
     public class UDPServerBase
     {
diff --git a/OpenSim/Framework/Servers/XmlRpcMethod.cs b/OpenSim/Framework/Servers/XmlRpcMethod.cs
index 05cbf2e..51b3303 100644
--- a/OpenSim/Framework/Servers/XmlRpcMethod.cs
+++ b/OpenSim/Framework/Servers/XmlRpcMethod.cs
@@ -28,7 +28,7 @@
 using System;
 using Nwc.XmlRpc;
 
-namespace OpenSim.Servers
+namespace OpenSim.Framework.Servers
 {
     public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );    
 }
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 40701b0..1dcd99b 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using OpenSim.Framework.Console;
+using OpenSim.Region.ClientStack;
 
 namespace OpenSim
 {
@@ -108,7 +109,7 @@ namespace OpenSim
             sim.m_sandbox = sandBoxMode;
             sim.user_accounts = userAccounts;
             sim.gridLocalAsset = gridLocalAsset;
-            OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
+            OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
 
             sim.StartUp();
 
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 214f2cf..fcde555 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
     <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim</AssemblyName>
@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
     <RootNamespace>OpenSim</RootNamespace>
-    <StartupObject></StartupObject>
+    <StartupObject>
+    </StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -55,30 +61,31 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll" >
+    <Reference Include="Axiom.MathLib.dll">
       <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
+    <Reference Include="Db4objects.Db4o.dll">
       <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="libsecondlife.dll" >
+    <Reference Include="libsecondlife.dll">
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System" >
+    <Reference Include="System">
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml" >
+    <Reference Include="System.Xml">
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC.dll" >
+    <Reference Include="XMLRPC.dll">
       <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -88,79 +95,75 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\Communications.OGS1\OpenSim.Framework.Communications.OGS1.csproj">
-      <Name>OpenSim.Framework.Communications.OGS1</Name>
-      <Project>{6109024D-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
       <Name>OpenSim.Framework.GenericConfig.Xml</Name>
       <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
       <Name>OpenSim.Framework.Servers</Name>
       <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
       <Name>OpenSim.Framework.UserManagement</Name>
       <Project>{586E2916-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
       <Name>OpenSim.Region.Caches</Name>
       <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj">
       <Name>OpenSim.Region.ClientStack</Name>
       <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\LocalCommunications\OpenSim.Region.LocalCommunications.csproj">
-      <Name>OpenSim.Region.LocalCommunications</Name>
+    <ProjectReference Include="..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
       <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Name>OpenSim.Region.Communications.Local</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj">
+      <Project>{6109024D-0000-0000-0000-000000000000}</Project>
+      <Name>OpenSim.Region.Communications.OGS1</Name>
     </ProjectReference>
     <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
       <Name>OpenSim.Region.Physics.Manager</Name>
       <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Simulation\OpenSim.Region.Simulation.csproj">
-      <Name>OpenSim.Region.Simulation</Name>
+    <ProjectReference Include="..\Simulation\OpenSim.Region.Environment.csproj">
+      <Name>OpenSim.Region.Environment</Name>
       <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
       <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
       <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -178,4 +181,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7da2263..db4185c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -38,22 +38,24 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Region;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
 using OpenSim.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Physics.Manager;
 using Nwc.XmlRpc;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.GenericConfig;
-using OpenGrid.Framework.Communications;
-using OpenSim.LocalCommunications;
-using OpenGrid.Framework.Communications.OGS1;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Communications.OGS1;
+using OpenSim.Region.Communications.Local;
+
+using OpenSim.Region.ClientStack;
 
 namespace OpenSim
 {
@@ -241,7 +243,7 @@ namespace OpenSim
 
                 udpServer.LocalWorld = LocalWorld;
 
-                LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
+                LocalWorld.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
                 LocalWorld.LoadWorldMap();
 
                 m_log.Verbose( "Main.cs:Startup() - Starting up messaging system");
@@ -358,23 +360,23 @@ namespace OpenSim
                 case "":
                     this.m_physicsEngine = "basicphysics";
                     configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
                     break;
 
                 case "basicphysics":
                     this.m_physicsEngine = "basicphysics";
                     configData.SetAttribute("PhysicsEngine", "basicphysics");
-                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false;
+                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
                     break;
 
                 case "RealPhysX":
                     this.m_physicsEngine = "RealPhysX";
-                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
                     break;
 
                 case "OpenDynamicsEngine":
                     this.m_physicsEngine = "OpenDynamicsEngine";
-                    OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true;
+                    OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
                     break;
             }
 
@@ -456,7 +458,7 @@ namespace OpenSim
                     m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
                     break;
                 case "users":
-                    OpenSim.Region.Scenes.ScenePresence TempAv;
+                    OpenSim.Region.Environment.Scenes.ScenePresence TempAv;
                     m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
                     /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
                      {
diff --git a/OpenSim/Region/Caches/AssetCache.cs b/OpenSim/Region/Caches/AssetCache.cs
index d0cc370..6cf921b 100644
--- a/OpenSim/Region/Caches/AssetCache.cs
+++ b/OpenSim/Region/Caches/AssetCache.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
 
-namespace OpenSim.Caches
+namespace OpenSim.Region.Caches
 {
     public delegate void DownloadComplete(AssetCache.TextureSender sender);
 
diff --git a/OpenSim/Region/Caches/Properties/AssemblyInfo.cs b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
index 00f5dfe..5e6ecbb 100644
--- a/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Caches")]
+[assembly: AssemblyTitle("OpenSim.Region.Caches")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Caches")]
+[assembly: AssemblyProduct("OpenSim.Region.Caches")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index 5d5021c..da74f85 100644
--- a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -35,6 +35,7 @@ using libsecondlife.Packets;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Region.ClientStack;
 
 namespace OpenSim.Assets
 {
diff --git a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index 7552195..f99cf79 100644
--- a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -33,7 +33,7 @@ using System.Net.Sockets;
 using libsecondlife;
 
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
 
     public interface ClientStackNetworkHandler
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 902f3c7..5e346fb 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Types;
 using libsecondlife;
 using libsecondlife.Packets;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     partial class ClientView
     {
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index 914c38a..bc6cc21 100644
--- a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -32,11 +32,11 @@ using OpenSim.Assets;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Utilities;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using libsecondlife;
 using libsecondlife.Packets;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     partial class ClientView
     {
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 32aed02..cbd10dc 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public partial class ClientView
     {
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 191ef21..51981b8 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public partial class ClientView
     {
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 312da9d..9c4462d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -42,9 +42,9 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public delegate bool PacketMethod(ClientView simClient, Packet packet);
 
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 8b503f0..7d39405 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -39,7 +39,7 @@ using System.Timers;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Interfaces;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public class ClientViewBase 
     {
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 229570c..ffd254e 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -34,9 +34,9 @@ using OpenSim.Framework;
 using System.Net;
 using System.Net.Sockets;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public class PacketServer
     {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index b421fbd..d39adb5 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -42,14 +42,13 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Physics.Manager;
 using Nwc.XmlRpc;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.GenericConfig;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     public class RegionApplicationBase
     {
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index f2a02d9..33097ed 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -41,14 +41,13 @@ using OpenSim.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Assets;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework;
 using Nwc.XmlRpc;
-using OpenSim.Servers;
-using OpenSim.GenericConfig;
+using OpenSim.Framework.Servers;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
 
     public class UDPServer : ClientStackNetworkHandler
diff --git a/OpenSim/Region/ClientStack/VersionInfo.cs b/OpenSim/Region/ClientStack/VersionInfo.cs
index 5d1354e..249ca94 100644
--- a/OpenSim/Region/ClientStack/VersionInfo.cs
+++ b/OpenSim/Region/ClientStack/VersionInfo.cs
@@ -27,7 +27,7 @@
 */
 using System;
 
-namespace OpenSim
+namespace OpenSim.Region.ClientStack
 {
     /// <summary>
     /// </summary>
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 01e0c59..89f39d3 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -5,20 +5,20 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
 using libsecondlife;
-using OpenSim.Region;
-using Avatar=OpenSim.Region.Scenes.ScenePresence;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment;
+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
+using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework;
-using OpenSim.Caches;
-using OpenGrid.Framework.Communications;
-using OpenSim.Servers;
+using OpenSim.Region.Caches;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers;
 
 namespace SimpleApp
 {
     public class MyWorld : Scene
     {
         private RegionInfo m_regionInfo;
-        private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;
+        private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars;
 
         public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
             : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
@@ -76,7 +76,7 @@ namespace SimpleApp
 
             client.SendRegionHandshake(m_regionInfo);
 
-            OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
+            OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
             
         }
 
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index e1465d1..8c1e965 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -6,13 +6,14 @@ using OpenSim.GridInterfaces.Local;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers;
 using OpenSim.Assets;
 using libsecondlife;
-using OpenSim.Servers;
 using OpenSim.Framework;
-using OpenSim.Caches;
-using OpenGrid.Framework.Communications;
-using OpenSim.LocalCommunications;
+using OpenSim.Region.Caches;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Region.ClientStack;
 
 namespace SimpleApp
 {
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 5129be2..8a62af4 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
     <ProjectGuid>{24B12448-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>SimpleApp</AssemblyName>
@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
     <RootNamespace>SimpleApp</RootNamespace>
-    <StartupObject></StartupObject>
+    <StartupObject>
+    </StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -55,30 +61,27 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libsecondlife.dll" >
+    <Reference Include="libsecondlife.dll">
       <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OpenSim.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
+    <Reference Include="System">
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data.dll" >
+    <Reference Include="System.Data.dll">
       <HintPath>..\..\..\..\bin\System.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml" >
+    <Reference Include="System.Xml">
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC.dll" >
+    <Reference Include="XMLRPC.dll">
       <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -88,49 +91,51 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Name>OpenSim.Framework.Servers</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
       <Name>OpenSim.Region.Caches</Name>
       <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">
       <Name>OpenSim.Region.ClientStack</Name>
       <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
+      <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
+      <Name>OpenSim.Region.Communications.Local</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
       <Name>OpenSim.Region.GridInterfaces.Local</Name>
       <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\LocalCommunications\OpenSim.Region.LocalCommunications.csproj">
-      <Name>OpenSim.Region.LocalCommunications</Name>
-      <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Simulation.csproj">
-      <Name>OpenSim.Region.Simulation</Name>
+    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj">
+      <Name>OpenSim.Region.Environment</Name>
       <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -151,4 +156,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/OpenSim/Region/LocalCommunications/CommunicationsLocal.cs b/OpenSim/Region/LocalCommunications/CommunicationsLocal.cs
deleted file mode 100644
index 743b9b4..0000000
--- a/OpenSim/Region/LocalCommunications/CommunicationsLocal.cs
+++ /dev/null
@@ -1,61 +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;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenGrid.Framework.Communications;
-
-
-namespace OpenSim.LocalCommunications
-{
-    public class CommunicationsLocal : CommunicationsManager
-    {
-        public LocalBackEndServices SandBoxServices = new LocalBackEndServices();
-        public LocalUserServices UserServices;
-
-        public CommunicationsLocal(NetworkServersInfo serversInfo)
-            : base(serversInfo)
-        {
-            UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
-            UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll");
-            UserServer = UserServices;
-            GridServer = SandBoxServices;
-            InterRegion = SandBoxServices;
-        }
-
-        internal void InformRegionOfLogin(ulong regionHandle, Login login)
-        {
-            this.SandBoxServices.AddNewSession(regionHandle, login);
-        }
-    }
-}
diff --git a/OpenSim/Region/LocalCommunications/LocalBackEndServices.cs b/OpenSim/Region/LocalCommunications/LocalBackEndServices.cs
deleted file mode 100644
index ce48c6e..0000000
--- a/OpenSim/Region/LocalCommunications/LocalBackEndServices.cs
+++ /dev/null
@@ -1,209 +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 OpenGrid.Framework.Communications;
-using libsecondlife;
-using OpenSim.Framework.Types;
-using OpenSim.Framework;
-
-namespace OpenSim.LocalCommunications
-{
-
-    public class LocalBackEndServices : IGridServices, IInterRegionCommunications
-    {
-        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
-        protected Dictionary<ulong, RegionCommsListener> regionHosts = new Dictionary<ulong, RegionCommsListener>();
-
-        public LocalBackEndServices()
-        {
-
-        }
-
-        /// <summary>
-        /// Register a region method with the BackEnd Services.
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
-        public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo)
-        {
-            //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
-            if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
-            {
-                //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
-                this.regions.Add(regionInfo.RegionHandle, regionInfo);
-                RegionCommsListener regionHost = new RegionCommsListener();
-                this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
-
-                return regionHost;
-            }
-
-            //already in our list of regions so for now lets return null
-            return null;
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
-        public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
-        {
-            // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
-            List<RegionInfo> neighbours = new List<RegionInfo>();
-
-            foreach (RegionInfo reg in this.regions.Values)
-            {
-                // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
-                if (reg.RegionHandle != regionInfo.RegionHandle)
-                {
-                    //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
-                    if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))
-                    {
-                        if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))
-                        {
-                            neighbours.Add(reg);
-                        }
-                    }
-                }
-            }
-            return neighbours;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
-        {
-            if (this.regions.ContainsKey(regionHandle))
-            {
-                return this.regions[regionHandle];
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="minX"></param>
-        /// <param name="minY"></param>
-        /// <param name="maxX"></param>
-        /// <param name="maxY"></param>
-        /// <returns></returns>
-        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
-        {
-            List<MapBlockData> mapBlocks = new List<MapBlockData>();
-            foreach(RegionInfo regInfo in this.regions.Values)
-            {
-                if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
-                {
-                    MapBlockData map = new MapBlockData();
-                    map.Name = regInfo.RegionName;
-                    map.X = (ushort)regInfo.RegionLocX;
-                    map.Y = (ushort)regInfo.RegionLocY;
-                    map.WaterHeight =(byte) regInfo.estateSettings.waterHeight;
-                    map.MapImageId = regInfo.estateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");
-                    map.Agents = 1;
-                    map.RegionFlags = 72458694;
-                    map.Access = 13;
-                    mapBlocks.Add(map);
-                }
-            }
-            return mapBlocks;
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="agentData"></param>
-        /// <returns></returns>
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
-        {
-            //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
-            if (this.regionHosts.ContainsKey(regionHandle))
-            {
-                // Console.WriteLine("CommsManager- Informing a region to expect child agent");
-                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);
-                return true;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="agentID"></param>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (this.regionHosts.ContainsKey(regionHandle))
-            {
-                // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing");
-                this.regionHosts[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
-                return true;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="loginData"></param>
-        /// <returns></returns>
-        public bool AddNewSession(ulong regionHandle, Login loginData)
-        {
-            //Console.WriteLine(" comms manager been told to expect new user");
-            AgentCircuitData agent = new AgentCircuitData();
-            agent.AgentID = loginData.Agent;
-            agent.firstname = loginData.First;
-            agent.lastname = loginData.Last;
-            agent.SessionID = loginData.Session;
-            agent.SecureSessionID = loginData.SecureSession;
-            agent.circuitcode = loginData.CircuitCode;
-            agent.BaseFolder = loginData.BaseFolder;
-            agent.InventoryFolder = loginData.InventoryFolder;
-            agent.startpos = new LLVector3(128, 128, 70);
-            agent.CapsPath = loginData.CapsPath;
-
-            if (this.regionHosts.ContainsKey(regionHandle))
-            {
-                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);
-                return true;
-            }
-
-            // region not found
-            return false;
-        }
-    }
-}
-
diff --git a/OpenSim/Region/LocalCommunications/LocalUserServices.cs b/OpenSim/Region/LocalCommunications/LocalUserServices.cs
deleted file mode 100644
index a7f7aa4..0000000
--- a/OpenSim/Region/LocalCommunications/LocalUserServices.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-
-using OpenGrid.Framework.Communications;
-//using OpenSim.Framework.User;
-using OpenGrid.Framework.UserManagement;
-using OpenGrid.Framework.Data;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
-
-using libsecondlife;
-
-namespace OpenSim.LocalCommunications
-{
-    public class LocalUserServices : UserManagerBase, IUserServices
-    {
-        private CommunicationsLocal m_Parent;
-
-        private uint defaultHomeX ;
-        private uint defaultHomeY;
-        public LocalUserServices(CommunicationsLocal parent, uint defHomeX, uint defHomeY)
-        {
-            m_Parent = parent;
-            defaultHomeX = defHomeX;
-            defaultHomeY = defHomeY;
-        }
-
-        public UserProfileData GetUserProfile(string firstName, string lastName)
-        {
-            return GetUserProfile(firstName + " " + lastName);
-        }
-
-        public UserProfileData GetUserProfile(string name)
-        {
-            return this.getUserProfile(name);
-        }
-        public UserProfileData GetUserProfile(LLUUID avatarID)
-        {
-            return this.getUserProfile(avatarID);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public override string GetMessage()
-        {
-            return "Welcome to OpenSim";
-        }
-
-        public override UserProfileData GetTheUser(string firstname, string lastname)
-        {
-            UserProfileData profile = getUserProfile(firstname, lastname);
-            if (profile != null)
-            {
-               
-                return profile;
-            }
-
-            //no current user account so make one
-            Console.WriteLine("No User account found so creating a new one ");
-            this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
-            
-            profile = getUserProfile(firstname, lastname);
-
-            return profile;
-        }
-
-        public override bool AuthenticateUser(ref UserProfileData profile, string password)
-        {
-            //for now we will accept any password in sandbox mode
-            Console.WriteLine("authorising user");
-            return true;
-        }
-
-        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
-        {
-            ulong currentRegion = theUser.currentAgent.currentHandle;
-            RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
-
-
-            if (reg != null)
-            {
-                response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +
-                 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
-                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
-                string capsPath = Util.GetRandomCapsPath();
-                response.SimAddress = reg.CommsIPListenAddr;
-                response.SimPort = (Int32)reg.CommsIPListenPort;
-                response.RegionX = reg.RegionLocX ;
-                response.RegionY = reg.RegionLocY ;
-                response.SeedCapability = "http://" + reg.CommsIPListenAddr + ":" + "9000" + "/CAPS/" + capsPath + "0000/";
-                theUser.currentAgent.currentRegion = reg.SimUUID;
-                theUser.currentAgent.currentHandle = reg.RegionHandle;
-
-                Login _login = new Login();
-                //copy data to login object
-                _login.First = response.Firstname;
-                _login.Last = response.Lastname;
-                _login.Agent = response.AgentID;
-                _login.Session = response.SessionID;
-                _login.SecureSession = response.SecureSessionID;
-                _login.CircuitCode = (uint)response.CircuitCode;
-                _login.CapsPath = capsPath;
-
-                m_Parent.InformRegionOfLogin(currentRegion, _login);
-            }
-            else
-            {
-                Console.WriteLine("not found region " + currentRegion);
-            }
-
-        }
-
-    }
-}
diff --git a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj b/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj
deleted file mode 100644
index 6b2b78c..0000000
--- a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EB3A1BA8-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Region.LocalCommunications</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Region.LocalCommunications</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
-      <Name>OpenSim.Framework.Communications</Name>
-      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenSim.Framework.Data</Name>
-      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
-      <Name>OpenSim.Framework.UserManagement</Name>
-      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CommunicationsLocal.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LocalBackEndServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LocalUserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user b/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs b/OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8e6e711..0000000
--- a/OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.LocalCommunications")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.LocalCommunications")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Simulation/Caps.cs b/OpenSim/Region/Simulation/Caps.cs
index 13a351d..9edbd54 100644
--- a/OpenSim/Region/Simulation/Caps.cs
+++ b/OpenSim/Region/Simulation/Caps.cs
@@ -4,14 +4,14 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 using System.Xml;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Types;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using libsecondlife;
 
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
 {
     public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
 
diff --git a/OpenSim/Region/Simulation/EstateManager.cs b/OpenSim/Region/Simulation/EstateManager.cs
index dcb5564..c2c1ecf 100644
--- a/OpenSim/Region/Simulation/EstateManager.cs
+++ b/OpenSim/Region/Simulation/EstateManager.cs
@@ -30,15 +30,15 @@ using System.Collections.Generic;
 using System.Text;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Region;
-using OpenSim.Region.Scenes;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
 using OpenSim;
 using libsecondlife;
 using libsecondlife.Packets;
-using Avatar = OpenSim.Region.Scenes.ScenePresence;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
 
 
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
 {
 
     /// <summary>
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
new file mode 100644
index 0000000..0597857
--- /dev/null
+++ b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
@@ -0,0 +1,218 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C0DAB338-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Environment</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Environment</RootNamespace>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll">
+      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Db4objects.Db4o.dll">
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll">
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System">
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml">
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll">
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
+      <Name>OpenSim.Framework.Communications</Name>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
+      <Name>OpenSim.Framework.GenericConfig.Xml</Name>
+      <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
+      <Name>OpenSim.Region.Caches</Name>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
+      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
+      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Caps.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="EstateManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ParcelManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RegionManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Entity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\IScenePresenceBody.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Primitive.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.Scripting.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneEvents.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.Animations.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.Body.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptEntity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\Script.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\ScriptFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj
deleted file mode 100644
index 7811a55..0000000
--- a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj
+++ /dev/null
@@ -1,211 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C0DAB338-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Region.Simulation</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Region.Simulation</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="XMLRPC.dll" >
-      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
-      <Name>OpenSim.Framework.Communications</Name>
-      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenSim.Framework.Console</Name>
-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
-      <Name>OpenSim.Framework.GenericConfig.Xml</Name>
-      <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
-      <Name>OpenSim.Framework.Servers</Name>
-      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
-      <Name>OpenSim.Region.Caches</Name>
-      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
-      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
-      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Caps.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="EstateManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParcelManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RegionManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Entity.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Primitive.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Scene.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Scene.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Scene.Scripting.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\SceneEvents.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\SceneObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\ScenePresence.Animations.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\IScriptContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\IScriptEntity.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\IScriptHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\Script.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\ScriptFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user b/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Simulation/ParcelManager.cs b/OpenSim/Region/Simulation/ParcelManager.cs
index d15d77d..1cab4ab 100644
--- a/OpenSim/Region/Simulation/ParcelManager.cs
+++ b/OpenSim/Region/Simulation/ParcelManager.cs
@@ -32,10 +32,10 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-using OpenSim.Region.Scenes;
-using Avatar = OpenSim.Region.Scenes.ScenePresence;
+using OpenSim.Region.Environment.Scenes;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
 
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
 {
 
 
@@ -420,7 +420,7 @@ namespace OpenSim.Region
             {
                 for (y = 0; y < inc_y; y++)
                 {
-                    OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y);
+                    OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);
                     if (!temp.Contains(currentParcel))
                     {
                         currentParcel.forceUpdateParcelInfo();
diff --git a/OpenSim/Region/Simulation/RegionManager.cs b/OpenSim/Region/Simulation/RegionManager.cs
index a317f0f..17d9aad 100644
--- a/OpenSim/Region/Simulation/RegionManager.cs
+++ b/OpenSim/Region/Simulation/RegionManager.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Communications;
+using OpenSim.Framework.Communications;
 using OpenSim.Framework;
 using OpenSim.Framework.Types;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 
-namespace OpenSim.Region
+namespace OpenSim.Region.Environment
 {
     public class RegionManager //needs renaming , but first we need to rename the namespace
     {
diff --git a/OpenSim/Region/Simulation/Scenes/Entity.cs b/OpenSim/Region/Simulation/Scenes/Entity.cs
index f8754f5..bbba34d 100644
--- a/OpenSim/Region/Simulation/Scenes/Entity.cs
+++ b/OpenSim/Region/Simulation/Scenes/Entity.cs
@@ -31,9 +31,9 @@ using System.Text;
 using Axiom.MathLib;
 using OpenSim.Physics.Manager;
 using libsecondlife;
-using OpenSim.Region.Scripting;
+using OpenSim.Region.Environment.Scripting;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     public abstract class Entity : IScriptReadonlyEntity
     {
diff --git a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
index 65077e6..36023d0 100644
--- a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
@@ -7,7 +7,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     public interface IScenePresenceBody
     {
diff --git a/OpenSim/Region/Simulation/Scenes/Primitive.cs b/OpenSim/Region/Simulation/Scenes/Primitive.cs
index e04c711..0f649b2 100644
--- a/OpenSim/Region/Simulation/Scenes/Primitive.cs
+++ b/OpenSim/Region/Simulation/Scenes/Primitive.cs
@@ -36,7 +36,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     public class Primitive : Entity
     {
@@ -174,9 +174,9 @@ namespace OpenSim.Region.Scenes
             dataArrays.Add(primData.ToBytes());
             foreach (Entity child in children)
             {
-                if (child is OpenSim.Region.Scenes.Primitive)
+                if (child is OpenSim.Region.Environment.Scenes.Primitive)
                 {
-                    dataArrays.Add(((OpenSim.Region.Scenes.Primitive)child).GetByteArray());
+                    dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());
                 }
             }
             byte[] primstart = Helpers.StringToField("<Prim>");
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
index d1a2717..1d55c4d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     public partial class Scene
     {
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Scenes
             {
                 if (ent.LocalId == primLocalID)
                 {
-                    ((OpenSim.Region.Scenes.Primitive)ent).GetProperites(remoteClient);
+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);
                     break;
                 }
             }
@@ -266,7 +266,7 @@ namespace OpenSim.Region.Scenes
             {
                 if (ent.LocalId == localID)
                 {
-                    ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos);
+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).UpdatePosition(pos);
                     break;
                 }
             }
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
index 7b53388..2249c3d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using libsecondlife;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     public partial class Scene
     {
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.cs b/OpenSim/Region/Simulation/Scenes/Scene.cs
index bf2244e..7e56296 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.cs
@@ -39,14 +39,14 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework;
-using OpenSim.Region.Scripting;
+using OpenSim.Region.Environment.Scripting;
 using OpenSim.Terrain;
-using OpenGrid.Framework.Communications;
-using OpenSim.Caches;
-using OpenSim.Region;
-using OpenSim.Servers;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Caches;
+using OpenSim.Region.Environment;
+using OpenSim.Framework.Servers;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     public delegate bool FilterAvatarList(ScenePresence avatar);
 
@@ -256,7 +256,7 @@ namespace OpenSim.Region.Scenes
                 //Parcel backup routines
                 ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
                 int i = 0;
-                foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
+                foreach (OpenSim.Region.Environment.Parcel parcel in parcelManager.parcelList.Values)
                 {
                     parcels[i] = parcel.parcelData;
                     i++;
diff --git a/OpenSim/Region/Simulation/Scenes/SceneBase.cs b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
index 4dbd374..ecd14de 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
@@ -37,11 +37,11 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
-using OpenSim.Region.Scripting;
+using OpenSim.Region.Environment.Scripting;
 using OpenSim.Terrain;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     public abstract class SceneBase :  IWorld 
     {
diff --git a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
index 2898578..fa1bacb 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     /// <summary>
     /// A class for triggering remote scene events.
diff --git a/OpenSim/Region/Simulation/Scenes/SceneObject.cs b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
index 5df87bf..88fb160 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
@@ -35,7 +35,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     public class SceneObject : Entity
     {
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
index f0a8721..2caabc2 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
@@ -31,7 +31,7 @@ using System.Text;
 using libsecondlife;
 using System.Xml;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     partial class ScenePresence
     {
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes
 
                 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
 
-                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID)
+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
                 {
                     AnimsNames.Add(kp.Value, kp.Key);
                 }
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
index d21b11f..2c81d2a 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
@@ -34,7 +34,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     partial class ScenePresence
     {
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
index 45d3fed..96e5c94 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using Axiom.MathLib;
 
-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
     public partial class ScenePresence : Entity
     {
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
index daa1b92..eb8a117 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 
-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
     public interface IScriptContext
     {
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
index 44b886f..e813626 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 
-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
     public interface IScriptReadonlyEntity
     {
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
index 797998d..115b4f4 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
@@ -30,12 +30,12 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 using OpenSim.Physics.Manager;
-using OpenSim.Region;
-using OpenSim.Region.Scenes;
-using Avatar=OpenSim.Region.Scenes.ScenePresence;
-using Primitive = OpenSim.Region.Scenes.Primitive;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
+using Primitive = OpenSim.Region.Environment.Scenes.Primitive;
 
-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
     public delegate void ScriptEventHandler(IScriptContext context);
 
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
index 1d01f3c..5d398b0 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 
-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
     public class Script
     {
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
index 32ef046..0ce65ea 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
     public delegate Script ScriptFactory();
 }
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
index 21f07a8..90c79e3 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 
-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
     public class FollowRandomAvatar : Script
     {
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index ab3c34c..3bc6f25 100644
--- a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -39,7 +39,7 @@ using BerkeleyDb;
 using Kds.Serialization;
 using Kds.Serialization.Buffer;
 
-namespace OpenSim.Storage.LocalStorageBDB
+namespace OpenSim.Region.Storage.LocalStorageBDB
 {
     public class BDBLocalStorage : ILocalStorage
     {
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 8e6b04d..5cb4861 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
 
 
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
 {
     /// <summary>
     /// 
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
index 56387ac..22f3392 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
 {
     public class MapStorage
     {
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
index d24fb5f..dcbe639 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
@@ -34,7 +34,7 @@ using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
 {
     public class UUIDParcelQuery : Predicate
     {
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
index b2e8a91..23de6dd 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
@@ -34,7 +34,7 @@ using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 
-namespace OpenSim.Storage.LocalStorageDb4o
+namespace OpenSim.Region.Storage.LocalStorageDb4o
 {
     public class UUIDPrimQuery : Predicate
     {
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index b45debf..80158d5 100644
--- a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Storage.LocalStorageSQLite")]
+[assembly: AssemblyTitle("OpenSim.Region.Storage.LocalStorageSQLite")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Storage.LocalStorageSQLite")]
+[assembly: AssemblyProduct("OpenSim.Region.Storage.LocalStorageSQLite")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 8a7893e..b407be4 100644
--- a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -37,7 +37,7 @@ using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 
-namespace OpenSim.Storage.LocalStorageSQLite
+namespace OpenSim.Region.Storage.LocalStorageSQLite
 {
     public class SQLiteLocalStorage : ILocalStorage
     {
diff --git a/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll b/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll
index 06cbfdc..2cd3942 100644
Binary files a/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll and b/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll differ
diff --git a/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll b/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll
index 07a5958..6d2b002 100644
Binary files a/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll and b/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll differ
diff --git a/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll b/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll
index fd12ea1..1ec4f14 100644
Binary files a/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll and b/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll differ
-- 
cgit v1.1


From e392e222a83ee04ee25c00e26dfad5f47ffa69b8 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 16:55:27 +0000
Subject: *Added some missing files I forgot to add...OpenSim.sln should
 compile now

---
 OpenSim.suo                                        | Bin 303104 -> 0 bytes
 .../Communications/Local/CommunicationsLocal.cs    |  61 +++++
 .../Communications/Local/LocalBackEndServices.cs   | 209 +++++++++++++++++
 .../Communications/Local/LocalUserServices.cs      | 118 ++++++++++
 .../OpenSim.Region.Communications.Local.csproj     | 128 +++++++++++
 .../Local/Properties/AssemblyInfo.cs               |  35 +++
 .../Region/Communications/OGS1/GridCommsManager.cs |  18 ++
 .../Region/Communications/OGS1/OGS1GridServices.cs | 248 +++++++++++++++++++++
 .../Region/Communications/OGS1/OGSInterSimComms.cs |  70 ++++++
 .../Region/Communications/OGS1/OGSUserServices.cs  |  25 +++
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj | 149 +++++++++++++
 .../Communications/OGS1/Properties/AssemblyInfo.cs |  35 +++
 12 files changed, 1096 insertions(+)
 delete mode 100644 OpenSim.suo
 create mode 100644 OpenSim/Region/Communications/Local/CommunicationsLocal.cs
 create mode 100644 OpenSim/Region/Communications/Local/LocalBackEndServices.cs
 create mode 100644 OpenSim/Region/Communications/Local/LocalUserServices.cs
 create mode 100644 OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
 create mode 100644 OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
 create mode 100644 OpenSim/Region/Communications/OGS1/GridCommsManager.cs
 create mode 100644 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
 create mode 100644 OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs
 create mode 100644 OpenSim/Region/Communications/OGS1/OGSUserServices.cs
 create mode 100644 OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
 create mode 100644 OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs

diff --git a/OpenSim.suo b/OpenSim.suo
deleted file mode 100644
index 1d9597c..0000000
Binary files a/OpenSim.suo and /dev/null differ
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
new file mode 100644
index 0000000..c98cd11
--- /dev/null
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+
+
+namespace OpenSim.Region.Communications.Local
+{
+    public class CommunicationsLocal : CommunicationsManager
+    {
+        public LocalBackEndServices SandBoxServices = new LocalBackEndServices();
+        public LocalUserServices UserServices;
+
+        public CommunicationsLocal(NetworkServersInfo serversInfo)
+            : base(serversInfo)
+        {
+            UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
+            UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll");
+            UserServer = UserServices;
+            GridServer = SandBoxServices;
+            InterRegion = SandBoxServices;
+        }
+
+        internal void InformRegionOfLogin(ulong regionHandle, Login login)
+        {
+            this.SandBoxServices.AddNewSession(regionHandle, login);
+        }
+    }
+}
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
new file mode 100644
index 0000000..ae47890
--- /dev/null
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -0,0 +1,209 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework.Types;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+
+namespace OpenSim.Region.Communications.Local
+{
+
+    public class LocalBackEndServices : IGridServices, IInterRegionCommunications
+    {
+        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
+        protected Dictionary<ulong, RegionCommsListener> regionHosts = new Dictionary<ulong, RegionCommsListener>();
+
+        public LocalBackEndServices()
+        {
+
+        }
+
+        /// <summary>
+        /// Register a region method with the BackEnd Services.
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <returns></returns>
+        public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo)
+        {
+            //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
+            if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
+            {
+                //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
+                this.regions.Add(regionInfo.RegionHandle, regionInfo);
+                RegionCommsListener regionHost = new RegionCommsListener();
+                this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
+
+                return regionHost;
+            }
+
+            //already in our list of regions so for now lets return null
+            return null;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <returns></returns>
+        public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
+        {
+            // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
+            List<RegionInfo> neighbours = new List<RegionInfo>();
+
+            foreach (RegionInfo reg in this.regions.Values)
+            {
+                // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
+                if (reg.RegionHandle != regionInfo.RegionHandle)
+                {
+                    //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
+                    if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))
+                    {
+                        if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))
+                        {
+                            neighbours.Add(reg);
+                        }
+                    }
+                }
+            }
+            return neighbours;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <returns></returns>
+        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
+        {
+            if (this.regions.ContainsKey(regionHandle))
+            {
+                return this.regions[regionHandle];
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="minX"></param>
+        /// <param name="minY"></param>
+        /// <param name="maxX"></param>
+        /// <param name="maxY"></param>
+        /// <returns></returns>
+        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
+        {
+            List<MapBlockData> mapBlocks = new List<MapBlockData>();
+            foreach(RegionInfo regInfo in this.regions.Values)
+            {
+                if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
+                {
+                    MapBlockData map = new MapBlockData();
+                    map.Name = regInfo.RegionName;
+                    map.X = (ushort)regInfo.RegionLocX;
+                    map.Y = (ushort)regInfo.RegionLocY;
+                    map.WaterHeight =(byte) regInfo.estateSettings.waterHeight;
+                    map.MapImageId = regInfo.estateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");
+                    map.Agents = 1;
+                    map.RegionFlags = 72458694;
+                    map.Access = 13;
+                    mapBlocks.Add(map);
+                }
+            }
+            return mapBlocks;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="agentData"></param>
+        /// <returns></returns>
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
+        {
+            //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
+            if (this.regionHosts.ContainsKey(regionHandle))
+            {
+                // Console.WriteLine("CommsManager- Informing a region to expect child agent");
+                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="agentID"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (this.regionHosts.ContainsKey(regionHandle))
+            {
+                // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing");
+                this.regionHosts[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="loginData"></param>
+        /// <returns></returns>
+        public bool AddNewSession(ulong regionHandle, Login loginData)
+        {
+            //Console.WriteLine(" comms manager been told to expect new user");
+            AgentCircuitData agent = new AgentCircuitData();
+            agent.AgentID = loginData.Agent;
+            agent.firstname = loginData.First;
+            agent.lastname = loginData.Last;
+            agent.SessionID = loginData.Session;
+            agent.SecureSessionID = loginData.SecureSession;
+            agent.circuitcode = loginData.CircuitCode;
+            agent.BaseFolder = loginData.BaseFolder;
+            agent.InventoryFolder = loginData.InventoryFolder;
+            agent.startpos = new LLVector3(128, 128, 70);
+            agent.CapsPath = loginData.CapsPath;
+
+            if (this.regionHosts.ContainsKey(regionHandle))
+            {
+                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);
+                return true;
+            }
+
+            // region not found
+            return false;
+        }
+    }
+}
+
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
new file mode 100644
index 0000000..1eb574c
--- /dev/null
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Framework.Communications;
+//using OpenSim.Framework.User;
+using OpenSim.Framework.UserManagement;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+using libsecondlife;
+
+namespace OpenSim.Region.Communications.Local
+{
+    public class LocalUserServices : UserManagerBase, IUserServices
+    {
+        private CommunicationsLocal m_Parent;
+
+        private uint defaultHomeX ;
+        private uint defaultHomeY;
+        public LocalUserServices(CommunicationsLocal parent, uint defHomeX, uint defHomeY)
+        {
+            m_Parent = parent;
+            defaultHomeX = defHomeX;
+            defaultHomeY = defHomeY;
+        }
+
+        public UserProfileData GetUserProfile(string firstName, string lastName)
+        {
+            return GetUserProfile(firstName + " " + lastName);
+        }
+
+        public UserProfileData GetUserProfile(string name)
+        {
+            return this.getUserProfile(name);
+        }
+        public UserProfileData GetUserProfile(LLUUID avatarID)
+        {
+            return this.getUserProfile(avatarID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public override string GetMessage()
+        {
+            return "Welcome to OpenSim";
+        }
+
+        public override UserProfileData GetTheUser(string firstname, string lastname)
+        {
+            UserProfileData profile = getUserProfile(firstname, lastname);
+            if (profile != null)
+            {
+               
+                return profile;
+            }
+
+            //no current user account so make one
+            Console.WriteLine("No User account found so creating a new one ");
+            this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
+            
+            profile = getUserProfile(firstname, lastname);
+
+            return profile;
+        }
+
+        public override bool AuthenticateUser(ref UserProfileData profile, string password)
+        {
+            //for now we will accept any password in sandbox mode
+            Console.WriteLine("authorising user");
+            return true;
+        }
+
+        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
+        {
+            ulong currentRegion = theUser.currentAgent.currentHandle;
+            RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
+
+
+            if (reg != null)
+            {
+                response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +
+                 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
+                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
+                string capsPath = Util.GetRandomCapsPath();
+                response.SimAddress = reg.CommsIPListenAddr;
+                response.SimPort = (Int32)reg.CommsIPListenPort;
+                response.RegionX = reg.RegionLocX ;
+                response.RegionY = reg.RegionLocY ;
+                response.SeedCapability = "http://" + reg.CommsIPListenAddr + ":" + "9000" + "/CAPS/" + capsPath + "0000/";
+                theUser.currentAgent.currentRegion = reg.SimUUID;
+                theUser.currentAgent.currentHandle = reg.RegionHandle;
+
+                Login _login = new Login();
+                //copy data to login object
+                _login.First = response.Firstname;
+                _login.Last = response.Lastname;
+                _login.Agent = response.AgentID;
+                _login.Session = response.SessionID;
+                _login.SecureSession = response.SecureSessionID;
+                _login.CircuitCode = (uint)response.CircuitCode;
+                _login.CapsPath = capsPath;
+
+                m_Parent.InformRegionOfLogin(currentRegion, _login);
+            }
+            else
+            {
+                Console.WriteLine("not found region " + currentRegion);
+            }
+
+        }
+
+    }
+}
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
new file mode 100644
index 0000000..1a20965
--- /dev/null
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -0,0 +1,128 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EB3A1BA8-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Communications.Local</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Communications.Local</RootNamespace>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll">
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System">
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml">
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
+      <Name>OpenSim.Framework.Communications</Name>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
+      <Name>OpenSim.Framework.UserManagement</Name>
+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CommunicationsLocal.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LocalBackEndServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LocalUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..1eb7107
--- /dev/null
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.Region.Communications.Local")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.Region.Communications.Local")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
new file mode 100644
index 0000000..77848fa
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Region.Communications.OGS1
+{
+    public class GridCommsManager : CommunicationsManager
+    {
+        private OGS1GridServices gridInterComms = new OGS1GridServices();
+        public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
+        {
+            GridServer = gridInterComms;
+            InterRegion = gridInterComms;
+            UserServer = new OGSUserServices();
+        }
+    }
+}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
new file mode 100644
index 0000000..5f0c80c
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -0,0 +1,248 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Text;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Channels;
+using System.Runtime.Remoting.Channels.Tcp;
+
+using OpenSim.Framework.Servers;
+using OpenSim.Framework;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+
+using Nwc.XmlRpc;
+using libsecondlife;
+
+namespace OpenSim.Region.Communications.OGS1
+{
+    public class OGS1GridServices : IGridServices, IInterRegionCommunications
+    {
+        public Dictionary<ulong, RegionCommsListener> listeners = new Dictionary<ulong, RegionCommsListener>();
+        public GridInfo grid;
+        public BaseHttpServer httpListener;
+        private bool initialised = false;
+
+        public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo)
+        {
+            Hashtable GridParams = new Hashtable();
+
+            grid = gridInfo;
+
+            // Login / Authentication
+            GridParams["authkey"] = gridInfo.GridServerSendKey;
+            GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();
+            GridParams["sim_ip"] = regionInfo.CommsExternalAddress;
+            GridParams["sim_port"] = regionInfo.CommsIPListenPort.ToString();
+
+            // Package into an XMLRPC Request
+            ArrayList SendParams = new ArrayList(); 
+            SendParams.Add(GridParams);
+
+            // Send Request
+            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
+            XmlRpcResponse GridResp = GridReq.Send(gridInfo.GridServerURI, 3000);
+            Hashtable GridRespData = (Hashtable)GridResp.Value;
+            Hashtable griddatahash = GridRespData;
+
+            // Process Response
+            if (GridRespData.ContainsKey("error"))
+            {
+                string errorstring = (string)GridRespData["error"];
+                OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
+                return null;
+            }  
+
+            if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
+            {
+               // initialised = true;
+                httpListener = new BaseHttpServer(regionInfo.CommsIPListenPort);
+                httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);
+                httpListener.Start();
+            }
+
+            // Initialise the background listeners
+            listeners[regionInfo.RegionHandle] = new RegionCommsListener();
+
+            return listeners[regionInfo.RegionHandle];
+        }
+
+        public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
+        {
+            Hashtable respData = MapBlockQuery((int)regionInfo.RegionLocX - 1, (int)regionInfo.RegionLocY - 1, (int)regionInfo.RegionLocX + 1, (int)regionInfo.RegionLocY + 1);
+
+            List<RegionInfo> neighbours = new List<RegionInfo>();
+
+            foreach (Hashtable n in (Hashtable)respData.Values)
+            {
+                RegionInfo neighbour = new RegionInfo();
+
+                //OGS1
+                neighbour.RegionHandle = (ulong)n["regionhandle"];
+                neighbour.RegionLocX = (uint)n["x"];
+                neighbour.RegionLocY = (uint)n["y"];
+                neighbour.RegionName = (string)n["name"];
+
+                //OGS1+
+                neighbour.CommsIPListenAddr = (string)n["sim_ip"];
+                neighbour.CommsIPListenPort = (int)n["sim_port"];
+                neighbour.CommsExternalAddress = (string)n["sim_uri"];
+                neighbour.SimUUID = (string)n["uuid"];
+
+                neighbours.Add(neighbour);
+            }
+
+            return neighbours;
+        }
+
+        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");
+            return null;
+        }
+
+        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
+        {
+            Hashtable respData = MapBlockQuery(minX, minY, maxX, maxY);
+
+            List<MapBlockData> neighbours = new List<MapBlockData>();
+
+            foreach (Hashtable n in (Hashtable)respData.Values)
+            {
+                MapBlockData neighbour = new MapBlockData();
+
+                neighbour.X = (ushort)n["x"];
+                neighbour.Y = (ushort)n["y"];
+
+                neighbour.Name = (string)n["name"];
+                neighbour.Access = (byte)n["access"];
+                neighbour.RegionFlags = (uint)n["region-flags"];
+                neighbour.WaterHeight = (byte)n["water-height"];
+                neighbour.MapImageId = (string)n["map-image-id"];
+
+                neighbours.Add(neighbour);
+            }
+
+            return neighbours;
+        }
+
+        /// <summary>
+        /// Performs a XML-RPC query against the grid server returning mapblock information in the specified coordinates
+        /// </summary>
+        /// <remarks>REDUNDANT - OGS1 is to be phased out in favour of OGS2</remarks>
+        /// <param name="minX">Minimum X value</param>
+        /// <param name="minY">Minimum Y value</param>
+        /// <param name="maxX">Maximum X value</param>
+        /// <param name="maxY">Maximum Y value</param>
+        /// <returns>Hashtable of hashtables containing map data elements</returns>
+        private Hashtable MapBlockQuery(int minX, int minY, int maxX, int maxY)
+        {
+            Hashtable param = new Hashtable();
+            param["xmin"] = minX;
+            param["ymin"] = minY;
+            param["xmax"] = maxX;
+            param["ymax"] = maxY;
+            IList parameters = new ArrayList();
+            parameters.Add(param);
+            XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);
+            XmlRpcResponse resp = req.Send(grid.GridServerURI, 3000);
+            Hashtable respData = (Hashtable)resp.Value;
+            return respData;
+        }
+
+        // Grid Request Processing
+        public XmlRpcResponse ExpectUser(XmlRpcRequest request)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            AgentCircuitData agentData = new AgentCircuitData();
+            agentData.SessionID = new LLUUID((string)requestData["session_id"]);
+            agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
+            agentData.firstname = (string)requestData["firstname"];
+            agentData.lastname = (string)requestData["lastname"];
+            agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
+            agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
+            if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
+            {
+                agentData.child = true;
+            }
+            else
+            {
+                agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
+                agentData.child = false;
+
+            }
+
+            if (listeners.ContainsKey((ulong)requestData["regionhandle"]))
+            {
+                this.listeners[(ulong)requestData["regionhandle"]].TriggerExpectUser((ulong)requestData["regionhandle"], agentData);
+            }
+            else
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
+            }
+
+            return new XmlRpcResponse();
+        }
+
+        #region InterRegion Comms
+        private void StartRemoting()
+        {
+            TcpChannel ch = new TcpChannel(8895);
+            ChannelServices.RegisterChannel(ch);
+
+            WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton);
+            RemotingConfiguration.RegisterWellKnownServiceType(wellType);
+            InterRegionSingleton.Instance.OnArrival += this.IncomingArrival;
+            InterRegionSingleton.Instance.OnChildAgent += this.IncomingChildAgent;
+        }
+
+        #region Methods called by regions in this instance
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            if (this.listeners.ContainsKey(regionHandle))
+            {
+                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
+                return true;
+            }
+            //TODO need to see if we know about where this region is and use .net remoting 
+            // to inform it. 
+            return false;
+        }
+
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (this.listeners.ContainsKey(regionHandle))
+            {
+                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
+                return true;
+            }
+            //TODO need to see if we know about where this region is and use .net remoting 
+            // to inform it. 
+            return false;
+        }
+        #endregion
+
+        #region Methods triggered by calls from external instances
+        public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            if (this.listeners.ContainsKey(regionHandle))
+            {
+                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
+                return true;
+            }
+            return false;
+        }
+
+        public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (this.listeners.ContainsKey(regionHandle))
+            {
+                this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
+                return true;
+            }
+            return false;
+        }
+        #endregion
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs
new file mode 100644
index 0000000..51b33e9
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Region.Communications.OGS1
+{
+    public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
+    public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
+
+    public sealed class InterRegionSingleton
+    {
+        static readonly InterRegionSingleton instance = new InterRegionSingleton();
+
+        public event InformRegionChild OnChildAgent;
+        public event ExpectArrival OnArrival;
+
+        static InterRegionSingleton()
+        {
+        }
+
+        InterRegionSingleton()
+        {
+        }
+
+        public static InterRegionSingleton Instance
+        {
+            get
+            {
+                return instance;
+            }
+        }
+
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            if (OnChildAgent != null)
+            {
+                return OnChildAgent(regionHandle, agentData);
+            }
+            return false;
+        }
+
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (OnArrival != null)
+            {
+                return OnArrival(regionHandle, agentID, position);
+            }
+            return false;
+        }
+    }
+
+    public class OGS1InterRegionRemoting : MarshalByRefObject
+    {
+
+        public OGS1InterRegionRemoting()
+        {
+        }
+
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
+        }
+
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
+        }
+    }
+}
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
new file mode 100644
index 0000000..012774d
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Data;
+using libsecondlife;
+
+namespace OpenSim.Region.Communications.OGS1
+{
+    public class OGSUserServices :IUserServices
+    {
+        public UserProfileData GetUserProfile(string firstName, string lastName)
+        {
+            return null;
+        }
+        public UserProfileData GetUserProfile(string name)
+        {
+            return null;
+        }
+        public UserProfileData GetUserProfile(LLUUID avatarID)
+        {
+            return null;
+        }
+    }
+}
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
new file mode 100644
index 0000000..4bda6c9
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -0,0 +1,149 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6109024D-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Data">
+      <HintPath>System.Data.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting">
+      <HintPath>System.Runtime.Remoting.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml">
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
+      <Name>OpenSim.Framework.Communications</Name>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GridCommsManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OGS1GridServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OGSInterSimComms.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OGSUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0c6f965
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenGrid.Framework.Communications.OGS1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a8b2b39b-c83b-41e2-b0b5-7ccfc1fddae7")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
-- 
cgit v1.1


From 45f45c3755af94676b50baedbca65ff7ff46ba07 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 16:57:31 +0000
Subject: *Ran prebuild

---
 Prebuild/src/Prebuild.csproj      | 56 +++++++++++++++++++--------------------
 Prebuild/src/Prebuild.csproj.user |  2 +-
 Prebuild/src/Prebuild.exe.build   | 34 ++++++++++++------------
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index c8b859c..f332827 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,9 +83,6 @@
     <Compile Include="Prebuild.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\FatalException.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Core\Kernel.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -95,19 +92,25 @@
     <Compile Include="Core\WarningException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+    <Compile Include="Core\FatalException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Interfaces\ITarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Interfaces\IDataNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\TargetAttribute.cs">
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Interfaces\IDataNode.cs">
+    <Compile Include="Core\Attributes\TargetAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
+    <Compile Include="Core\Nodes\ProjectNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -119,76 +122,73 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FileNode.cs">
+    <Compile Include="Core\Nodes\OptionsNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
+    <Compile Include="Core\Nodes\ReferencePathNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\MatchNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\OptionsNode.cs">
+    <Compile Include="Core\Nodes\SolutionNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ProcessNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ProjectNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Core\Nodes\ReferenceNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ReferencePathNode.cs">
+    <Compile Include="Core\Nodes\FileNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\SolutionNode.cs">
+    <Compile Include="Core\Nodes\FilesNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\IfContext.cs">
+    <Compile Include="Core\Targets\DebugTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\Preprocessor.cs">
+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\AutotoolsTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\DebugTarget.cs">
+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
+    <Compile Include="Core\Targets\VS2002Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\NAntTarget.cs">
+    <Compile Include="Core\Targets\VS2003Target.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\SharpDevelop2Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
+    <Compile Include="Core\Targets\VS2005Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2002Target.cs">
+    <Compile Include="Core\Targets\NAntTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2003Target.cs">
+    <Compile Include="Core\Parse\IfContext.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2005Target.cs">
+    <Compile Include="Core\Parse\Preprocessor.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+    <Compile Include="Core\Utilities\Helper.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+    <Compile Include="Core\Utilities\Log.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\Helper.cs">
+    <Compile Include="Core\Utilities\CommandLineCollection.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\Log.cs">
+    <Compile Include="Core\Utilities\CurrentDirectory.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Prebuild/src/Prebuild.csproj.user b/Prebuild/src/Prebuild.csproj.user
index 6841907..4979c2b 100644
--- a/Prebuild/src/Prebuild.csproj.user
+++ b/Prebuild/src/Prebuild.csproj.user
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
+    <ReferencePath>C:\restructure2\bin\</ReferencePath>
     <LastOpenVersion>8.0.50727</LastOpenVersion>
     <ProjectView>ProjectFiles</ProjectView>
     <ProjectTrust>0</ProjectTrust>
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 2851125..52dd1a7 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
             </resources>
             <sources failonempty="true">
                 <include name="Prebuild.cs" />
-                <include name="Core/FatalException.cs" />
                 <include name="Core/Kernel.cs" />
                 <include name="Core/UnknownLanguageException.cs" />
                 <include name="Core/WarningException.cs" />
-                <include name="Core/Attributes/DataNodeAttribute.cs" />
+                <include name="Core/FatalException.cs" />
+                <include name="Core/Interfaces/ITarget.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
                 <include name="Core/Attributes/OptionNodeAttribute.cs" />
+                <include name="Core/Attributes/DataNodeAttribute.cs" />
                 <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Interfaces/IDataNode.cs" />
-                <include name="Core/Interfaces/ITarget.cs" />
+                <include name="Core/Nodes/ProjectNode.cs" />
                 <include name="Core/Nodes/ConfigurationNode.cs" />
                 <include name="Core/Nodes/DataNode.cs" />
                 <include name="Core/Nodes/ExcludeNode.cs" />
-                <include name="Core/Nodes/FileNode.cs" />
-                <include name="Core/Nodes/FilesNode.cs" />
-                <include name="Core/Nodes/MatchNode.cs" />
                 <include name="Core/Nodes/OptionsNode.cs" />
-                <include name="Core/Nodes/ProcessNode.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
-                <include name="Core/Nodes/ReferenceNode.cs" />
                 <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/MatchNode.cs" />
                 <include name="Core/Nodes/SolutionNode.cs" />
-                <include name="Core/Parse/IfContext.cs" />
-                <include name="Core/Parse/Preprocessor.cs" />
-                <include name="Core/Targets/AutotoolsTarget.cs" />
+                <include name="Core/Nodes/ProcessNode.cs" />
+                <include name="Core/Nodes/ReferenceNode.cs" />
+                <include name="Core/Nodes/FileNode.cs" />
+                <include name="Core/Nodes/FilesNode.cs" />
                 <include name="Core/Targets/DebugTarget.cs" />
                 <include name="Core/Targets/MonoDevelopTarget.cs" />
-                <include name="Core/Targets/NAntTarget.cs" />
-                <include name="Core/Targets/SharpDevelop2Target.cs" />
+                <include name="Core/Targets/AutotoolsTarget.cs" />
                 <include name="Core/Targets/SharpDevelopTarget.cs" />
                 <include name="Core/Targets/VS2002Target.cs" />
                 <include name="Core/Targets/VS2003Target.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.cs" />
                 <include name="Core/Targets/VS2005Target.cs" />
-                <include name="Core/Utilities/CommandLineCollection.cs" />
-                <include name="Core/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Parse/Preprocessor.cs" />
                 <include name="Core/Utilities/Helper.cs" />
                 <include name="Core/Utilities/Log.cs" />
+                <include name="Core/Utilities/CommandLineCollection.cs" />
+                <include name="Core/Utilities/CurrentDirectory.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
-- 
cgit v1.1


From fe120533efd0ec6b2248d96b9a1f8b7637c5dadd Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 17:12:32 +0000
Subject: *Updated prebuild.xml and ran prebuild again *Removed .user, .suo,
 and unneccessary files in /bin/Physics/ *OpenSim.sln should compile with nant
 and on windows now

---
 OpenSim.sln                                        |  26 +++----
 .../OpenSim.Framework.Communications.csproj        |   6 +-
 .../OpenSim.Framework.Communications.csproj.user   |  12 ----
 .../Console/OpenSim.Framework.Console.csproj       |   4 +-
 .../Console/OpenSim.Framework.Console.csproj.user  |  12 ----
 .../Data.DB4o/OpenSim.Framework.Data.DB4o.csproj   |   4 +-
 .../OpenSim.Framework.Data.DB4o.csproj.user        |  12 ----
 .../OpenSim.Framework.Data.MSSQL.csproj.user       |  12 ----
 .../Data.MySQL/OpenSim.Framework.Data.MySQL.csproj |  10 +--
 .../OpenSim.Framework.Data.MySQL.csproj.user       |  12 ----
 .../OpenSim.Framework.Data.SQLite.csproj           |   4 +-
 .../OpenSim.Framework.Data.SQLite.csproj.user      |  12 ----
 .../Framework/Data/OpenSim.Framework.Data.csproj   |  12 ++--
 .../Data/OpenSim.Framework.Data.csproj.user        |  12 ----
 OpenSim/Framework/General/OpenSim.Framework.csproj |  62 ++++++++---------
 .../General/OpenSim.Framework.csproj.user          |  12 ----
 ...OpenSim.Framework.GenericConfig.Xml.csproj.user |  12 ----
 .../Servers/OpenSim.Framework.Servers.csproj       |   8 +--
 .../Servers/OpenSim.Framework.Servers.csproj.user  |  12 ----
 .../OpenSim.Framework.UserManagement.csproj        |   4 +-
 .../OpenSim.Framework.UserManagement.csproj.user   |  12 ----
 .../AssetServer/OpenSim.Grid.AssetServer.csproj    |   4 +-
 .../OpenSim.Grid.AssetServer.csproj.user           |  12 ----
 .../OpenSim.Grid.Framework.Manager.csproj.user     |  12 ----
 .../OpenSim.Grid.GridServer.Config.csproj.user     |  12 ----
 .../GridServer/OpenSim.Grid.GridServer.csproj.user |  12 ----
 .../OpenSim.Grid.UserServer.Config.csproj.user     |  12 ----
 .../UserServer/OpenSim.Grid.UserServer.csproj.user |  12 ----
 OpenSim/Region/Application/OpenSim.csproj          |  75 ++++++++++-----------
 OpenSim/Region/Application/OpenSim.csproj.user     |  13 ----
 .../Caches/OpenSim.Region.Caches.csproj.user       |  12 ----
 .../ClientStack/OpenSim.Region.ClientStack.csproj  |  18 ++---
 .../OpenSim.Region.ClientStack.csproj.user         |  12 ----
 .../OpenSim.Region.Communications.Local.csproj     |  45 ++++++-------
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj |  55 +++++++--------
 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj |  61 ++++++++---------
 .../Examples/SimpleApp/SimpleApp.csproj.user       |  12 ----
 ...OpenSim.Region.GridInterfaces.Local.csproj.user |  12 ----
 ...penSim.Region.GridInterfaces.Remote.csproj.user |  12 ----
 ...m.Region.Physics.BasicPhysicsPlugin.csproj.user |  12 ----
 .../OpenSim.Region.Physics.Manager.csproj.user     |  12 ----
 .../OpenSim.Region.Physics.OdePlugin.csproj.user   |  12 ----
 .../OpenSim.Region.Physics.PhysXPlugin.csproj.user |  12 ----
 ...gion.Storage.LocalStorageBerkeleyDB.csproj.user |  12 ----
 .../OpenSim.Region.Storage.LocalStorageDb4o.csproj |   6 +-
 ...Sim.Region.Storage.LocalStorageDb4o.csproj.user |  12 ----
 ...m.Region.Storage.LocalStorageSQLite.csproj.user |  12 ----
 ...OpenSim.Region.Terrain.BasicTerrain.csproj.user |  12 ----
 Prebuild/Prebuild.suo                              | Bin 21504 -> 0 bytes
 Prebuild/src/Prebuild.csproj.user                  |  12 ----
 .../OpenSim.Region.Physics.BasicPhysicsPlugin.dll  | Bin 16384 -> 0 bytes
 bin/Physics/OpenSim.Region.Physics.OdePlugin.dll   | Bin 20480 -> 0 bytes
 bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll | Bin 20480 -> 0 bytes
 prebuild.xml                                       |  24 +++----
 54 files changed, 204 insertions(+), 609 deletions(-)
 delete mode 100644 OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj.user
 delete mode 100644 OpenSim/Framework/Console/OpenSim.Framework.Console.csproj.user
 delete mode 100644 OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj.user
 delete mode 100644 OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj.user
 delete mode 100644 OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj.user
 delete mode 100644 OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj.user
 delete mode 100644 OpenSim/Framework/Data/OpenSim.Framework.Data.csproj.user
 delete mode 100644 OpenSim/Framework/General/OpenSim.Framework.csproj.user
 delete mode 100644 OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj.user
 delete mode 100644 OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj.user
 delete mode 100644 OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj.user
 delete mode 100644 OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user
 delete mode 100644 OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj.user
 delete mode 100644 OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj.user
 delete mode 100644 OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj.user
 delete mode 100644 OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj.user
 delete mode 100644 OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj.user
 delete mode 100644 OpenSim/Region/Application/OpenSim.csproj.user
 delete mode 100644 OpenSim/Region/Caches/OpenSim.Region.Caches.csproj.user
 delete mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
 delete mode 100644 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj.user
 delete mode 100644 OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj.user
 delete mode 100644 OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj.user
 delete mode 100644 OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj.user
 delete mode 100644 OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj.user
 delete mode 100644 OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj.user
 delete mode 100644 OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj.user
 delete mode 100644 OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj.user
 delete mode 100644 OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj.user
 delete mode 100644 OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj.user
 delete mode 100644 OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj.user
 delete mode 100644 Prebuild/Prebuild.suo
 delete mode 100644 Prebuild/src/Prebuild.csproj.user
 delete mode 100644 bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll
 delete mode 100644 bin/Physics/OpenSim.Region.Physics.OdePlugin.dll
 delete mode 100644 bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll

diff --git a/OpenSim.sln b/OpenSim.sln
index 5d18b3d..ac2cefc 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Communications", "OpenSim\Framework\Communications\OpenSim.Framework.Communications.csproj", "{CB52B7E7-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{6109024D-0000-0000-0000-000000000000}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim\Framework\Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
@@ -24,12 +22,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caches", "Op
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.ClientStack", "OpenSim\Region\ClientStack\OpenSim.Region.ClientStack.csproj", "{DC3698B2-0000-0000-0000-000000000000}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.Local", "OpenSim\Region\Communications\Local\OpenSim.Region.Communications.Local.csproj", "{BFB5D807-0000-0000-0000-000000000000}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{4806E378-0000-0000-0000-000000000000}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Remote", "OpenSim\Region\GridInterfaces\Remote\OpenSim.Region.GridInterfaces.Remote.csproj", "{98C7B681-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.Local", "OpenSim\Region\Communications\Local\OpenSim.Region.Communications.Local.csproj", "{EB3A1BA8-0000-0000-0000-000000000000}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.BasicPhysicsPlugin", "OpenSim\Region\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj", "{15B4FEF3-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.Manager", "OpenSim\Region\Physics\Manager\OpenSim.Region.Physics.Manager.csproj", "{F4FF31EB-0000-0000-0000-000000000000}"
@@ -38,7 +38,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.OdeP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.PhysXPlugin", "OpenSim\Region\Physics\PhysXPlugin\OpenSim.Region.Physics.PhysXPlugin.csproj", "{A6D191D8-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Simulation\OpenSim.Region.Environment.csproj", "{C0DAB338-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Simulation", "OpenSim\Region\Simulation\OpenSim.Region.Simulation.csproj", "{C0DAB338-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageBerkeleyDB", "OpenSim\Region\Storage\LocalStorageBerkeleyDB\OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj", "{A4691E59-0000-0000-0000-000000000000}"
 EndProject
@@ -68,10 +68,6 @@ Global
 		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6109024D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6109024D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6109024D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6109024D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{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
@@ -104,6 +100,14 @@ Global
 		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -112,10 +116,6 @@ Global
 		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB3A1BA8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB3A1BA8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB3A1BA8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB3A1BA8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 31ab172..0ee62e9 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,16 +86,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommunicationsManager.cs">
+    <Compile Include="IUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="IGridServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IInterRegionCommunications.cs">
+    <Compile Include="CommunicationsManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IUserServices.cs">
+    <Compile Include="IInterRegionCommunications.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj.user b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index f3dcec5..c02a506 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -69,10 +69,10 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ConsoleCallbacksBase.cs">
+    <Compile Include="LogBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LogBase.cs">
+    <Compile Include="ConsoleCallbacksBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MainLog.cs">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj.user b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index b09cecf..f6e8311 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DB4oGridData.cs">
+    <Compile Include="DB4oUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="DB4oManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DB4oUserData.cs">
+    <Compile Include="DB4oGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj.user b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj.user b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 62e3887..09a32b5 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MySQLGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MySQLInventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLLogData.cs">
+    <Compile Include="MySQLUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MySQLManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLUserData.cs">
+    <Compile Include="MySQLLogData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj.user b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index 4ba24f1..dab22ea 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj.user b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index dcafbcd..47b9ba3 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -78,22 +78,22 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GridData.cs">
+    <Compile Include="ReservationData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ILogData.cs">
+    <Compile Include="GridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IniConfig.cs">
+    <Compile Include="SimProfileData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="InventoryData.cs">
+    <Compile Include="ILogData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ReservationData.cs">
+    <Compile Include="IniConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfileData.cs">
+    <Compile Include="InventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UserData.cs">
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj.user b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index e164d5a..7f71949 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -94,112 +94,112 @@
     <Compile Include="AuthenticateSessionBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BlockingQueue.cs">
+    <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IRegionCommsListener.cs">
+    <Compile Include="Logger.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LLSDHelpers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Logger.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LoginService.cs">
+    <Compile Include="Remoting.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionCommsListener.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Remoting.cs">
+    <Compile Include="LoginService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfile.cs">
+    <Compile Include="BlockingQueue.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UserProfile.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
+    <Compile Include="IRegionCommsListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimProfile.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\AuthenticateResponse.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\IUserServer.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Interfaces\IAssetServer.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\IWorld.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Interfaces\IClientAPI.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
+    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
+    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\Config\IGenericConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Interfaces\Config\IUserConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
+    <Compile Include="Interfaces\Config\IGridConfig.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
+    <Compile Include="Types\NeighbourInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentWearable.cs">
+    <Compile Include="Types\NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetBase.cs">
+    <Compile Include="Types\RegionHandle.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
+    <Compile Include="Types\RegionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetStorage.cs">
+    <Compile Include="Types\ParcelData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\EstateSettings.cs">
+    <Compile Include="Types\AgentWearable.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\Login.cs">
+    <Compile Include="Types\PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\MapBlockData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NeighbourInfo.cs">
+    <Compile Include="Types\AssetStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NetworkServersInfo.cs">
+    <Compile Include="Types\EstateSettings.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ParcelData.cs">
+    <Compile Include="Types\AgentCiruitData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\PrimData.cs">
+    <Compile Include="Types\Login.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionHandle.cs">
+    <Compile Include="Types\AssetLandmark.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionInfo.cs">
+    <Compile Include="Types\AssetBase.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj.user b/OpenSim/Framework/General/OpenSim.Framework.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj.user b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
index 399f456..5262224 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -93,16 +93,16 @@
     <Compile Include="BaseHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CheckSumServer.cs">
+    <Compile Include="IRestHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IRestHandler.cs">
+    <Compile Include="XmlRpcMethod.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServerBase.cs">
+    <Compile Include="CheckSumServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcMethod.cs">
+    <Compile Include="UDPServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj.user b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
index 02aa3f3..60c4b2f 100644
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
@@ -108,10 +108,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="LoginResponse.cs">
+    <Compile Include="UserManagerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserManagerBase.cs">
+    <Compile Include="LoginResponse.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj.user b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index caebca3..945b7a5 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -98,10 +98,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssetHttpServer.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Main.cs">
+    <Compile Include="AssetHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj.user b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj.user b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj.user b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj.user b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj.user b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index fcde555..d5730a4 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
     <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,31 +55,30 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll">
+    <Reference Include="Axiom.MathLib.dll" >
       <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Db4objects.Db4o.dll">
+    <Reference Include="Db4objects.Db4o.dll" >
       <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC.dll">
+    <Reference Include="XMLRPC.dll" >
       <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -95,82 +88,86 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
       <Name>OpenSim.Framework.GenericConfig.Xml</Name>
       <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
       <Name>OpenSim.Framework.Servers</Name>
       <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
       <Name>OpenSim.Framework.UserManagement</Name>
       <Project>{586E2916-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
       <Name>OpenSim.Region.Caches</Name>
       <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj">
       <Name>OpenSim.Region.ClientStack</Name>
       <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
-      <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
       <Name>OpenSim.Region.Communications.Local</Name>
+      <Project>{BFB5D807-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj">
-      <Project>{6109024D-0000-0000-0000-000000000000}</Project>
       <Name>OpenSim.Region.Communications.OGS1</Name>
+      <Project>{4806E378-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
       <Name>OpenSim.Region.Physics.Manager</Name>
       <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Simulation\OpenSim.Region.Environment.csproj">
-      <Name>OpenSim.Region.Environment</Name>
+    <ProjectReference Include="..\Simulation\OpenSim.Region.Simulation.csproj">
+      <Name>OpenSim.Region.Simulation</Name>
       <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
       <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
       <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Application.cs">
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
@@ -181,4 +178,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/Region/Application/OpenSim.csproj.user b/OpenSim/Region/Application/OpenSim.csproj.user
deleted file mode 100644
index 2ff1c4c..0000000
--- a/OpenSim/Region/Application/OpenSim.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <StartArguments>-loginserver -sandbox -accounts</StartArguments>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj.user b/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Caches/OpenSim.Region.Caches.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 0b19359..4b5f2a7 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -126,37 +126,37 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClientStackNetworkHandler.cs">
+    <Compile Include="ClientView.AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.AgentAssetUpload.cs">
+    <Compile Include="ClientStackNetworkHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
+    <Compile Include="ClientView.API.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="PacketServer.cs">
+    <Compile Include="VersionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientViewBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="VersionInfo.cs">
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 1a20965..0a15a49 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -1,13 +1,12 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EB3A1BA8-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{BFB5D807-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Region.Communications.Local</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Region.Communications.Local</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,18 +28,16 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,19 +55,18 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libsecondlife.dll">
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -83,25 +76,25 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
       <Name>OpenSim.Framework.Data</Name>
       <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
       <Name>OpenSim.Framework.UserManagement</Name>
       <Project>{586E2916-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -125,4 +118,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 4bda6c9..8cc5641 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -1,13 +1,12 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6109024D-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,18 +28,16 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
     <RegisterForComInterop>False</RegisterForComInterop>
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,33 +55,32 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data">
+    <Reference Include="System.Data" >
       <HintPath>System.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Runtime.Remoting">
+    <Reference Include="System.Runtime.Remoting" >
       <HintPath>System.Runtime.Remoting.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="XMLRPC.dll" >
       <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -95,31 +88,31 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
       <Name>OpenSim.Framework.Data</Name>
       <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
       <Name>OpenSim.Framework.Servers</Name>
       <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -146,4 +139,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 8a62af4..03805ae 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
     <ProjectGuid>{24B12448-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>SimpleApp</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>SimpleApp</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,27 +55,26 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data.dll">
+    <Reference Include="System.Data.dll" >
       <HintPath>..\..\..\..\bin\System.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC.dll">
+    <Reference Include="XMLRPC.dll" >
       <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -91,51 +84,55 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
-      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
       <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
       <Name>OpenSim.Region.Caches</Name>
       <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">
       <Name>OpenSim.Region.ClientStack</Name>
       <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
-      <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
       <Name>OpenSim.Region.Communications.Local</Name>
+      <Project>{BFB5D807-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
       <Name>OpenSim.Region.GridInterfaces.Local</Name>
       <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj">
-      <Name>OpenSim.Region.Environment</Name>
+    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Simulation.csproj">
+      <Name>OpenSim.Region.Simulation</Name>
       <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -156,4 +153,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj.user b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj.user b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj.user b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj.user b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj.user b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj.user b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 147158c..716fd57 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,9 +93,6 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -105,6 +102,9 @@
     <Compile Include="UUIDPrimQuery.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Db4LocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj.user b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj.user b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj.user b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/Prebuild/Prebuild.suo b/Prebuild/Prebuild.suo
deleted file mode 100644
index 3829a4a..0000000
Binary files a/Prebuild/Prebuild.suo and /dev/null differ
diff --git a/Prebuild/src/Prebuild.csproj.user b/Prebuild/src/Prebuild.csproj.user
deleted file mode 100644
index 4979c2b..0000000
--- a/Prebuild/src/Prebuild.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\restructure2\bin\</ReferencePath>
-    <LastOpenVersion>8.0.50727</LastOpenVersion>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-</Project>
diff --git a/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll b/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll
deleted file mode 100644
index 2cd3942..0000000
Binary files a/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll and /dev/null differ
diff --git a/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll b/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll
deleted file mode 100644
index 6d2b002..0000000
Binary files a/bin/Physics/OpenSim.Region.Physics.OdePlugin.dll and /dev/null differ
diff --git a/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll b/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll
deleted file mode 100644
index 1ec4f14..0000000
Binary files a/bin/Physics/OpenSim.Region.Physics.PhysXPlugin.dll and /dev/null differ
diff --git a/prebuild.xml b/prebuild.xml
index c20be88..efd114d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -494,19 +494,19 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Framework.Communications.OGS1" path="OpenSim/Framework/Communications.OGS1" type="Library">
+    <Project name="OpenSim.Region.Communications.OGS1" path="OpenSim/Region/Communications/OGS1" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../bin/</ReferencePath>
+      <ReferencePath>../../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
@@ -524,19 +524,19 @@
       </Files>
     </Project>
     
-    <Project name="OpenSim.Region.LocalCommunications" path="OpenSim/Region/LocalCommunications" type="Library">
+    <Project name="OpenSim.Region.Communications.Local" path="OpenSim/Region/Communications/Local" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../bin/</ReferencePath>
+      <ReferencePath>../../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
      <Reference name="OpenSim.Framework.Communications"/>
@@ -645,11 +645,11 @@
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
 	<Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Framework.Communications.OGS1"/>
+      <Reference name="OpenSim.Region.Communications.OGS1"/>
 	<Reference name="OpenSim.Region.Caches"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.UserManagement" />
-      <Reference name="OpenSim.Region.LocalCommunications"/>
+      <Reference name="OpenSim.Region.Communications.Local"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
@@ -681,9 +681,9 @@
       <Reference name="OpenSim.Framework"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Region.GridInterfaces.Local"/>
-      <Reference name="OpenSim.Servers"/>
+      <Reference name="OpenSim.Framework.Servers"/>
 <Reference name="OpenSim.Framework.Communications"/>      
-<Reference name="OpenSim.Region.LocalCommunications"/>      
+<Reference name="OpenSim.Region.Communications.Local"/>      
       <Reference name="OpenSim.Region.Caches"/>
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Region.Simulation"/>
-- 
cgit v1.1


From 1dcc814b703771c4dd96592b73727db2b54028a3 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 17:20:45 +0000
Subject: *More compile fixes (should be it on OpenSim.sln)

---
 OpenSim.sln                                        | 12 +--
 OpenSim/Framework/General/OpenSim.Framework.csproj |  4 +-
 OpenSim/Region/Application/OpenSim.csproj          | 12 +--
 .../OpenSim.Region.Communications.Local.csproj     |  6 +-
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj |  6 +-
 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj | 12 +--
 .../Simulation/OpenSim.Region.Environment.csproj   | 87 ++++++++++------------
 prebuild.xml                                       |  6 +-
 8 files changed, 69 insertions(+), 76 deletions(-)

diff --git a/OpenSim.sln b/OpenSim.sln
index ac2cefc..746cd3d 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communicatio
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{4806E378-0000-0000-0000-000000000000}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Simulation\OpenSim.Region.Environment.csproj", "{DCBA491C-0000-0000-0000-000000000000}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Remote", "OpenSim\Region\GridInterfaces\Remote\OpenSim.Region.GridInterfaces.Remote.csproj", "{98C7B681-0000-0000-0000-000000000000}"
@@ -38,8 +40,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.OdeP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.PhysXPlugin", "OpenSim\Region\Physics\PhysXPlugin\OpenSim.Region.Physics.PhysXPlugin.csproj", "{A6D191D8-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Simulation", "OpenSim\Region\Simulation\OpenSim.Region.Simulation.csproj", "{C0DAB338-0000-0000-0000-000000000000}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageBerkeleyDB", "OpenSim\Region\Storage\LocalStorageBerkeleyDB\OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj", "{A4691E59-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageDb4o", "OpenSim\Region\Storage\LocalStorageDb4o\OpenSim.Region.Storage.LocalStorageDb4o.csproj", "{43DB702D-0000-0000-0000-000000000000}"
@@ -108,6 +108,10 @@ Global
 		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -132,10 +136,6 @@ Global
 		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0DAB338-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0DAB338-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0DAB338-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0DAB338-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 7f71949..3e77f1e 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -91,10 +91,10 @@
     <Compile Include="AgentInventory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AuthenticateSessionBase.cs">
+    <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
+    <Compile Include="AuthenticateSessionBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Logger.cs">
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index d5730a4..8e50e92 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -144,15 +144,15 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+    <ProjectReference Include="..\Simulation\OpenSim.Region.Environment.csproj">
+      <Name>OpenSim.Region.Environment</Name>
+      <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Simulation\OpenSim.Region.Simulation.csproj">
-      <Name>OpenSim.Region.Simulation</Name>
-      <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 0a15a49..f9f6b7d 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,13 +98,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommunicationsLocal.cs">
+    <Compile Include="LocalUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LocalBackEndServices.cs">
+    <Compile Include="CommunicationsLocal.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LocalUserServices.cs">
+    <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 8cc5641..1aa7019 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,16 +116,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GridCommsManager.cs">
+    <Compile Include="OGSUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGS1GridServices.cs">
+    <Compile Include="GridCommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGSInterSimComms.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGSUserServices.cs">
+    <Compile Include="OGS1GridServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 03805ae..2eb5ac0 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -122,15 +122,15 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
-      <Name>OpenSim.Region.GridInterfaces.Local</Name>
-      <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
+    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj">
+      <Name>OpenSim.Region.Environment</Name>
+      <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Simulation.csproj">
-      <Name>OpenSim.Region.Simulation</Name>
-      <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
+    <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
+      <Name>OpenSim.Region.GridInterfaces.Local</Name>
+      <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
index 0597857..60305bd 100644
--- a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
@@ -1,13 +1,12 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C0DAB338-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{DCBA491C-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Region.Environment</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Region.Environment</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,31 +55,30 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll">
+    <Reference Include="Axiom.MathLib.dll" >
       <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Db4objects.Db4o.dll">
+    <Reference Include="Db4objects.Db4o.dll" >
       <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC.dll">
+    <Reference Include="XMLRPC.dll" >
       <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -95,53 +88,53 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
       <Name>OpenSim.Framework.GenericConfig.Xml</Name>
       <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
       <Name>OpenSim.Framework.Servers</Name>
       <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
       <Name>OpenSim.Region.Caches</Name>
       <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
       <Name>OpenSim.Region.Physics.Manager</Name>
       <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
       <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
       <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Caps.cs">
+    <Compile Include="RegionManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="EstateManager.cs">
@@ -150,58 +143,58 @@
     <Compile Include="ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionManager.cs">
+    <Compile Include="Caps.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
+    <Compile Include="Scenes\Scene.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Primitive.cs">
+    <Compile Include="Scenes\Scene.Scripting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.cs">
+    <Compile Include="Scenes\ScenePresence.Body.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.PacketHandlers.cs">
+    <Compile Include="Scenes\SceneEvents.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.Scripting.cs">
+    <Compile Include="Scenes\ScenePresence.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\ScenePresence.Animations.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneEvents.cs">
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Animations.cs">
+    <Compile Include="Scenes\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
+    <Compile Include="Scenes\SceneBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
+    <Compile Include="Scenes\IScenePresenceBody.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\IScriptContext.cs">
+    <Compile Include="Scenes\scripting\IScriptHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\IScriptEntity.cs">
+    <Compile Include="Scenes\scripting\ScriptFactory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\IScriptHandler.cs">
+    <Compile Include="Scenes\scripting\IScriptContext.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\Script.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\ScriptFactory.cs">
+    <Compile Include="Scenes\scripting\IScriptEntity.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs">
@@ -215,4 +208,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/prebuild.xml b/prebuild.xml
index efd114d..2488587 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -584,7 +584,7 @@
 
 
 
-    <Project name="OpenSim.Region.Simulation" path="OpenSim/Region/Simulation" type="Library">
+    <Project name="OpenSim.Region.Environment" path="OpenSim/Region/Simulation" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -641,7 +641,7 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Framework.Servers"/>
-	<Reference name="OpenSim.Region.Simulation"/>
+	<Reference name="OpenSim.Region.Environment"/>
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
 	<Reference name="OpenSim.Framework.Communications"/>
@@ -686,7 +686,7 @@
 <Reference name="OpenSim.Region.Communications.Local"/>      
       <Reference name="OpenSim.Region.Caches"/>
       <Reference name="OpenSim.Region.ClientStack"/>
-      <Reference name="OpenSim.Region.Simulation"/>
+      <Reference name="OpenSim.Region.Environment"/>
       
 
       <Files>
-- 
cgit v1.1


From 2261e4ec2a43a56dbb74168a169f39b2c6c1f054 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 18:04:07 +0000
Subject: *Fixed all renaming for OpenGridServices.sln, still a reference issue
 in prebuild.xml though

---
 OpenSim.sln                                        | 295 +++++++++++++--------
 .../Framework/Data.DB4o/Properties/AssemblyInfo.cs |   4 +-
 OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs      |   4 +-
 OpenSim/Framework/Data.MSSQL/MSSQLManager.cs       |   4 +-
 .../Data.MSSQL/Properties/AssemblyInfo.cs          |   4 +-
 OpenSim/Framework/Data.MySQL/MySQLGridData.cs      |   4 +-
 OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs |   2 +-
 OpenSim/Framework/Data.MySQL/MySQLLogData.cs       |   2 +-
 OpenSim/Framework/Data.MySQL/MySQLManager.cs       |   4 +-
 OpenSim/Framework/Data.MySQL/MySQLUserData.cs      |   4 +-
 .../Data.MySQL/OpenSim.Framework.Data.MySQL.csproj |  10 +-
 .../Data.MySQL/Properties/AssemblyInfo.cs          |   4 +-
 .../OpenSim.Framework.Data.SQLite.csproj           |   4 +-
 .../Data.SQLite/Properties/AssemblyInfo.cs         |   4 +-
 OpenSim/Framework/Data.SQLite/SQLiteGridData.cs    |   4 +-
 OpenSim/Framework/Data.SQLite/SQLiteManager.cs     |   4 +-
 OpenSim/Framework/Data/Properties/AssemblyInfo.cs  |   4 +-
 OpenSim/Grid/AssetServer/AssetHttpServer.cs        |   4 +-
 OpenSim/Grid/AssetServer/Main.cs                   |   4 +-
 .../Grid/Framework.Manager/GridManagementAgent.cs  |   6 +-
 .../Grid/Framework.Manager/GridServerManager.cs    |   2 +-
 .../OpenSim.Grid.Framework.Manager.csproj          |   4 +-
 OpenSim/Grid/GridServer/GridManager.cs             |   4 +-
 OpenSim/Grid/GridServer/Main.cs                    |  12 +-
 OpenSim/Grid/UserServer/Main.cs                    |  10 +-
 .../Grid/UserServer/OpenSim.Grid.UserServer.csproj |   4 +-
 OpenSim/Grid/UserServer/UserManager.cs             |   7 +-
 prebuild.xml                                       |   4 +-
 28 files changed, 249 insertions(+), 173 deletions(-)

diff --git a/OpenSim.sln b/OpenSim.sln
index 746cd3d..b417127 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", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
@@ -51,113 +51,188 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-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
-		{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
-		{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
-		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{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
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24B12448-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
+    ({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).6 = ({C74E4A30-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).7 = ({2CC71860-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).8 = ({586E2916-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).10 = ({DC3698B2-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).11 = ({BFB5D807-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).12 = ({4806E378-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).13 = ({DCBA491C-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).14 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).15 = ({C9E0F891-0000-0000-0000-000000000000})
+    ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000})
+    ({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).7 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).8 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).9 = ({C9E0F891-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).6 = ({C74E4A30-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).7 = ({2CC71860-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).8 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).9 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).10 = ({C9E0F891-0000-0000-0000-000000000000})
+    ({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000})
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {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
+    {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
+    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {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
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
index dc4a9a1..68395a1 100644
--- a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.DB4o")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.DB4o")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.DB4o")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.DB4o")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
index 1dac4bd..5bdceaf 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 
-namespace OpenGrid.Framework.Data.MSSQL
+namespace OpenSim.Framework.Data.MSSQL
 {
     /// <summary>
     /// A grid data interface for Microsoft SQL Server
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index 475a3e7..7cf1a56 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -32,9 +32,9 @@ using System.Data;
 
 using System.Data.SqlClient;
 
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 
-namespace OpenGrid.Framework.Data.MSSQL
+namespace OpenSim.Framework.Data.MSSQL
 {
     /// <summary>
     /// A management class for the MS SQL Storage Engine
diff --git a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
index bbe3cdf..af310e8 100644
--- a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.MSSQL")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.MSSQL")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.MSSQL")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.MSSQL")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 4d6cf63..43e3054 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
     /// <summary>
     /// A MySQL Interface for the Grid Server
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index fb429e4..434df1a 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
     /// <summary>
     /// A MySQL interface for the inventory server
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index c88b39f..8265614 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
     /// <summary>
     /// An interface to the log database for MySQL
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 53b3bdd..b2f398b 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -36,9 +36,9 @@ using MySql.Data;
 using MySql.Data.Types;
 using MySql.Data.MySqlClient;
 
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
     /// <summary>
     /// A MySQL Database manager
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 032a0e6..0304452 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -28,10 +28,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using libsecondlife;
 
-namespace OpenGrid.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
 {
     /// <summary>
     /// A database interface class to a user profile storage system
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 09a32b5..62e3887 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MySQLInventoryData.cs">
+    <Compile Include="MySQLGridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLUserData.cs">
+    <Compile Include="MySQLInventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLManager.cs">
+    <Compile Include="MySQLLogData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLLogData.cs">
+    <Compile Include="MySQLManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLGridData.cs">
+    <Compile Include="MySQLUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
index 0bfd1d6..d67ccf6 100644
--- a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.MySQL")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.MySQL")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.MySQL")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.MySQL")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index dab22ea..4ba24f1 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index 57c4bae..f811825 100644
--- a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data.SQLite")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data.SQLite")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data.SQLite")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data.SQLite")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index d7a5a69..800e26c 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 
-namespace OpenGrid.Framework.Data.SQLite
+namespace OpenSim.Framework.Data.SQLite
 {
     /// <summary>
     /// A Grid Interface to the SQLite database
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index 9689356..b67b79c 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -32,9 +32,9 @@ using System.Data;
 
 using System.Data.SQLite;
 
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 
-namespace OpenGrid.Framework.Data.SQLite
+namespace OpenSim.Framework.Data.SQLite
 {
     class SQLiteManager
     {
diff --git a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
index 1446673..7d749d5 100644
--- a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Data")]
+[assembly: AssemblyTitle("OpenSim.Framework.Data")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Data")]
+[assembly: AssemblyProduct("OpenSim.Framework.Data")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
index 6fc6bf8..ad8733f 100644
--- a/OpenSim/Grid/AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -35,9 +35,9 @@ using System.Threading;
 using Nwc.XmlRpc;
 using System.Collections;
 using OpenSim.Framework.Console;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 
-namespace OpenGridServices.AssetServer
+namespace OpenSim.Grid.AssetServer
 {
     /// <summary>
     /// An HTTP server for sending assets
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 96c9dba..d06998d 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -40,11 +40,11 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Utilities;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
 
-namespace OpenGridServices.AssetServer
+namespace OpenSim.Grid.AssetServer
 {
     /// <summary>
     /// An asset server
diff --git a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index dfc572a..3f5d7dd 100644
--- a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -27,12 +27,12 @@
 */
 using Nwc.XmlRpc;
 using OpenSim.Framework;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 
-namespace OpenGrid.Framework.Manager
+namespace OpenSim.Framework.Manager
 {
     /// <summary>
     /// Used to pass messages to the gridserver
@@ -116,7 +116,7 @@ namespace OpenGrid.Framework.Manager
             Hashtable requestData = (Hashtable)request.Params[0];
             Hashtable responseData = new Hashtable();
 
-            // TODO: Switch this over to using OpenGrid.Framework.Data
+            // TODO: Switch this over to using OpenSim.Framework.Data
             if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
             {
                 response.IsFault = false;
diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
index e276556..d5eaf6f 100644
--- a/OpenSim/Grid/Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -33,7 +33,7 @@ using Nwc.XmlRpc;
 using System.Threading;
 using libsecondlife;
 
-namespace OpenGrid.Framework.Manager {
+namespace OpenSim.Framework.Manager {
 
     /// <summary>
     /// A remote management system for the grid server
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
index 9a98ff4..12edcd0 100644
--- a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
@@ -82,10 +82,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GridManagementAgent.cs">
+    <Compile Include="GridServerManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="GridServerManager.cs">
+    <Compile Include="GridManagementAgent.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index bf80652..c78d14a 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -30,7 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using System.Reflection;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Sims;
@@ -38,7 +38,7 @@ using libsecondlife;
 using Nwc.XmlRpc;
 using System.Xml;
 
-namespace OpenGridServices.GridServer
+namespace OpenSim.Grid.GridServer
 {
     class GridManager
     {
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index b948fd6..b225214 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -34,22 +34,22 @@ using System.Net;
 using System.Threading;
 using System.Reflection;
 using libsecondlife;
-using OpenGrid.Framework.Manager;
+using OpenSim.Framework.Manager;
 using OpenSim.Framework;
 using OpenSim.Framework.Sims;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.GenericConfig;
 
-namespace OpenGridServices.GridServer
+namespace OpenSim.Grid.GridServer
 {
     /// <summary>
     /// </summary>
     public class OpenGrid_Main : conscmd_callback
     {
         private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
-        private string GridDll = "OpenGrid.Framework.Data.MySQL.dll";
+        private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
         public GridConfig Cfg;
 
         public static OpenGrid_Main thegrid;
@@ -253,8 +253,8 @@ namespace OpenGridServices.GridServer
                 attri = configData.GetAttribute("DataBaseProvider");
                 if (attri == "")
                 {
-                    GridDll = "OpenGrid.Framework.Data.DB4o.dll";
-                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
+                    GridDll = "OpenSim.Framework.Data.DB4o.dll";
+                    configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
                 }
                 else
                 {
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 5c27d57..c0ff649 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -38,18 +38,18 @@ using OpenSim.Framework.Sims;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Console;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework.Utilities;
 using OpenSim.GenericConfig;
 
-namespace OpenGridServices.UserServer
+namespace OpenSim.Grid.UserServer
 {
     /// <summary>
     /// </summary>
     public class OpenUser_Main :  conscmd_callback
     {
         private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";
-        private string StorageDll = "OpenGrid.Framework.Data.MySQL.dll";
+        private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
         private UserConfig Cfg;
         protected IGenericConfig localXMLConfig;
 
@@ -169,8 +169,8 @@ namespace OpenGridServices.UserServer
                 attri = configData.GetAttribute("DataBaseProvider");
                 if (attri == "")
                 {
-                    StorageDll = "OpenGrid.Framework.Data.DB4o.dll";
-                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
+                    StorageDll = "OpenSim.Framework.Data.DB4o.dll";
+                    configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
                 }
                 else
                 {
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index 3c93b78..e5cb92c 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -112,10 +112,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs">
+    <Compile Include="UserManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserManager.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 0704de1..c99cf87 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using OpenGrid.Framework.Data;
+using OpenSim.Framework.Data;
 using libsecondlife;
 using System.Reflection;
 
@@ -38,11 +38,12 @@ using Nwc.XmlRpc;
 using OpenSim.Framework.Sims;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
-using OpenGrid.Framework.UserManagement;
+
+using OpenSim.Framework.UserManagement;
 
 using System.Security.Cryptography;
 
-namespace OpenGridServices.UserServer
+namespace OpenSim.Grid.UserServer
 {
     public class UserManager : UserManagerBase
     {
diff --git a/prebuild.xml b/prebuild.xml
index 2488587..6638d40 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -469,7 +469,7 @@
      </Files> 
     </Project>
 
-    <!-- OpenGridFrameWork.Communications" -->
+    <!-- OpenSim.Framework.Communications -->
 	<Project name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -730,7 +730,7 @@
     </Configuration>
 
  
-  <!-- OpenGrid Data Services -->
+  <!-- OpenSim Data Services -->
     <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
       <Configuration name="Debug">
         <Options>
-- 
cgit v1.1


From 1a6f58f3378e28199056577e58c5177f23515138 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 18:28:45 +0000
Subject: *Fixed OpenGridServices.sln and prebuild.xml *NameSpaceChanges branch
 now fully compiles!

---
 OpenGridServices.sln                               | 126 ++++++++++-----------
 .../Grid/UserServer/OpenSim.Grid.UserServer.csproj |  10 +-
 prebuild.xml                                       |   2 +-
 3 files changed, 65 insertions(+), 73 deletions(-)

diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 2a6079e..5f47b6b 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C# Express 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,71 +25,61 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(ProjectDependencies) = postSolution
-    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
-    ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-  EndGlobalSection
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {08F87229-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(ProjectConfigurationPlatforms) = postSolution
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index e5cb92c..e822c18 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -82,10 +82,6 @@
       <HintPath>OpenSim.Framework.Servers.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OpenSim.Framework.UserManager" >
-      <HintPath>OpenSim.Framework.UserManager.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
@@ -110,6 +106,12 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
+      <Name>OpenSim.Framework.UserManagement</Name>
+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="UserManager.cs">
diff --git a/prebuild.xml b/prebuild.xml
index 6638d40..dacaa0a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -985,7 +985,7 @@
      <Reference name="OpenSim.Framework.Data"/>
      <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
      <Reference name="OpenSim.Framework.Servers"/>
-     <Reference name="OpenSim.Framework.UserManager" />
+     <Reference name="OpenSim.Framework.UserManagement" />
      <Reference name="libsecondlife.dll"/>
      <Reference name="Db4objects.Db4o.dll"/>
      <Reference name="XMLRPC.dll"/>
-- 
cgit v1.1


From 9eaecabdd0884cfe17d249440badce1ecdbcc142 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 19:04:23 +0000
Subject: *Moved VersionInfo.cs to its correct place in OpenSim.csproj *Added
 OpenSim.Region.Caps *Updated prebuild.xml and ran prebuild

---
 OpenSim.sln                                        | 301 ++++++++-------------
 .../Data.MySQL/OpenSim.Framework.Data.MySQL.csproj |  10 +-
 .../OpenSim.Framework.Data.SQLite.csproj           |   4 +-
 .../OpenSim.Grid.Framework.Manager.csproj          |   4 +-
 .../Grid/UserServer/OpenSim.Grid.UserServer.csproj |   4 +-
 OpenSim/Region/Application/OpenSim.csproj          |   7 +-
 OpenSim/Region/Application/OpenSimMain.cs          |   2 +-
 OpenSim/Region/Application/VersionInfo.cs          |  38 +++
 OpenSim/Region/Caps/Caps.cs                        |   4 +-
 .../ClientStack/OpenSim.Region.ClientStack.csproj  |  11 +-
 .../Region/ClientStack/RegionApplicationBase.cs    |   2 +-
 OpenSim/Region/ClientStack/UDPServer.cs            |   2 +-
 OpenSim/Region/ClientStack/VersionInfo.cs          |  38 ---
 .../Simulation/OpenSim.Region.Environment.csproj   |  10 +-
 OpenSim/Region/Simulation/Scenes/Scene.cs          |   2 +-
 OpenSim/Region/Simulation/Scenes/SceneBase.cs      |   2 +-
 .../OpenSim.Region.Terrain.BasicTerrain.csproj     |   4 +-
 .../Properties/AssemblyInfo.cs                     |   4 +-
 .../Region/Terrain.BasicTerrain/TerrainEngine.cs   |   2 +-
 .../Region/Terrain.BasicTerrain/TerrainFilter.cs   |   4 +-
 prebuild.xml                                       |  27 ++
 21 files changed, 220 insertions(+), 262 deletions(-)
 create mode 100644 OpenSim/Region/Application/VersionInfo.cs
 delete mode 100644 OpenSim/Region/ClientStack/VersionInfo.cs

diff --git a/OpenSim.sln b/OpenSim.sln
index b417127..f9dbb6b 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C# Express 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
@@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.UserManag
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caches", "OpenSim\Region\Caches\OpenSim.Region.Caches.csproj", "{61FCCDB3-0000-0000-0000-000000000000}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caps", "OpenSim\Region\Caps\OpenSim.Region.Caps.csproj", "{E3C085C5-0000-0000-0000-000000000000}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.ClientStack", "OpenSim\Region\ClientStack\OpenSim.Region.ClientStack.csproj", "{DC3698B2-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.Local", "OpenSim\Region\Communications\Local\OpenSim.Region.Communications.Local.csproj", "{BFB5D807-0000-0000-0000-000000000000}"
@@ -51,188 +53,117 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(ProjectDependencies) = postSolution
-    ({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).6 = ({C74E4A30-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).7 = ({2CC71860-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).8 = ({586E2916-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).10 = ({DC3698B2-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).11 = ({BFB5D807-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).12 = ({4806E378-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).13 = ({DCBA491C-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).14 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).15 = ({C9E0F891-0000-0000-0000-000000000000})
-    ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000})
-    ({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).7 = ({61FCCDB3-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).8 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).9 = ({C9E0F891-0000-0000-0000-000000000000})
-    ({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).6 = ({C74E4A30-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).7 = ({2CC71860-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).8 = ({61FCCDB3-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).9 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).10 = ({C9E0F891-0000-0000-0000-000000000000})
-    ({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000})
-  EndGlobalSection
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    {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
-    {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
-    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {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
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {24B12448-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(ProjectConfigurationPlatforms) = postSolution
+		{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
+		{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
+		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{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
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3C085C5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3C085C5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3C085C5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3C085C5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 62e3887..09a32b5 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MySQLGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MySQLInventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLLogData.cs">
+    <Compile Include="MySQLUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MySQLManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLUserData.cs">
+    <Compile Include="MySQLLogData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index 4ba24f1..dab22ea 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
index 12edcd0..9a98ff4 100644
--- a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
@@ -82,10 +82,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GridServerManager.cs">
+    <Compile Include="GridManagementAgent.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="GridManagementAgent.cs">
+    <Compile Include="GridServerManager.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index e822c18..1146b17 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -114,10 +114,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="UserManager.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Main.cs">
+    <Compile Include="UserManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 8e50e92..8960664 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -164,10 +164,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Application.cs">
+    <Compile Include="VersionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index db4185c..e06d38c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -40,7 +40,7 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
diff --git a/OpenSim/Region/Application/VersionInfo.cs b/OpenSim/Region/Application/VersionInfo.cs
new file mode 100644
index 0000000..5d1354e
--- /dev/null
+++ b/OpenSim/Region/Application/VersionInfo.cs
@@ -0,0 +1,38 @@
+/*
+* 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;
+
+namespace OpenSim
+{
+    /// <summary>
+    /// </summary>
+    public class VersionInfo
+    {
+        public static string Version = "0.3, SVN build ";
+    }
+}
diff --git a/OpenSim/Region/Caps/Caps.cs b/OpenSim/Region/Caps/Caps.cs
index 13a351d..414828a 100644
--- a/OpenSim/Region/Caps/Caps.cs
+++ b/OpenSim/Region/Caps/Caps.cs
@@ -4,11 +4,11 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 using System.Xml;
-using OpenSim.Servers;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Types;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;
 using libsecondlife;
 
 namespace OpenSim.Region
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 4b5f2a7..cca7c71 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -135,9 +135,6 @@
     <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -147,16 +144,16 @@
     <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="VersionInfo.cs">
+    <Compile Include="ClientViewBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionApplicationBase.cs">
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index d39adb5..94db8ee 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -37,7 +37,7 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 33097ed..259352c 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -37,7 +37,7 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Assets;
diff --git a/OpenSim/Region/ClientStack/VersionInfo.cs b/OpenSim/Region/ClientStack/VersionInfo.cs
deleted file mode 100644
index 249ca94..0000000
--- a/OpenSim/Region/ClientStack/VersionInfo.cs
+++ /dev/null
@@ -1,38 +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;
-
-namespace OpenSim.Region.ClientStack
-{
-    /// <summary>
-    /// </summary>
-    public class VersionInfo
-    {
-        public static string Version = "0.3, SVN build ";
-    }
-}
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
index 60305bd..3f8b60d 100644
--- a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
@@ -149,9 +149,6 @@
     <Compile Include="Scenes\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scenes\Scene.Scripting.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -176,10 +173,13 @@
     <Compile Include="Scenes\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\IScenePresenceBody.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
+    <Compile Include="Scenes\Scene.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\IScriptHandler.cs">
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.cs b/OpenSim/Region/Simulation/Scenes/Scene.cs
index 7e56296..e71f601 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scripting;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Caches;
 using OpenSim.Region.Environment;
diff --git a/OpenSim/Region/Simulation/Scenes/SceneBase.cs b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
index ecd14de..3d8f522 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Region.Environment.Scripting;
-using OpenSim.Terrain;
+using OpenSim.Region.Terrain;
 using OpenSim.Region.Caches;
 
 namespace OpenSim.Region.Environment.Scenes
diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
index 24667e5..60a2d2b 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
@@ -90,10 +90,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TerrainEngine.cs">
+    <Compile Include="TerrainFilter.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="TerrainFilter.cs">
+    <Compile Include="TerrainEngine.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
index 827c68f..7d10ae3 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyTitle("OpenSim.Region.Terrain.BasicTerrain")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Terrain.BasicTerrain")]
+[assembly: AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")]
 [assembly: AssemblyCopyright("Copyright ©  2007")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 4f989fa..c2d7e86 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -32,7 +32,7 @@ using System.Drawing;
 using libTerrain;
 using OpenJPEGNet;
 
-namespace OpenSim.Terrain
+namespace OpenSim.Region.Terrain
 {
     public class TerrainCommand
     {
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
index 689375d..f04ac56 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
@@ -9,7 +9,7 @@ using Microsoft.JScript;
 
 using libTerrain;
 
-namespace OpenSim.Terrain
+namespace OpenSim.Region.Terrain
 {
     public interface ITerrainFilter
     {
@@ -48,7 +48,7 @@ namespace OpenSim.Terrain
             compilerParams.GenerateInMemory = true;
             compilerParams.IncludeDebugInformation = false;
             compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll");
-            compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll");
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.Terrain.BasicTerrain.dll");
             compilerParams.ReferencedAssemblies.Add("System.dll");
 
             compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
diff --git a/prebuild.xml b/prebuild.xml
index dacaa0a..2ef8e8f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -125,6 +125,33 @@
       </Files>
     </Project>
 
+	<Project name="OpenSim.Region.Caps" path="OpenSim/Region/Caps" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+     <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim.Framework"/>	
+      <Reference name="OpenSim.Framework.Servers"/>
+<Reference name="OpenSim.Framework.Utilities"/>
+<Reference name="OpenSim.Framework.Types"/>
+<Reference name="OpenSim.Region.Caches"/>
+     <Reference name="XMLRPC.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
 
     <!-- Storage Plug-ins -->
     <Project name="OpenSim.Region.Storage.LocalStorageDb4o" path="OpenSim/Region/Storage/LocalStorageDb4o" type="Library">
-- 
cgit v1.1


From 0232f01a58a3c0a88e95c22589efec21f502f081 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 27 Jun 2007 19:43:46 +0000
Subject: *Moved all the classes into their own file from LLSDHelpers.cs *Some
 folder renaming to follow project Name *Updated prebuild.xml

---
 OpenSim.sln                                        |  12 +-
 OpenSim/Region/Application/OpenSim.csproj          |   2 +-
 OpenSim/Region/Capabilities/Caps.cs                | 279 +++++++
 OpenSim/Region/Capabilities/LLSDArray.cs           |  45 ++
 OpenSim/Region/Capabilities/LLSDCapEvent.cs        |  45 ++
 OpenSim/Region/Capabilities/LLSDCapsDetails.cs     |  19 +
 OpenSim/Region/Capabilities/LLSDEmpty.cs           |  42 +
 OpenSim/Region/Capabilities/LLSDHelpers.cs         | 163 ++++
 OpenSim/Region/Capabilities/LLSDMapLayer.cs        |  50 ++
 .../Region/Capabilities/LLSDMapLayerResponse.cs    |  45 ++
 OpenSim/Region/Capabilities/LLSDMapRequest.cs      |  17 +
 OpenSim/Region/Capabilities/LLSDTest.cs            |  45 ++
 OpenSim/Region/Capabilities/LLSDType.cs            |  53 ++
 OpenSim/Region/Capabilities/LLSDUploadReply.cs     |  47 ++
 .../OpenSim.Region.Capabilities.csproj             | 151 ++++
 OpenSim/Region/Caps/Caps.cs                        | 258 ------
 OpenSim/Region/Caps/LLSDHelpers.cs                 | 246 ------
 .../ClientStack/OpenSim.Region.ClientStack.csproj  |   4 -
 OpenSim/Region/Environment/EstateManager.cs        | 301 +++++++
 .../Environment/OpenSim.Region.Environment.csproj  | 214 +++++
 OpenSim/Region/Environment/ParcelManager.cs        | 892 +++++++++++++++++++++
 OpenSim/Region/Environment/RegionManager.cs        |  31 +
 OpenSim/Region/Environment/Scenes/Entity.cs        | 194 +++++
 .../Environment/Scenes/IScenePresenceBody.cs       |  19 +
 OpenSim/Region/Environment/Scenes/Primitive.cs     | 582 ++++++++++++++
 .../Environment/Scenes/Scene.PacketHandlers.cs     | 305 +++++++
 .../Region/Environment/Scenes/Scene.Scripting.cs   | 184 +++++
 OpenSim/Region/Environment/Scenes/Scene.cs         | 795 ++++++++++++++++++
 OpenSim/Region/Environment/Scenes/SceneBase.cs     | 201 +++++
 OpenSim/Region/Environment/Scenes/SceneEvents.cs   |  52 ++
 OpenSim/Region/Environment/Scenes/SceneObject.cs   | 128 +++
 .../Environment/Scenes/ScenePresence.Animations.cs |  76 ++
 .../Environment/Scenes/ScenePresence.Body.cs       |  90 +++
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 525 ++++++++++++
 .../Environment/Scenes/scripting/IScriptContext.cs |  40 +
 .../Environment/Scenes/scripting/IScriptEntity.cs  |  46 ++
 .../Environment/Scenes/scripting/IScriptHandler.cs | 126 +++
 .../Region/Environment/Scenes/scripting/Script.cs  |  53 ++
 .../Environment/Scenes/scripting/ScriptFactory.cs  |  35 +
 .../Scenes/scripting/Scripts/FollowRandomAvatar.cs |  64 ++
 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj |   2 +-
 OpenSim/Region/Simulation/Caps.cs                  | 258 ------
 OpenSim/Region/Simulation/EstateManager.cs         | 301 -------
 .../Simulation/OpenSim.Region.Environment.csproj   | 211 -----
 OpenSim/Region/Simulation/ParcelManager.cs         | 892 ---------------------
 OpenSim/Region/Simulation/RegionManager.cs         |  30 -
 OpenSim/Region/Simulation/Scenes/Entity.cs         | 194 -----
 .../Region/Simulation/Scenes/IScenePresenceBody.cs |  19 -
 OpenSim/Region/Simulation/Scenes/Primitive.cs      | 582 --------------
 .../Simulation/Scenes/Scene.PacketHandlers.cs      | 305 -------
 .../Region/Simulation/Scenes/Scene.Scripting.cs    | 184 -----
 OpenSim/Region/Simulation/Scenes/Scene.cs          | 795 ------------------
 OpenSim/Region/Simulation/Scenes/SceneBase.cs      | 201 -----
 OpenSim/Region/Simulation/Scenes/SceneEvents.cs    |  52 --
 OpenSim/Region/Simulation/Scenes/SceneObject.cs    | 128 ---
 .../Simulation/Scenes/ScenePresence.Animations.cs  |  76 --
 .../Region/Simulation/Scenes/ScenePresence.Body.cs |  90 ---
 OpenSim/Region/Simulation/Scenes/ScenePresence.cs  | 525 ------------
 .../Simulation/Scenes/scripting/IScriptContext.cs  |  40 -
 .../Simulation/Scenes/scripting/IScriptEntity.cs   |  46 --
 .../Simulation/Scenes/scripting/IScriptHandler.cs  | 126 ---
 .../Region/Simulation/Scenes/scripting/Script.cs   |  53 --
 .../Simulation/Scenes/scripting/ScriptFactory.cs   |  35 -
 .../Scenes/scripting/Scripts/FollowRandomAvatar.cs |  64 --
 prebuild.xml                                       |   6 +-
 65 files changed, 5965 insertions(+), 5726 deletions(-)
 create mode 100644 OpenSim/Region/Capabilities/Caps.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDArray.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDCapEvent.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDCapsDetails.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDEmpty.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDHelpers.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDMapLayer.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDMapRequest.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDTest.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDType.cs
 create mode 100644 OpenSim/Region/Capabilities/LLSDUploadReply.cs
 create mode 100644 OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
 delete mode 100644 OpenSim/Region/Caps/Caps.cs
 delete mode 100644 OpenSim/Region/Caps/LLSDHelpers.cs
 create mode 100644 OpenSim/Region/Environment/EstateManager.cs
 create mode 100644 OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
 create mode 100644 OpenSim/Region/Environment/ParcelManager.cs
 create mode 100644 OpenSim/Region/Environment/RegionManager.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/Entity.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/Primitive.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/Scene.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/SceneBase.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/SceneEvents.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/SceneObject.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/ScenePresence.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/Script.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
 delete mode 100644 OpenSim/Region/Simulation/Caps.cs
 delete mode 100644 OpenSim/Region/Simulation/EstateManager.cs
 delete mode 100644 OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
 delete mode 100644 OpenSim/Region/Simulation/ParcelManager.cs
 delete mode 100644 OpenSim/Region/Simulation/RegionManager.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/Entity.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/Primitive.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/Scene.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/SceneBase.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/SceneEvents.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/SceneObject.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/ScenePresence.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/Script.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
 delete mode 100644 OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs

diff --git a/OpenSim.sln b/OpenSim.sln
index f9dbb6b..66e79d2 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -20,7 +20,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.UserManag
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caches", "OpenSim\Region\Caches\OpenSim.Region.Caches.csproj", "{61FCCDB3-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caps", "OpenSim\Region\Caps\OpenSim.Region.Caps.csproj", "{E3C085C5-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Capabilities", "OpenSim\Region\Capabilities\OpenSim.Region.Capabilities.csproj", "{39038E85-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.ClientStack", "OpenSim\Region\ClientStack\OpenSim.Region.ClientStack.csproj", "{DC3698B2-0000-0000-0000-000000000000}"
 EndProject
@@ -28,7 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communicatio
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{4806E378-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Simulation\OpenSim.Region.Environment.csproj", "{DCBA491C-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Environment\OpenSim.Region.Environment.csproj", "{DCBA491C-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}"
 EndProject
@@ -98,10 +98,10 @@ Global
 		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3C085C5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3C085C5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3C085C5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3C085C5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 8960664..3801067 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -144,7 +144,7 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Simulation\OpenSim.Region.Environment.csproj">
+    <ProjectReference Include="..\Environment\OpenSim.Region.Environment.csproj">
       <Name>OpenSim.Region.Environment</Name>
       <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
new file mode 100644
index 0000000..416a6bc
--- /dev/null
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -0,0 +1,279 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Xml;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Types;
+using OpenSim.Region.Caches;
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+    public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
+
+    public class Caps
+    {
+        private string httpListenerAddress;
+        private uint httpListenPort;
+        private string capsObjectPath = "00001-";
+        private string requestPath = "0000/";
+        private string mapLayerPath = "0001/";
+        private string newInventory = "0002/";
+        private string requestTexture = "0003/";
+        private string eventQueue = "0100/";
+        private BaseHttpServer httpListener;
+        private LLUUID agentID;
+        private AssetCache assetCache;
+        private int eventQueueCount = 1;
+        private Queue<string> CapsEventQueue = new Queue<string>();
+
+        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
+        {
+            assetCache = assetCach;
+            capsObjectPath = capsPath;
+            httpListener = httpServer;
+            httpListenerAddress = httpListen;
+            httpListenPort = httpPort;
+            agentID = agent;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RegisterHandlers()
+        {
+            Console.WriteLine("registering CAPS handlers");
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string CapsRequest(string request, string path, string param)
+        {
+           // Console.WriteLine("Caps Request " + request);
+            string result = ""; 
+            result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
+            return result;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected LLSDCapsDetails GetCapabilities()
+        {
+           /* string capURLS = "";
+            capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>";
+            capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>";
+            //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>";
+            //capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>";
+            return capURLS;*/
+
+            LLSDCapsDetails caps = new LLSDCapsDetails();
+            caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath;
+            caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory;
+            return caps;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string MapLayer(string request, string path, string param)
+        {
+            Encoding _enc = System.Text.Encoding.UTF8;
+            Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
+            LLSDMapRequest mapReq = new LLSDMapRequest();
+            LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
+
+            LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
+            mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
+            string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
+            
+            //Console.WriteLine(" Maplayer response is " + res);
+          
+            return res;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected LLSDMapLayer BuildLLSDMapLayerResponse()
+        {
+            LLSDMapLayer mapLayer = new LLSDMapLayer();
+            mapLayer.Right = 5000;
+            mapLayer.Top = 5000;
+            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+
+            return mapLayer;
+        }
+
+        public string ProcessEventQueue(string request, string path, string param)
+        {
+            string res = "";
+            
+            if (this.CapsEventQueue.Count > 0)
+            {
+                lock (this.CapsEventQueue)
+                {
+                    string item = CapsEventQueue.Dequeue();
+                    res = item;
+                }
+            }
+            else
+            {
+                res = this.CreateEmptyEventResponse();
+            }
+            return res;
+        }
+
+        public string CreateEstablishAgentComms(string caps, string ipAddressPort)
+        {
+            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
+            res += "<key>events</key><array><map>";
+            res += "<key>message</key><string>EstablishAgentCommunication</string>";
+            res += "<key>body</key><map>";
+            res += "<key>sim-ip-and-port</key><string>" + ipAddressPort + "</string>";
+            res += "<key>seed-capability</key><string>" + caps + "</string>";
+            res += "<key>agent-id</key><uuid>" + this.agentID.ToStringHyphenated() + "</uuid>";
+            res += "</map>";
+            res += "</map></array>";
+            res += "</map></llsd>";
+            eventQueueCount++;
+            this.CapsEventQueue.Enqueue(res);
+            return res;
+        }
+
+        public string CreateEmptyEventResponse()
+        {
+            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
+            res += "<key>events</key><array><map>";
+            res += "</map></array>";
+            res += "</map></llsd>";
+            eventQueueCount++;
+            return res;
+        }
+
+        public string NewAgentInventory(string request, string path, string param)
+        {
+            //Console.WriteLine("received upload request:"+ request);
+            string res = "";
+            LLUUID newAsset = LLUUID.Random();
+            LLUUID newInvItem = LLUUID.Random();
+            string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
+            AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
+            httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
+            string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
+            //Console.WriteLine("uploader url is " + uploaderURL);
+            res += "<llsd><map>";
+            res += "<key>uploader</key><string>" + uploaderURL + "</string>";
+            //res += "<key>success</key><boolean>true</boolean>";
+            res += "<key>state</key><string>upload</string>";
+            res += "</map></llsd>";
+            uploader.OnUpLoad += this.UploadHandler;
+            return res;
+        }
+
+        public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
+        {
+            // Console.WriteLine("upload handler called");
+            AssetBase asset;
+            asset = new AssetBase();
+            asset.FullID = assetID;
+            asset.Type = 0;
+            asset.InvType = 0;
+            asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
+            asset.Data = data;
+            this.assetCache.AddAsset(asset);
+        }
+
+        public class AssetUploader
+        {
+            public event UpLoadedTexture OnUpLoad;
+
+            private string uploaderPath = "";
+            private LLUUID newAssetID;
+            private LLUUID inventoryItemID;
+            private BaseHttpServer httpListener;
+            public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
+            {
+                newAssetID = assetID;
+                inventoryItemID = inventoryItem;
+                uploaderPath = path;
+                httpListener = httpServer;
+
+            }
+
+            public string uploaderCaps(string request, string path, string param)
+            {
+                Encoding _enc = System.Text.Encoding.UTF8;
+                byte[] data = _enc.GetBytes(request);
+                //Console.WriteLine("recieved upload " + Util.FieldToString(data));
+                LLUUID inv = this.inventoryItemID;
+                string res = "";
+                res += "<llsd><map>";
+                res += "<key>new_asset</key><string>" + newAssetID.ToStringHyphenated() + "</string>";
+                res += "<key>new_inventory_item</key><uuid>" + inv.ToStringHyphenated() + "</uuid>";
+                res += "<key>state</key><string>complete</string>";
+                res += "</map></llsd>";
+
+               // Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
+                httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
+                if (OnUpLoad != null)
+                {
+                    OnUpLoad(newAssetID, inv, data);
+                }
+
+                /*FileStream fs = File.Create("upload.jp2");
+                BinaryWriter bw = new BinaryWriter(fs);
+                bw.Write(data);
+                bw.Close();
+                fs.Close();*/
+                return res;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDArray.cs b/OpenSim/Region/Capabilities/LLSDArray.cs
new file mode 100644
index 0000000..76d5a2c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDArray.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("ARRAY")]
+    public class LLSDArray
+    {
+        public ArrayList Array = new ArrayList();
+
+        public LLSDArray()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDCapEvent.cs b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
new file mode 100644
index 0000000..d47d25c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDCapEvent
+    {
+        public int id = 0;
+        public LLSDArray events = new LLSDArray();
+
+        public LLSDCapEvent()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
new file mode 100644
index 0000000..d6db606
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDCapsDetails
+    {
+        public string MapLayer = "";
+        public string NewFileAgentInventory = "";
+        //public string EventQueueGet = "";
+
+        public LLSDCapsDetails()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDEmpty.cs b/OpenSim/Region/Capabilities/LLSDEmpty.cs
new file mode 100644
index 0000000..68f1ce9
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDEmpty.cs
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDEmpty
+    {
+        public LLSDEmpty()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDHelpers.cs b/OpenSim/Region/Capabilities/LLSDHelpers.cs
new file mode 100644
index 0000000..80916b4
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDHelpers.cs
@@ -0,0 +1,163 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Xml;
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+    public class LLSDHelpers
+    {
+        public static string SerialiseLLSDReply(object obj)
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter writer = new XmlTextWriter(sw);
+            writer.Formatting = Formatting.None;
+            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+            LLSDHelpers.SerializeLLSDType(writer, obj);
+            writer.WriteEndElement();
+            writer.Close();
+            return sw.ToString();
+        }
+
+        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
+        {
+            Type myType = obj.GetType();
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            if (llsdattributes.Length > 0)
+            {
+                switch (llsdattributes[0].ObjectType)
+                {
+                    case "MAP":
+                        writer.WriteStartElement(String.Empty, "map", String.Empty);
+                        System.Reflection.FieldInfo[] fields = myType.GetFields();
+                        for (int i = 0; i < fields.Length; i++)
+                        {
+                            object fieldValue = fields[i].GetValue(obj);
+                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
+                            if (fieldAttributes.Length > 0)
+                            {
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteString(fields[i].Name);
+                                writer.WriteEndElement();
+                                SerializeLLSDType(writer, fieldValue);
+                            }
+                            else
+                            {
+                                //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
+                                writer.WriteStartElement(String.Empty, "key", String.Empty);
+                                writer.WriteString(fields[i].Name);
+                                writer.WriteEndElement();
+                                LLSD.LLSDWriteOne(writer, fieldValue);
+                            }
+                        }
+                        writer.WriteEndElement();
+                        break;
+                    case "ARRAY":
+                        // LLSDArray arrayObject = obj as LLSDArray;
+                        // ArrayList a = arrayObject.Array;
+                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
+                        writer.WriteStartElement(String.Empty, "array", String.Empty);
+                        foreach (object item in a)
+                        {
+                            SerializeLLSDType(writer, item);
+                        }
+                        writer.WriteEndElement();
+                        break;
+                }
+            }
+            else
+            {
+                LLSD.LLSDWriteOne(writer, obj);
+            }
+        }
+
+        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
+        {
+            Type myType = obj.GetType();
+            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
+            if (llsdattributes.Length > 0)
+            {
+                switch (llsdattributes[0].ObjectType)
+                {
+                    case "MAP":
+                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
+                        while (enumerator.MoveNext())
+                        {
+                            System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
+                            if (field != null)
+                            {
+                                if (enumerator.Value is Hashtable)
+                                {
+                                    object fieldValue = field.GetValue(obj);
+                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
+                                }
+                                else if (enumerator.Value is ArrayList)
+                                {
+                                    object fieldValue = field.GetValue(obj);
+                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
+                                    //TODO
+                                    // the LLSD map/array types in the array need to be deserialised
+                                    // but first we need to know the right class to deserialise them into. 
+                                }
+                                else
+                                {
+                                    field.SetValue(obj, enumerator.Value);
+                                }
+                            }
+                        }
+                        break;
+                }
+            }
+            return obj;
+        }
+    }
+
+    
+
+    
+
+   
+
+    
+
+    
+
+    
+
+    
+
+    
+
+
+    
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayer.cs b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
new file mode 100644
index 0000000..b097ec3
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapLayer
+    {
+        public int Left = 0;
+        public int Right = 0;
+        public int Top = 0;
+        public int Bottom = 0;
+        public LLUUID ImageID = LLUUID.Zero;
+
+        public LLSDMapLayer()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
new file mode 100644
index 0000000..ee37a5b
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapLayerResponse
+    {
+        public LLSDMapRequest AgentData = new LLSDMapRequest();
+        public LLSDArray LayerData = new LLSDArray();
+
+        public LLSDMapLayerResponse()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDMapRequest.cs b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
new file mode 100644
index 0000000..b15f1be
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapRequest
+    {
+        public int Flags = 0;
+
+        public LLSDMapRequest()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDTest.cs b/OpenSim/Region/Capabilities/LLSDTest.cs
new file mode 100644
index 0000000..3948f2c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDTest.cs
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDTest
+    {
+        public int Test1 = 20;
+        public int Test2 = 10;
+
+        public LLSDTest()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDType.cs b/OpenSim/Region/Capabilities/LLSDType.cs
new file mode 100644
index 0000000..7da5861
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDType.cs
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class LLSDType : Attribute
+    {
+        private string myType;
+
+        public LLSDType(string type)
+        {
+            myType = type;
+
+        }
+
+        public string ObjectType
+        {
+            get
+            {
+                return myType;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/LLSDUploadReply.cs b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
new file mode 100644
index 0000000..83cf166
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
@@ -0,0 +1,47 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using libsecondlife;
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDUploadReply
+    {
+        public string new_asset = "";
+        public LLUUID new_inventory_item = LLUUID.Zero;
+        public string state = "";
+
+        public LLSDUploadReply()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
new file mode 100644
index 0000000..0d8fac5
--- /dev/null
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -0,0 +1,151 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{39038E85-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Capabilities</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Capabilities</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Types" >
+      <HintPath>OpenSim.Framework.Types.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Utilities" >
+      <HintPath>OpenSim.Framework.Utilities.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
+      <Name>OpenSim.Region.Caches</Name>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LLSDCapsDetails.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayerResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Caps.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDArray.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDCapEvent.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDEmpty.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDHelpers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDTest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDType.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDUploadReply.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Caps/Caps.cs b/OpenSim/Region/Caps/Caps.cs
deleted file mode 100644
index 414828a..0000000
--- a/OpenSim/Region/Caps/Caps.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Xml;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Types;
-using OpenSim.Region.Caches;
-using libsecondlife;
-
-namespace OpenSim.Region
-{
-    public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
-
-    public class Caps
-    {
-        private string httpListenerAddress;
-        private uint httpListenPort;
-        private string capsObjectPath = "00001-";
-        private string requestPath = "0000/";
-        private string mapLayerPath = "0001/";
-        private string newInventory = "0002/";
-        private string requestTexture = "0003/";
-        private string eventQueue = "0100/";
-        private BaseHttpServer httpListener;
-        private LLUUID agentID;
-        private AssetCache assetCache;
-        private int eventQueueCount = 1;
-        private Queue<string> CapsEventQueue = new Queue<string>();
-
-        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
-        {
-            assetCache = assetCach;
-            capsObjectPath = capsPath;
-            httpListener = httpServer;
-            httpListenerAddress = httpListen;
-            httpListenPort = httpPort;
-            agentID = agent;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void RegisterHandlers()
-        {
-            Console.WriteLine("registering CAPS handlers");
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public string CapsRequest(string request, string path, string param)
-        {
-           // Console.WriteLine("Caps Request " + request);
-            string result = ""; 
-            result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
-            return result;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        protected LLSDCapsDetails GetCapabilities()
-        {
-           /* string capURLS = "";
-            capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>";
-            capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>";
-            //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>";
-            //capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>";
-            return capURLS;*/
-
-            LLSDCapsDetails caps = new LLSDCapsDetails();
-            caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath;
-            caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory;
-            return caps;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public string MapLayer(string request, string path, string param)
-        {
-            Encoding _enc = System.Text.Encoding.UTF8;
-            Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
-            LLSDMapRequest mapReq = new LLSDMapRequest();
-            LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
-
-            LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
-            mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
-            string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
-            
-            //Console.WriteLine(" Maplayer response is " + res);
-          
-            return res;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        protected LLSDMapLayer BuildLLSDMapLayerResponse()
-        {
-            LLSDMapLayer mapLayer = new LLSDMapLayer();
-            mapLayer.Right = 5000;
-            mapLayer.Top = 5000;
-            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
-
-            return mapLayer;
-        }
-
-        public string ProcessEventQueue(string request, string path, string param)
-        {
-            //  Console.WriteLine("event queue request " + request);
-            string res = "";
-            int timer = 0;
-
-            /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
-             {
-                 timer++;
-             }*/
-            if (this.CapsEventQueue.Count > 0)
-            {
-                lock (this.CapsEventQueue)
-                {
-                    string item = CapsEventQueue.Dequeue();
-                    res = item;
-                }
-            }
-            else
-            {
-                res = this.CreateEmptyEventResponse();
-            }
-            return res;
-        }
-
-        public string CreateEstablishAgentComms(string caps, string ipAddressPort)
-        {
-            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
-            res += "<key>events</key><array><map>";
-            res += "<key>message</key><string>EstablishAgentCommunication</string>";
-            res += "<key>body</key><map>";
-            res += "<key>sim-ip-and-port</key><string>" + ipAddressPort + "</string>";
-            res += "<key>seed-capability</key><string>" + caps + "</string>";
-            res += "<key>agent-id</key><uuid>" + this.agentID.ToStringHyphenated() + "</uuid>";
-            res += "</map>";
-            res += "</map></array>";
-            res += "</map></llsd>";
-            eventQueueCount++;
-            this.CapsEventQueue.Enqueue(res);
-            return res;
-        }
-
-        public string CreateEmptyEventResponse()
-        {
-            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
-            res += "<key>events</key><array><map>";
-            res += "</map></array>";
-            res += "</map></llsd>";
-            eventQueueCount++;
-            return res;
-        }
-
-        public string NewAgentInventory(string request, string path, string param)
-        {
-            //Console.WriteLine("received upload request:"+ request);
-            string res = "";
-            LLUUID newAsset = LLUUID.Random();
-            LLUUID newInvItem = LLUUID.Random();
-            string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
-            AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
-            httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
-            string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
-            //Console.WriteLine("uploader url is " + uploaderURL);
-            res += "<llsd><map>";
-            res += "<key>uploader</key><string>" + uploaderURL + "</string>";
-            //res += "<key>success</key><boolean>true</boolean>";
-            res += "<key>state</key><string>upload</string>";
-            res += "</map></llsd>";
-            uploader.OnUpLoad += this.UploadHandler;
-            return res;
-        }
-
-        public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
-        {
-            // Console.WriteLine("upload handler called");
-            AssetBase asset;
-            asset = new AssetBase();
-            asset.FullID = assetID;
-            asset.Type = 0;
-            asset.InvType = 0;
-            asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
-            asset.Data = data;
-            this.assetCache.AddAsset(asset);
-        }
-
-        public class AssetUploader
-        {
-            public event UpLoadedTexture OnUpLoad;
-
-            private string uploaderPath = "";
-            private LLUUID newAssetID;
-            private LLUUID inventoryItemID;
-            private BaseHttpServer httpListener;
-            public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
-            {
-                newAssetID = assetID;
-                inventoryItemID = inventoryItem;
-                uploaderPath = path;
-                httpListener = httpServer;
-
-            }
-
-            public string uploaderCaps(string request, string path, string param)
-            {
-                Encoding _enc = System.Text.Encoding.UTF8;
-                byte[] data = _enc.GetBytes(request);
-                //Console.WriteLine("recieved upload " + Util.FieldToString(data));
-                LLUUID inv = this.inventoryItemID;
-                string res = "";
-                res += "<llsd><map>";
-                res += "<key>new_asset</key><string>" + newAssetID.ToStringHyphenated() + "</string>";
-                res += "<key>new_inventory_item</key><uuid>" + inv.ToStringHyphenated() + "</uuid>";
-                res += "<key>state</key><string>complete</string>";
-                res += "</map></llsd>";
-
-               // Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
-                httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
-                if (OnUpLoad != null)
-                {
-                    OnUpLoad(newAssetID, inv, data);
-                }
-
-                /*FileStream fs = File.Create("upload.jp2");
-                BinaryWriter bw = new BinaryWriter(fs);
-                bw.Write(data);
-                bw.Close();
-                fs.Close();*/
-                return res;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/Caps/LLSDHelpers.cs b/OpenSim/Region/Caps/LLSDHelpers.cs
deleted file mode 100644
index 051520c..0000000
--- a/OpenSim/Region/Caps/LLSDHelpers.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Xml;
-using libsecondlife;
-
-namespace OpenSim.Framework
-{
-    public class LLSDHelpers
-    {
-        public static string SerialiseLLSDReply(object obj)
-        {
-            StringWriter sw = new StringWriter();
-            XmlTextWriter writer = new XmlTextWriter(sw);
-            writer.Formatting = Formatting.None;
-            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
-            LLSDHelpers.SerializeLLSDType(writer, obj);
-            writer.WriteEndElement();
-            writer.Close();
-            return sw.ToString();
-        }
-
-        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
-        {
-            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
-            if (llsdattributes.Length > 0)
-            {
-                switch (llsdattributes[0].ObjectType)
-                {
-                    case "MAP":
-                        writer.WriteStartElement(String.Empty, "map", String.Empty);
-                        System.Reflection.FieldInfo[] fields = myType.GetFields();
-                        for (int i = 0; i < fields.Length; i++)
-                        {
-                            object fieldValue = fields[i].GetValue(obj);
-                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
-                            if (fieldAttributes.Length > 0)
-                            {
-                                writer.WriteStartElement(String.Empty, "key", String.Empty);
-                                writer.WriteString(fields[i].Name);
-                                writer.WriteEndElement();
-                                SerializeLLSDType(writer, fieldValue);
-                            }
-                            else
-                            {
-                                //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
-                                writer.WriteStartElement(String.Empty, "key", String.Empty);
-                                writer.WriteString(fields[i].Name);
-                                writer.WriteEndElement();
-                                LLSD.LLSDWriteOne(writer, fieldValue);
-                            }
-                        }
-                        writer.WriteEndElement();
-                        break;
-                    case "ARRAY":
-                        // LLSDArray arrayObject = obj as LLSDArray;
-                        // ArrayList a = arrayObject.Array;
-                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
-                        writer.WriteStartElement(String.Empty, "array", String.Empty);
-                        foreach (object item in a)
-                        {
-                            SerializeLLSDType(writer, item);
-                        }
-                        writer.WriteEndElement();
-                        break;
-                }
-            }
-            else
-            {
-                LLSD.LLSDWriteOne(writer, obj);
-            }
-        }
-
-        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
-        {
-            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
-            if (llsdattributes.Length > 0)
-            {
-                switch (llsdattributes[0].ObjectType)
-                {
-                    case "MAP":
-                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
-                        while (enumerator.MoveNext())
-                        {
-                            System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
-                            if (field != null)
-                            {
-                                if (enumerator.Value is Hashtable)
-                                {
-                                    object fieldValue = field.GetValue(obj);
-                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
-                                }
-                                else if (enumerator.Value is ArrayList)
-                                {
-                                    object fieldValue = field.GetValue(obj);
-                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
-                                    //TODO
-                                    // the LLSD map/array types in the array need to be deserialised
-                                    // but first we need to know the right class to deserialise them into. 
-                                }
-                                else
-                                {
-                                    field.SetValue(obj, enumerator.Value);
-                                }
-                            }
-                        }
-                        break;
-                }
-            }
-            return obj;
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDMapLayerResponse
-    {
-        public LLSDMapRequest AgentData = new LLSDMapRequest();
-        public LLSDArray LayerData = new LLSDArray();
-
-        public LLSDMapLayerResponse()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDCapsDetails
-    {
-        public string MapLayer = "";
-        public string NewFileAgentInventory = "";
-        //public string EventQueueGet = "";
-
-        public LLSDCapsDetails()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDMapLayer
-    {
-        public int Left = 0;
-        public int Right = 0;
-        public int Top = 0;
-        public int Bottom = 0;
-        public LLUUID ImageID = LLUUID.Zero;
-
-        public LLSDMapLayer()
-        {
-           
-        }
-    }
-
-    [LLSDType("ARRAY")]
-    public class LLSDArray
-    {
-        public ArrayList Array = new ArrayList();
-
-        public LLSDArray()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDMapRequest
-    {
-        public int Flags = 0;
-
-        public LLSDMapRequest()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDUploadReply
-    {
-        public string new_asset = "";
-        public LLUUID new_inventory_item = LLUUID.Zero;
-        public string state = "";
-
-        public LLSDUploadReply()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDCapEvent
-    {
-        public int id = 0;
-        public LLSDArray events = new LLSDArray();
-
-        public LLSDCapEvent()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDEmpty
-    {
-        public LLSDEmpty()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDTest
-    {
-        public int Test1 = 20;
-        public int Test2 = 10;
-
-        public LLSDTest()
-        {
-
-        }
-    }
-
-
-    [AttributeUsage(AttributeTargets.Class)]
-    public class LLSDType : Attribute
-    {
-        private string myType;
-
-        public LLSDType(string type)
-        {
-            myType = type;
-
-        }
-
-        public string ObjectType
-        {
-            get
-            {
-                return myType;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index cca7c71..40cd4f0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -70,10 +70,6 @@
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OpenSim.FrameworkGenericConfig.Xml" >
-      <HintPath>OpenSim.FrameworkGenericConfig.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
new file mode 100644
index 0000000..c2c1ecf
--- /dev/null
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -0,0 +1,301 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
+using OpenSim;
+using libsecondlife;
+using libsecondlife.Packets;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
+
+
+namespace OpenSim.Region.Environment
+{
+
+    /// <summary>
+    /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
+    /// </summary>
+    public class EstateManager
+    {
+        private Scene m_world;
+        private RegionInfo m_regInfo;
+
+        public EstateManager(Scene world,RegionInfo reginfo)
+        {
+            m_world = world; //Estate settings found at world.m_regInfo.estateSettings      
+            m_regInfo = reginfo;
+        }
+
+        private bool convertParamStringToBool(byte[] field)
+        {
+            string s = Helpers.FieldToUTF8String(field);
+            if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true")
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, IClientAPI remote_client)
+        {
+            if (remote_client.AgentId == m_regInfo.MasterAvatarAssignedUUID)
+            {
+                switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
+                {
+                    case "getinfo":
+                        Console.WriteLine("GETINFO Requested");
+                        this.sendRegionInfoPacketToAll();
+
+                        break;
+                    case "setregioninfo":
+                        if (packet.ParamList.Length != 9)
+                        {
+                            OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
+                        }
+                        else
+                        {
+                            m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;
+
+                            if (convertParamStringToBool(packet.ParamList[0].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[1].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[2].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;
+                            }
+
+
+                            int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter)));
+                            m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents;
+
+                            float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+                            m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
+
+                            int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
+                            m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;
+                            
+
+                            if (convertParamStringToBool(packet.ParamList[7].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[8].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;
+                            }
+
+                            sendRegionInfoPacketToAll();
+                            
+                        }
+                        break;
+                    case "texturebase":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 2)
+                            {
+                                LLUUID tempUUID = new LLUUID(splitField[1]);
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_regInfo.estateSettings.terrainBase0 = tempUUID;
+                                        break;
+                                    case 1:
+                                        m_regInfo.estateSettings.terrainBase1 = tempUUID;
+                                        break;
+                                    case 2:
+                                        m_regInfo.estateSettings.terrainBase2 = tempUUID;
+                                        break;
+                                    case 3:
+                                        m_regInfo.estateSettings.terrainBase3 = tempUUID;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "texturedetail":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 2)
+                            {
+                                LLUUID tempUUID = new LLUUID(splitField[1]);
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_regInfo.estateSettings.terrainDetail0 = tempUUID;
+                                        break;
+                                    case 1:
+                                        m_regInfo.estateSettings.terrainDetail1 = tempUUID;
+                                        break;
+                                    case 2:
+                                        m_regInfo.estateSettings.terrainDetail2 = tempUUID;
+                                        break;
+                                    case 3:
+                                        m_regInfo.estateSettings.terrainDetail3 = tempUUID;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "textureheights":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 3)
+                            {
+
+                                float tempHeightLow = (float)Convert.ToDecimal(splitField[1]);
+                                float tempHeightHigh = (float)Convert.ToDecimal(splitField[2]);
+
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh;
+                                        break;
+                                    case 1:
+                                        m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh;
+                                        break;
+                                    case 2:
+                                        m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh;
+                                        break;
+                                    case 3:
+                                        m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "texturecommit":
+                        sendRegionHandshakeToAll();
+                        break;
+                    case "setregionterrain":
+                        if (packet.ParamList.Length != 9)
+                        {
+                            OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
+                        }
+                        else
+                        {
+                            m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter));
+                            m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter));
+                            m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter));
+                            m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter);
+                            m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+
+                            sendRegionInfoPacketToAll();
+                        }
+                        break;
+                    default:
+                        OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
+                        break;
+                }
+            }
+        }
+
+        public void sendRegionInfoPacketToAll()
+        {
+             List<Avatar> avatars = m_world.RequestAvatarList();
+
+             for (int i = 0; i < avatars.Count; i++)
+             {
+                 this.sendRegionInfoPacket(avatars[i].ControllingClient);
+             }
+        }
+
+        public void sendRegionHandshakeToAll()
+        {
+            List<Avatar> avatars = m_world.RequestAvatarList();
+
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                this.sendRegionHandshake(avatars[i].ControllingClient);
+            }         
+        }
+
+        public void sendRegionInfoPacket(IClientAPI remote_client)
+        {
+            Encoding _enc = System.Text.Encoding.ASCII;
+
+            AgentCircuitData circuitData = remote_client.RequestClientInfo();
+
+            RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
+            regionInfoPacket.AgentData.AgentID = circuitData.AgentID;
+            regionInfoPacket.AgentData.SessionID = circuitData.SessionID;
+            regionInfoPacket.RegionInfo.BillableFactor = m_regInfo.estateSettings.billableFactor;
+            regionInfoPacket.RegionInfo.EstateID = m_regInfo.estateSettings.estateID;
+            regionInfoPacket.RegionInfo.MaxAgents = m_regInfo.estateSettings.maxAgents;
+            regionInfoPacket.RegionInfo.ObjectBonusFactor = m_regInfo.estateSettings.objectBonusFactor;
+            regionInfoPacket.RegionInfo.ParentEstateID = m_regInfo.estateSettings.parentEstateID;
+            regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.estateSettings.pricePerMeter;
+            regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.estateSettings.redirectGridX;
+            regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.estateSettings.redirectGridY;
+            regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags;
+            regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess;
+            regionInfoPacket.RegionInfo.SimName = _enc.GetBytes( m_regInfo.RegionName);
+            regionInfoPacket.RegionInfo.SunHour = m_regInfo.estateSettings.sunHour;
+            regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.estateSettings.terrainLowerLimit;
+            regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.estateSettings.terrainRaiseLimit;
+            regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.estateSettings.useFixedSun;
+            regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.estateSettings.waterHeight;
+
+            remote_client.OutPacket(regionInfoPacket);
+        }
+
+        public void sendRegionHandshake(IClientAPI remoteClient)
+        {
+            remoteClient.SendRegionHandshake(m_regInfo);
+        }
+
+    }
+}
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
new file mode 100644
index 0000000..6f07969
--- /dev/null
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -0,0 +1,214 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DCBA491C-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Environment</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Environment</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Axiom.MathLib.dll" >
+      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
+      <Name>OpenSim.Framework.Communications</Name>
+      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
+      <Name>OpenSim.Framework.GenericConfig.Xml</Name>
+      <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
+      <Name>OpenSim.Region.Caches</Name>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Capabilities\OpenSim.Region.Capabilities.csproj">
+      <Name>OpenSim.Region.Capabilities</Name>
+      <Project>{39038E85-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
+      <Name>OpenSim.Region.Physics.Manager</Name>
+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
+      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
+      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="EstateManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ParcelManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RegionManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Entity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.Scripting.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.Body.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneEvents.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\ScenePresence.Animations.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Primitive.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\IScenePresenceBody.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\SceneBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\Scene.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\ScriptFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\Script.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\IScriptEntity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
new file mode 100644
index 0000000..1cab4ab
--- /dev/null
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -0,0 +1,892 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Region.Environment.Scenes;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
+
+namespace OpenSim.Region.Environment
+{
+
+
+    #region ParcelManager Class
+    /// <summary>
+    /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
+    /// </summary>
+    public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver
+    {
+
+        #region Constants
+        //Parcel types set with flags in ParcelOverlay.
+        //Only one of these can be used. 
+        public const byte PARCEL_TYPE_PUBLIC = (byte)0;      //Equals 00000000
+        public const byte PARCEL_TYPE_OWNED_BY_OTHER = (byte)1;      //Equals 00000001
+        public const byte PARCEL_TYPE_OWNED_BY_GROUP = (byte)2;      //Equals 00000010
+        public const byte PARCEL_TYPE_OWNED_BY_REQUESTER = (byte)3;      //Equals 00000011
+        public const byte PARCEL_TYPE_IS_FOR_SALE = (byte)4;      //Equals 00000100
+        public const byte PARCEL_TYPE_IS_BEING_AUCTIONED = (byte)5;      //Equals 00000101
+
+
+        //Flags that when set, a border on the given side will be placed
+        //NOTE: North and East is assumable by the west and south sides (if parcel to east has a west border, then I have an east border; etc)
+        //This took forever to figure out -- jeesh. /blame LL for even having to send these
+        public const byte PARCEL_FLAG_PROPERTY_BORDER_WEST = (byte)64;     //Equals 01000000
+        public const byte PARCEL_FLAG_PROPERTY_BORDER_SOUTH = (byte)128;    //Equals 10000000
+
+        //RequestResults (I think these are right, they seem to work):
+        public const int PARCEL_RESULT_ONE_PARCEL = 0;	// The request they made contained only one parcel
+        public const int PARCEL_RESULT_MULTIPLE_PARCELS = 1;	// The request they made contained more than one parcel
+
+        //These are other constants. Yay!
+        public const int START_PARCEL_LOCAL_ID = 1;
+        #endregion
+
+        #region Member Variables
+        public Dictionary<int, Parcel> parcelList = new Dictionary<int, Parcel>();
+        private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+        private int[,] parcelIDList = new int[64, 64];
+
+        private Scene m_world;
+        private RegionInfo m_regInfo;
+
+        #endregion
+
+        #region Constructors
+        public ParcelManager(Scene world, RegionInfo reginfo)
+        {
+
+            m_world = world;
+            m_regInfo = reginfo;
+            parcelIDList.Initialize();
+
+        }
+        #endregion
+
+        #region Member Functions
+
+        #region Parcel From Storage Functions
+        public void ParcelFromStorage(ParcelData data)
+        {
+            Parcel new_parcel = new Parcel(data.ownerID, data.isGroupOwned, m_world);
+            new_parcel.parcelData = data.Copy();
+            new_parcel.setParcelBitmapFromByteArray();
+            addParcel(new_parcel);
+
+        }
+
+        public void NoParcelDataFromStorage()
+        {
+            resetSimParcels();
+        }
+        #endregion
+
+        #region Parcel Add/Remove/Get/Create
+        /// <summary>
+        /// Creates a basic Parcel object without an owner (a zeroed key)
+        /// </summary>
+        /// <returns></returns>
+        public Parcel createBaseParcel()
+        {
+            return new Parcel(new LLUUID(), false, m_world);
+        }
+
+        /// <summary>
+        /// Adds a parcel to the stored list and adds them to the parcelIDList to what they own
+        /// </summary>
+        /// <param name="new_parcel">The parcel being added</param>
+        public void addParcel(Parcel new_parcel)
+        {
+            lastParcelLocalID++;
+            new_parcel.parcelData.localID = lastParcelLocalID;
+            parcelList.Add(lastParcelLocalID, new_parcel.Copy());
+
+
+            bool[,] parcelBitmap = new_parcel.getParcelBitmap();
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmap[x, y])
+                    {
+                        parcelIDList[x, y] = lastParcelLocalID;
+                    }
+                }
+            }
+            parcelList[lastParcelLocalID].forceUpdateParcelInfo();
+
+
+        }
+        /// <summary>
+        /// Removes a parcel from the list. Will not remove if local_id is still owning an area in parcelIDList
+        /// </summary>
+        /// <param name="local_id">Parcel.localID of the parcel to remove.</param>
+        public void removeParcel(int local_id)
+        {
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelIDList[x, y] == local_id)
+                    {
+                        throw new Exception("Could not remove parcel. Still being used at " + x + ", " + y);
+                    }
+                }
+            }
+            m_world.localStorage.RemoveParcel(parcelList[local_id].parcelData);
+            parcelList.Remove(local_id);
+        }
+
+        private void performFinalParcelJoin(Parcel master, Parcel slave)
+        {
+            int x, y;
+            bool[,] parcelBitmapSlave = slave.getParcelBitmap();
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmapSlave[x, y])
+                    {
+                        parcelIDList[x, y] = master.parcelData.localID;
+                    }
+                }
+            }
+            removeParcel(slave.parcelData.localID);
+        }
+        /// <summary>
+        /// Get the parcel at the specified point
+        /// </summary>
+        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
+        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
+        /// <returns>Parcel at the point supplied</returns>
+        public Parcel getParcel(int x, int y)
+        {
+            if (x > 256 || y > 256 || x < 0 || y < 0)
+            {
+                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
+            }
+            else
+            {
+                return parcelList[parcelIDList[x / 4, y / 4]];
+            }
+
+        }
+        #endregion
+
+        #region Parcel Modification
+        /// <summary>
+        /// Subdivides a parcel
+        /// </summary>
+        /// <param name="start_x">West Point</param>
+        /// <param name="start_y">South Point</param>
+        /// <param name="end_x">East Point</param>
+        /// <param name="end_y">North Point</param>
+        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
+        /// <returns>Returns true if successful</returns>
+        private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+            //First, lets loop through the points and make sure they are all in the same parcel
+            //Get the parcel at start
+            Parcel startParcel = getParcel(start_x, start_y);
+            if (startParcel == null) return false; //No such parcel at the beginning
+
+            //Loop through the points
+            try
+            {
+                int totalX = end_x - start_x;
+                int totalY = end_y - start_y;
+                int x, y;
+                for (y = 0; y < totalY; y++)
+                {
+                    for (x = 0; x < totalX; x++)
+                    {
+                        Parcel tempParcel = getParcel(start_x + x, start_y + y);
+                        if (tempParcel == null) return false; //No such parcel at that point
+                        if (tempParcel != startParcel) return false; //Subdividing over 2 parcels; no-no
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                return false; //Exception. For now, lets skip subdivision
+            }
+
+            //If we are still here, then they are subdividing within one parcel
+            //Check owner
+            if (startParcel.parcelData.ownerID != attempting_user_id)
+            {
+                return false; //They cant do this!
+            }
+
+            //Lets create a new parcel with bitmap activated at that point (keeping the old parcels info)
+            Parcel newParcel = startParcel.Copy();
+            newParcel.parcelData.parcelName = "Subdivision of " + newParcel.parcelData.parcelName;
+            newParcel.parcelData.globalID = LLUUID.Random();
+
+            newParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(start_x, start_y, end_x, end_y));
+
+            //Now, lets set the subdivision area of the original to false
+            int startParcelIndex = startParcel.parcelData.localID;
+            parcelList[startParcelIndex].setParcelBitmap(Parcel.modifyParcelBitmapSquare(startParcel.getParcelBitmap(), start_x, start_y, end_x, end_y, false));
+            parcelList[startParcelIndex].forceUpdateParcelInfo();
+
+
+            //Now add the new parcel
+            addParcel(newParcel);
+
+
+
+
+
+            return true;
+        }
+        /// <summary>
+        /// Join 2 parcels together
+        /// </summary>
+        /// <param name="start_x">x value in first parcel</param>
+        /// <param name="start_y">y value in first parcel</param>
+        /// <param name="end_x">x value in second parcel</param>
+        /// <param name="end_y">y value in second parcel</param>
+        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the parcels</param>
+        /// <returns>Returns true if successful</returns>
+        private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+            end_x -= 4;
+            end_y -= 4;
+
+            //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
+            //This should be fixed later -- somewhat "incomplete code" --Ming
+            Parcel startParcel, endParcel;
+
+            try
+            {
+                startParcel = getParcel(start_x, start_y);
+                endParcel = getParcel(end_x, end_y);
+            }
+            catch (Exception)
+            {
+                return false; //Error occured when trying to get the start and end parcels
+            }
+            if (startParcel == endParcel)
+            {
+                return false; //Subdivision of the same parcel is not allowed
+            }
+
+            //Check the parcel owners:
+            if (startParcel.parcelData.ownerID != endParcel.parcelData.ownerID)
+            {
+                return false;
+            }
+            if (startParcel.parcelData.ownerID != attempting_user_id)
+            {
+                //TODO: Group editing stuff. Avatar owner support for now
+                return false;
+            }
+
+            //Same owners! Lets join them
+            //Merge them to startParcel
+            parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
+            performFinalParcelJoin(startParcel, endParcel);
+
+            return true;
+
+
+
+        }
+        #endregion
+
+        #region Parcel Updating
+        /// <summary>
+        /// Where we send the ParcelOverlay packet to the client
+        /// </summary>
+        /// <param name="remote_client">The object representing the client</param>
+        public void sendParcelOverlay(IClientAPI remote_client)
+        {
+            const int PARCEL_BLOCKS_PER_PACKET = 1024;
+            int x, y = 0;
+            byte[] byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+            int byteArrayCount = 0;
+            int sequenceID = 0;
+            ParcelOverlayPacket packet;
+
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    byte tempByte = (byte)0; //This represents the byte for the current 4x4
+                    Parcel currentParcelBlock = getParcel(x * 4, y * 4);
+
+                    if (currentParcelBlock.parcelData.ownerID == remote_client.AgentId)
+                    {
+                        //Owner Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_REQUESTER);
+                    }
+                    else if (currentParcelBlock.parcelData.salePrice > 0 && (currentParcelBlock.parcelData.authBuyerID == LLUUID.Zero || currentParcelBlock.parcelData.authBuyerID == remote_client.AgentId))
+                    {
+                        //Sale Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);
+                    }
+                    else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)
+                    {
+                        //Public Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
+                    }
+                    else
+                    {
+                        //Other Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_OTHER);
+                    }
+
+
+                    //Now for border control
+                    if (x == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+                    }
+                    else if (getParcel((x - 1) * 4, y * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+                    }
+
+                    if (y == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+                    else if (getParcel(x * 4, (y - 1) * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+
+                    byteArray[byteArrayCount] = tempByte;
+                    byteArrayCount++;
+                    if (byteArrayCount >= PARCEL_BLOCKS_PER_PACKET)
+                    {
+                        byteArrayCount = 0;
+                        packet = new ParcelOverlayPacket();
+                        packet.ParcelData.Data = byteArray;
+                        packet.ParcelData.SequenceID = sequenceID;
+                        remote_client.OutPacket((Packet)packet);
+                        sequenceID++;
+                        byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+                    }
+                }
+            }
+
+            packet = new ParcelOverlayPacket();
+            packet.ParcelData.Data = byteArray;
+            packet.ParcelData.SequenceID = sequenceID; //Eh?
+            remote_client.OutPacket((Packet)packet);
+        }
+
+        public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)
+        {
+            //Get the parcels within the bounds
+            List<Parcel> temp = new List<Parcel>();
+            int x, y, i;
+            int inc_x = end_x - start_x;
+            int inc_y = end_y - start_y;
+            for (x = 0; x < inc_x; x++)
+            {
+                for (y = 0; y < inc_y; y++)
+                {
+                    OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);
+                    if (!temp.Contains(currentParcel))
+                    {
+                        currentParcel.forceUpdateParcelInfo();
+                        temp.Add(currentParcel);
+                    }
+                }
+            }
+
+            int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL;
+            if (temp.Count > 1)
+            {
+                requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;
+            }
+
+            for (i = 0; i < temp.Count; i++)
+            {
+                temp[i].sendParcelProperties(sequence_id, snap_selection, requestResult, remote_client);
+            }
+
+
+            sendParcelOverlay(remote_client);
+        }
+
+        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        {
+            if (parcelList.ContainsKey(packet.ParcelData.LocalID))
+            {
+                parcelList[packet.ParcelData.LocalID].updateParcelProperties(packet, remote_client);
+            }
+        }
+        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        {
+            subdivide(west, south, east, north, remote_client.AgentId);
+        }
+        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        {
+            join(west, south, east, north, remote_client.AgentId);
+
+        }
+        #endregion
+
+        /// <summary>
+        /// Resets the sim to the default parcel (full sim parcel owned by the default user)
+        /// </summary>
+        public void resetSimParcels()
+        {
+            //Remove all the parcels in the sim and add a blank, full sim parcel set to public
+            parcelList.Clear();
+            lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+            parcelIDList.Initialize();
+
+            Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world);
+
+            fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
+            fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
+            fullSimParcel.parcelData.parcelDesc = "";
+
+            fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
+            fullSimParcel.parcelData.salePrice = 1;
+            fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
+            fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
+
+            addParcel(fullSimParcel);
+
+        }
+        #endregion
+    }
+    #endregion
+
+
+    #region Parcel Class
+    /// <summary>
+    /// Keeps track of a specific parcel's information
+    /// </summary>
+    public class Parcel
+    {
+        #region Member Variables
+        public ParcelData parcelData = new ParcelData();
+        public Scene m_world;
+
+        private bool[,] parcelBitmap = new bool[64, 64];
+
+        #endregion
+
+
+        #region Constructors
+        public Parcel(LLUUID owner_id, bool is_group_owned, Scene world)
+        {
+            m_world = world;
+            parcelData.ownerID = owner_id;
+            parcelData.isGroupOwned = is_group_owned;
+
+        }
+        #endregion
+
+
+        #region Member Functions
+
+        #region General Functions
+        /// <summary>
+        /// Checks to see if this parcel contains a point
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns>Returns true if the parcel contains the specified point</returns>
+        public bool containsPoint(int x, int y)
+        {
+            if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
+            {
+                return (parcelBitmap[x / 4, y / 4] == true);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public Parcel Copy()
+        {
+            Parcel newParcel = new Parcel(this.parcelData.ownerID, this.parcelData.isGroupOwned, m_world);
+
+            //Place all new variables here!
+            newParcel.parcelBitmap = (bool[,])(this.parcelBitmap.Clone());
+            newParcel.parcelData = parcelData.Copy();
+
+            return newParcel;
+        }
+
+        #endregion
+
+
+        #region Packet Request Handling
+        /// <summary>
+        /// Sends parcel properties as requested
+        /// </summary>
+        /// <param name="sequence_id">ID sent by client for them to keep track of</param>
+        /// <param name="snap_selection">Bool sent by client for them to use</param>
+        /// <param name="remote_client">Object representing the client</param>
+        public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
+        {
+
+            ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();
+            updatePacket.ParcelData.AABBMax = parcelData.AABBMax;
+            updatePacket.ParcelData.AABBMin = parcelData.AABBMin;
+            updatePacket.ParcelData.Area = parcelData.area;
+            updatePacket.ParcelData.AuctionID = parcelData.auctionID;
+            updatePacket.ParcelData.AuthBuyerID = parcelData.authBuyerID; //unemplemented
+
+            updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
+
+            updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);
+            updatePacket.ParcelData.Category = (byte)parcelData.category;
+            updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
+            updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
+            updatePacket.ParcelData.GroupID = parcelData.groupID;
+            updatePacket.ParcelData.GroupPrims = parcelData.groupPrims;
+            updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;
+            updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;
+            updatePacket.ParcelData.LocalID = parcelData.localID;
+            updatePacket.ParcelData.MaxPrims = 1000; //unemplemented
+            updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;
+            updatePacket.ParcelData.MediaID = parcelData.mediaID;
+            updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);
+            updatePacket.ParcelData.MusicURL = Helpers.StringToField(parcelData.musicURL);
+            updatePacket.ParcelData.Name = Helpers.StringToField(parcelData.parcelName);
+            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
+            updatePacket.ParcelData.OtherCount = 0; //unemplemented
+            updatePacket.ParcelData.OtherPrims = 0; //unemplented
+            updatePacket.ParcelData.OwnerID = parcelData.ownerID;
+            updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
+            updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented
+            updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented
+            updatePacket.ParcelData.PassHours = parcelData.passHours;
+            updatePacket.ParcelData.PassPrice = parcelData.passPrice;
+            updatePacket.ParcelData.PublicCount = 0; //unemplemented
+            updatePacket.ParcelData.RegionDenyAnonymous = false; //unemplemented
+            updatePacket.ParcelData.RegionDenyIdentified = false; //unemplemented
+            updatePacket.ParcelData.RegionDenyTransacted = false; //unemplemented
+            updatePacket.ParcelData.RegionPushOverride = true; //unemplemented
+            updatePacket.ParcelData.RentPrice = 0; //??
+            updatePacket.ParcelData.RequestResult = request_result;
+            updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented
+            updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented
+            updatePacket.ParcelData.SelfCount = 0;//unemplemented
+            updatePacket.ParcelData.SequenceID = sequence_id;
+            updatePacket.ParcelData.SimWideMaxPrims = 15000; //unemplemented
+            updatePacket.ParcelData.SimWideTotalPrims = 0; //unemplemented
+            updatePacket.ParcelData.SnapSelection = snap_selection;
+            updatePacket.ParcelData.SnapshotID = parcelData.snapshotID;
+            updatePacket.ParcelData.Status = (byte)parcelData.parcelStatus;
+            updatePacket.ParcelData.TotalPrims = 0; //unemplemented
+            updatePacket.ParcelData.UserLocation = parcelData.userLocation;
+            updatePacket.ParcelData.UserLookAt = parcelData.userLookAt;
+            remote_client.OutPacket((Packet)updatePacket);
+        }
+
+        public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        {
+            if (remote_client.AgentId == parcelData.ownerID)
+            {
+                //Needs later group support
+                parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
+                parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
+                parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
+                parcelData.groupID = packet.ParcelData.GroupID;
+                parcelData.landingType = packet.ParcelData.LandingType;
+                parcelData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
+                parcelData.mediaID = packet.ParcelData.MediaID;
+                parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
+                parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
+                parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);
+                parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
+                parcelData.passHours = packet.ParcelData.PassHours;
+                parcelData.passPrice = packet.ParcelData.PassPrice;
+                parcelData.salePrice = packet.ParcelData.SalePrice;
+                parcelData.snapshotID = packet.ParcelData.SnapshotID;
+                parcelData.userLocation = packet.ParcelData.UserLocation;
+                parcelData.userLookAt = packet.ParcelData.UserLookAt;
+
+                List<Avatar> avatars = m_world.RequestAvatarList();
+
+                for (int i = 0; i < avatars.Count; i++)
+                {
+                    Parcel over = m_world.parcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));
+                    if (over == this)
+                    {
+                        sendParcelProperties(0, false, 0, avatars[i].ControllingClient);
+                    }
+                }
+
+            }
+        }
+        #endregion
+
+
+        #region Update Functions
+        /// <summary>
+        /// Updates the AABBMin and AABBMax values after area/shape modification of parcel
+        /// </summary>
+        private void updateAABBAndAreaValues()
+        {
+            int min_x = 64;
+            int min_y = 64;
+            int max_x = 0;
+            int max_y = 0;
+            int tempArea = 0;
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmap[x, y] == true)
+                    {
+                        if (min_x > x) min_x = x;
+                        if (min_y > y) min_y = y;
+                        if (max_x < x) max_x = x;
+                        if (max_y < y) max_y = y;
+                        tempArea += 16; //16sqm parcel
+                    }
+                }
+            }
+            parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);
+            parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);
+            parcelData.area = tempArea;
+        }
+
+        public void updateParcelBitmapByteArray()
+        {
+            parcelData.parcelBitmapByteArray = convertParcelBitmapToBytes();
+        }
+
+        /// <summary>
+        /// Update all settings in parcel such as area, bitmap byte array, etc
+        /// </summary>
+        public void forceUpdateParcelInfo()
+        {
+            this.updateAABBAndAreaValues();
+            this.updateParcelBitmapByteArray();
+        }
+
+        public void setParcelBitmapFromByteArray()
+        {
+            parcelBitmap = convertBytesToParcelBitmap();
+        }
+        #endregion
+
+
+        #region Parcel Bitmap Functions
+        /// <summary>
+        /// Sets the parcel's bitmap manually
+        /// </summary>
+        /// <param name="bitmap">64x64 block representing where this parcel is on a map</param>
+        public void setParcelBitmap(bool[,] bitmap)
+        {
+            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap");
+            }
+            else
+            {
+                //Valid: Lets set it
+                parcelBitmap = bitmap;
+                forceUpdateParcelInfo();
+
+            }
+        }
+        /// <summary>
+        /// Gets the parcels bitmap manually
+        /// </summary>
+        /// <returns></returns>
+        public bool[,] getParcelBitmap()
+        {
+            return parcelBitmap;
+        }
+        /// <summary>
+        /// Converts the parcel bitmap to a packet friendly byte array
+        /// </summary>
+        /// <returns></returns>
+        private byte[] convertParcelBitmapToBytes()
+        {
+            byte[] tempConvertArr = new byte[512];
+            byte tempByte = 0;
+            int x, y, i, byteNum = 0;
+            i = 0;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(parcelBitmap[x, y]) << (i++ % 8));
+                    if (i % 8 == 0)
+                    {
+                        tempConvertArr[byteNum] = tempByte;
+                        tempByte = (byte)0;
+                        i = 0;
+                        byteNum++;
+                    }
+                }
+            }
+            return tempConvertArr;
+        }
+
+        private bool[,] convertBytesToParcelBitmap()
+        {
+            bool[,] tempConvertMap = new bool[64, 64];
+            tempConvertMap.Initialize();
+            byte tempByte = 0;
+            int x = 0, y = 0, i = 0, bitNum = 0;
+            for (i = 0; i < 512; i++)
+            {
+                tempByte = parcelData.parcelBitmapByteArray[i];
+                for (bitNum = 0; bitNum < 8; bitNum++)
+                {
+                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);
+                    tempConvertMap[x, y] = bit;
+                    x++;
+                    if (x > 63)
+                    {
+                        x = 0;
+                        y++;
+                    }
+
+                }
+
+            }
+            return tempConvertMap;
+        }
+        /// <summary>
+        /// Full sim parcel creation
+        /// </summary>
+        /// <returns></returns>
+        public static bool[,] basicFullRegionParcelBitmap()
+        {
+            return getSquareParcelBitmap(0, 0, 256, 256);
+        }
+
+        /// <summary>
+        /// Used to modify the bitmap between the x and y points. Points use 64 scale
+        /// </summary>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <returns></returns>
+        public static bool[,] getSquareParcelBitmap(int start_x, int start_y, int end_x, int end_y)
+        {
+
+            bool[,] tempBitmap = new bool[64, 64];
+            tempBitmap.Initialize();
+
+            tempBitmap = modifyParcelBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            return tempBitmap;
+        }
+
+        /// <summary>
+        /// Change a parcel's bitmap at within a square and set those points to a specific value
+        /// </summary>
+        /// <param name="parcel_bitmap"></param>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <param name="set_value"></param>
+        /// <returns></returns>
+        public static bool[,] modifyParcelBitmapSquare(bool[,] parcel_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)
+        {
+            if (parcel_bitmap.GetLength(0) != 64 || parcel_bitmap.GetLength(1) != 64 || parcel_bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap in modifyParcelBitmapSquare()");
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (x >= start_x / 4 && x < end_x / 4
+                        && y >= start_y / 4 && y < end_y / 4)
+                    {
+                        parcel_bitmap[x, y] = set_value;
+                    }
+                }
+            }
+            return parcel_bitmap;
+        }
+        /// <summary>
+        /// Join the true values of 2 bitmaps together
+        /// </summary>
+        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_add"></param>
+        /// <returns></returns>
+        public static bool[,] mergeParcelBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
+        {
+            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeParcelBitmaps");
+            }
+            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeParcelBitmaps");
+
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (bitmap_add[x, y])
+                    {
+                        bitmap_base[x, y] = true;
+                    }
+                }
+            }
+            return bitmap_base;
+        }
+        #endregion
+
+        #endregion
+
+
+    }
+    #endregion
+
+
+}
diff --git a/OpenSim/Region/Environment/RegionManager.cs b/OpenSim/Region/Environment/RegionManager.cs
new file mode 100644
index 0000000..4ff55a8
--- /dev/null
+++ b/OpenSim/Region/Environment/RegionManager.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Servers;
+using OpenSim.Region.Capabilities;
+
+namespace OpenSim.Region.Environment
+{
+    public class RegionManager //needs renaming , but first we need to rename the namespace
+    {
+        protected AuthenticateSessionsBase authenticateHandler;
+        protected RegionCommsListener regionCommsHost;
+        protected CommunicationsManager commsManager;
+        protected List<Caps> capsHandlers = new List<Caps>();
+        protected BaseHttpServer httpListener;
+
+        protected Scenes.Scene m_Scene;
+
+        public ParcelManager parcelManager;
+        public EstateManager estateManager;
+
+        public RegionManager()
+        {
+
+        }
+
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
new file mode 100644
index 0000000..bbba34d
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -0,0 +1,194 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Axiom.MathLib;
+using OpenSim.Physics.Manager;
+using libsecondlife;
+using OpenSim.Region.Environment.Scripting;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public abstract class Entity : IScriptReadonlyEntity
+    {
+        public libsecondlife.LLUUID uuid;
+        public Quaternion rotation;
+        protected List<Entity> children;
+        
+        protected PhysicsActor _physActor;
+        protected Scene m_world;
+        protected string m_name;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual string Name
+        {
+            get { return m_name; }
+        }
+
+        protected LLVector3 m_pos;
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual LLVector3 Pos
+        {
+            get
+            {
+                if (this._physActor != null)
+                {
+                    m_pos.X = _physActor.Position.X;
+                    m_pos.Y = _physActor.Position.Y;
+                    m_pos.Z = _physActor.Position.Z;
+                }
+
+                return m_pos;
+            }
+            set
+            {
+                if (this._physActor != null)
+                {
+                    try
+                    {
+                        lock (this.m_world.SyncRoot)
+                        {
+
+                            this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(e.Message);
+                    }
+                }
+
+                m_pos = value;
+            }
+        }
+
+        public LLVector3 velocity;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual LLVector3 Velocity
+        {
+            get
+            {
+                if (this._physActor != null)
+                {
+                    velocity.X = _physActor.Velocity.X;
+                    velocity.Y = _physActor.Velocity.Y;
+                    velocity.Z = _physActor.Velocity.Z;
+                }
+
+                return velocity;
+            }
+            set
+            {
+                if (this._physActor != null)
+                {
+                    try
+                    {
+                        lock (this.m_world.SyncRoot)
+                        {
+
+                            this._physActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(e.Message);
+                    }
+                }
+
+                velocity = value;
+            }
+        }
+
+        protected uint m_localId;
+
+        public uint LocalId
+        {
+            get { return m_localId; }
+        }
+
+        /// <summary>
+        /// Creates a new Entity (should not occur on it's own)
+        /// </summary>
+        public Entity()
+        {
+            uuid = new libsecondlife.LLUUID();
+
+            m_pos = new LLVector3();
+            velocity = new LLVector3();
+            rotation = new Quaternion();
+            m_name = "(basic entity)";
+            children = new List<Entity>();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual void updateMovement()
+        {
+        	foreach (Entity child in children)
+            {
+                child.updateMovement();
+            }
+        }
+
+        /// <summary>
+        /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
+        /// </summary>
+        public virtual void update() {
+            // Do any per-frame updates needed that are applicable to every type of entity
+            foreach (Entity child in children)
+            {
+                child.update();
+            }
+        }
+
+        /// <summary>
+        /// Called at a set interval to inform entities that they should back themsleves up to the DB 
+        /// </summary>
+        public virtual void BackUp()
+        {
+        	
+        }
+
+        /// <summary>
+        /// Infoms the entity that the land (heightmap) has changed
+        /// </summary>
+        public virtual void LandRenegerated()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
new file mode 100644
index 0000000..36023d0
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public interface IScenePresenceBody
+    {
+        void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
+        void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
+        void SendOurAppearance(IClientAPI OurClient);
+        void SendAppearanceToOtherAgent(ScenePresence avatarInfo);
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
new file mode 100644
index 0000000..0f649b2
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -0,0 +1,582 @@
+
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public class Primitive : Entity
+    {
+        internal PrimData primData;
+        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
+       // private Dictionary<uint, IClientAPI> m_clientThreads;
+        private ulong m_regionHandle;
+        private const uint FULL_MASK_PERMISSIONS = 2147483647;
+        private bool physicsEnabled = false;
+        private byte updateFlag = 0;
+        private uint flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
+
+        private Dictionary<LLUUID, InventoryItem> inventoryItems;
+
+        #region Properties
+
+        public LLVector3 Scale
+        {
+            set
+            {
+                this.primData.Scale = value;
+                //this.dirtyFlag = true;
+            }
+            get
+            {
+                return this.primData.Scale;
+            }
+        }
+
+        public PhysicsActor PhysActor
+        {
+            set
+            {
+                this._physActor = value;
+            }
+        }
+
+        public override LLVector3 Pos
+        {
+            get
+            {
+                return base.Pos;
+            }
+            set
+            {
+                base.Pos = value;
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="clientThreads"></param>
+        /// <param name="regionHandle"></param>
+        /// <param name="world"></param>
+        public Primitive( ulong regionHandle, Scene world)
+        {
+           // m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="world"></param>
+        /// <param name="addPacket"></param>
+        /// <param name="ownerID"></param>
+        /// <param name="localID"></param>
+        public Primitive(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
+        {
+            // m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.CreateFromPacket(addPacket, ownerID, localID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="clientThreads"></param>
+        /// <param name="regionHandle"></param>
+        /// <param name="world"></param>
+        /// <param name="owner"></param>
+        /// <param name="fullID"></param>
+        /// <param name="localID"></param>
+        public Primitive( ulong regionHandle, Scene world, LLUUID owner, LLUUID fullID, uint localID)
+        {
+          //  m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.primData = new PrimData();
+            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            this.primData.OwnerID = owner;
+            this.primData.FullID = this.uuid = fullID;
+            this.primData.LocalID = m_localId = localID;
+        }
+
+        /// <summary>
+        /// Constructor to create a default cube 
+        /// </summary>
+        /// <param name="clientThreads"></param>
+        /// <param name="regionHandle"></param>
+        /// <param name="world"></param>
+        /// <param name="owner"></param>
+        /// <param name="localID"></param>
+        /// <param name="position"></param>
+        public Primitive( ulong regionHandle, Scene world, LLUUID owner, uint localID, LLVector3 position)
+        {
+            //m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.primData = PrimData.DefaultCube();
+            this.primData.OwnerID = owner;
+            this.primData.LocalID = m_localId = localID;
+            this.Pos = this.primData.Position = position;
+
+            this.updateFlag = 1;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public byte[] GetByteArray()
+        {
+            byte[] result = null;
+            List<byte[]> dataArrays = new List<byte[]>();
+            dataArrays.Add(primData.ToBytes());
+            foreach (Entity child in children)
+            {
+                if (child is OpenSim.Region.Environment.Scenes.Primitive)
+                {
+                    dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());
+                }
+            }
+            byte[] primstart = Helpers.StringToField("<Prim>");
+            byte[] primend = Helpers.StringToField("</Prim>");
+            int totalLength = primstart.Length + primend.Length;
+            for (int i = 0; i < dataArrays.Count; i++)
+            {
+                totalLength += dataArrays[i].Length;
+            }
+
+            result = new byte[totalLength];
+            int arraypos = 0;
+            Array.Copy(primstart, 0, result, 0, primstart.Length);
+            arraypos += primstart.Length;
+            for (int i = 0; i < dataArrays.Count; i++)
+            {
+                Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length);
+                arraypos += dataArrays[i].Length;
+            }
+            Array.Copy(primend, 0, result, arraypos, primend.Length);
+
+            return result;
+        }
+
+        #region Overridden Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void update()
+        {
+            if (this.updateFlag == 1) // is a new prim just been created/reloaded 
+            {
+                this.SendFullUpdateToAllClients();
+                this.updateFlag = 0;
+            }
+            if (this.updateFlag == 2) //some change has been made so update the clients
+            {
+                this.SendTerseUpdateToALLClients();
+                this.updateFlag = 0;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void BackUp()
+        {
+
+        }
+
+        #endregion
+
+        #region Packet handlers
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pos"></param>
+        public void UpdatePosition(LLVector3 pos)
+        {
+            this.Pos = new LLVector3(pos.X, pos.Y, pos.Z);
+            this.updateFlag = 2;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        public void UpdateShape(ObjectShapePacket.ObjectDataBlock updatePacket)
+        {
+            this.primData.PathBegin = updatePacket.PathBegin;
+            this.primData.PathEnd = updatePacket.PathEnd;
+            this.primData.PathScaleX = updatePacket.PathScaleX;
+            this.primData.PathScaleY = updatePacket.PathScaleY;
+            this.primData.PathShearX = updatePacket.PathShearX;
+            this.primData.PathShearY = updatePacket.PathShearY;
+            this.primData.PathSkew = updatePacket.PathSkew;
+            this.primData.ProfileBegin = updatePacket.ProfileBegin;
+            this.primData.ProfileEnd = updatePacket.ProfileEnd;
+            this.primData.PathCurve = updatePacket.PathCurve;
+            this.primData.ProfileCurve = updatePacket.ProfileCurve;
+            this.primData.ProfileHollow = updatePacket.ProfileHollow;
+            this.primData.PathRadiusOffset = updatePacket.PathRadiusOffset;
+            this.primData.PathRevolutions = updatePacket.PathRevolutions;
+            this.primData.PathTaperX = updatePacket.PathTaperX;
+            this.primData.PathTaperY = updatePacket.PathTaperY;
+            this.primData.PathTwist = updatePacket.PathTwist;
+            this.primData.PathTwistBegin = updatePacket.PathTwistBegin;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="tex"></param>
+        public void UpdateTexture(byte[] tex)
+        {
+            this.primData.TextureEntry = tex;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pack"></param>
+        public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="prim"></param>
+        public void AssignToParent(Primitive prim)
+        {
+
+        }
+
+        #endregion
+
+        # region Inventory Methods
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        public bool AddToInventory(InventoryItem item)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="itemID"></param>
+        /// <returns></returns>
+        public InventoryItem RemoveFromInventory(LLUUID itemID)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="simClient"></param>
+        /// <param name="packet"></param>
+        public void RequestInventoryInfo(IClientAPI simClient, RequestTaskInventoryPacket packet)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="simClient"></param>
+        /// <param name="xferID"></param>
+        public void RequestXferInventory(IClientAPI simClient, ulong xferID)
+        {
+            //will only currently work if the total size of the inventory data array is under about 1000 bytes
+            SendXferPacketPacket send = new SendXferPacketPacket();
+
+            send.XferID.ID = xferID;
+            send.XferID.Packet = 1 + 2147483648;
+            send.DataPacket.Data = this.ConvertInventoryToBytes();
+
+            simClient.OutPacket(send);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public byte[] ConvertInventoryToBytes()
+        {
+            System.Text.Encoding enc = System.Text.Encoding.ASCII;
+            byte[] result = new byte[0];
+            List<byte[]> inventoryData = new List<byte[]>();
+            int totallength = 0;
+            foreach (InventoryItem invItem in inventoryItems.Values)
+            {
+                byte[] data = enc.GetBytes(invItem.ExportString());
+                inventoryData.Add(data);
+                totallength += data.Length;
+            }
+            //TODO: copy arrays into the single result array
+
+            return result;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="data"></param>
+        public void CreateInventoryFromBytes(byte[] data)
+        {
+
+        }
+
+        #endregion
+
+        #region Update viewers Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        public void SendFullUpdateForAllChildren(IClientAPI remoteClient)
+        {
+            this.SendFullUpdateToClient(remoteClient);
+            for (int i = 0; i < this.children.Count; i++)
+            {
+                if (this.children[i] is Primitive)
+                {
+                    ((Primitive)this.children[i]).SendFullUpdateForAllChildren(remoteClient);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        public void SendFullUpdateToClient(IClientAPI remoteClient)
+        {
+            LLVector3 lPos;
+            if (this._physActor != null && this.physicsEnabled)
+            {
+                PhysicsVector pPos = this._physActor.Position;
+                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
+            }
+            else
+            {
+                lPos = this.Pos;
+            }
+
+            remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.LocalId, this.primData, lPos, new LLUUID("00000000-0000-0000-9999-000000000005"), this.flags);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendFullUpdateToAllClients()
+        {
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                this.SendFullUpdateToClient(avatars[i].ControllingClient);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="RemoteClient"></param>
+        public void SendTerseUpdateToClient(IClientAPI RemoteClient)
+        {
+            LLVector3 lPos;
+            Axiom.MathLib.Quaternion lRot;
+            if (this._physActor != null && this.physicsEnabled) //is this needed ? doesn't the property fields do this for us?
+            {
+                PhysicsVector pPos = this._physActor.Position;
+                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
+                lRot = this._physActor.Orientation;
+            }
+            else
+            {
+                lPos = this.Pos;
+                lRot = this.rotation;
+            }
+            LLQuaternion mRot = new LLQuaternion(lRot.x, lRot.y, lRot.z, lRot.w);
+            RemoteClient.SendPrimTerseUpdate(this.m_regionHandle, 64096, this.LocalId, lPos, mRot);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendTerseUpdateToALLClients()
+        {
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                this.SendTerseUpdateToClient(avatars[i].ControllingClient);
+            }
+        }
+
+        #endregion
+
+        #region Create Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="ownerID"></param>
+        /// <param name="localID"></param>
+        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
+        {
+            PrimData PData = new PrimData();
+            this.primData = PData;
+            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+
+            PData.OwnerID = ownerID;
+            PData.PCode = addPacket.ObjectData.PCode;
+            PData.PathBegin = addPacket.ObjectData.PathBegin;
+            PData.PathEnd = addPacket.ObjectData.PathEnd;
+            PData.PathScaleX = addPacket.ObjectData.PathScaleX;
+            PData.PathScaleY = addPacket.ObjectData.PathScaleY;
+            PData.PathShearX = addPacket.ObjectData.PathShearX;
+            PData.PathShearY = addPacket.ObjectData.PathShearY;
+            PData.PathSkew = addPacket.ObjectData.PathSkew;
+            PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
+            PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
+            PData.Scale = addPacket.ObjectData.Scale;
+            PData.PathCurve = addPacket.ObjectData.PathCurve;
+            PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
+            PData.ParentID = 0;
+            PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
+            PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
+            PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
+            PData.PathTaperX = addPacket.ObjectData.PathTaperX;
+            PData.PathTaperY = addPacket.ObjectData.PathTaperY;
+            PData.PathTwist = addPacket.ObjectData.PathTwist;
+            PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
+            LLVector3 pos1 = addPacket.ObjectData.RayEnd;
+            this.primData.FullID = this.uuid = LLUUID.Random();
+            this.primData.LocalID = m_localId = (uint)(localID);
+            this.primData.Position = this.Pos = pos1;
+
+            this.updateFlag = 1;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="data"></param>
+        public void CreateFromBytes(byte[] data)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primData"></param>
+        public void CreateFromPrimData(PrimData primData)
+        {
+            this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primData"></param>
+        /// <param name="posi"></param>
+        /// <param name="localID"></param>
+        /// <param name="newprim"></param>
+        public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
+        {
+
+        }
+        
+        public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
+        {
+           // Console.WriteLine("moving prim to new location " + pos.X + " , " + pos.Y + " , " + pos.Z);
+            this.Pos = pos;
+            this.SendTerseUpdateToALLClients();
+        }
+
+        public void GetProperites(IClientAPI client)
+        {
+            //needs changing
+            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
+            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
+            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
+            proper.ObjectData[0].ItemID = LLUUID.Zero;
+            proper.ObjectData[0].CreationDate = (ulong)primData.CreationDate;
+            proper.ObjectData[0].CreatorID = primData.OwnerID;
+            proper.ObjectData[0].FolderID = LLUUID.Zero;
+            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
+            proper.ObjectData[0].GroupID = LLUUID.Zero;
+            proper.ObjectData[0].InventorySerial = 0;
+            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
+            proper.ObjectData[0].ObjectID = this.uuid;
+            proper.ObjectData[0].OwnerID = primData.OwnerID;
+            proper.ObjectData[0].TouchName = new byte[0];
+            proper.ObjectData[0].TextureID = new byte[0];
+            proper.ObjectData[0].SitName = new byte[0];
+            proper.ObjectData[0].Name = new byte[0];
+            proper.ObjectData[0].Description = new byte[0];
+            proper.ObjectData[0].OwnerMask = primData.OwnerMask;
+            proper.ObjectData[0].NextOwnerMask = primData.NextOwnerMask;
+            proper.ObjectData[0].GroupMask = primData.GroupMask;
+            proper.ObjectData[0].EveryoneMask = primData.EveryoneMask;
+            proper.ObjectData[0].BaseMask = primData.BaseMask;
+
+            client.OutPacket(proper);
+
+        }
+
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
new file mode 100644
index 0000000..1d55c4d
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -0,0 +1,305 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public partial class Scene
+    {
+        /// <summary>
+        /// Modifies terrain using the specified information
+        /// </summary>
+        /// <param name="height">The height at which the user started modifying the terrain</param>
+        /// <param name="seconds">The number of seconds the modify button was pressed</param>
+        /// <param name="brushsize">The size of the brush used</param>
+        /// <param name="action">The action to be performed</param>
+        /// <param name="north">Distance from the north border where the cursor is located</param>
+        /// <param name="west">Distance from the west border where the cursor is located</param>
+        public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west)
+        {
+            // Shiny.
+            double size = (double)(1 << brushsize);
+
+            switch (action)
+            {
+                case 0:
+                    // flatten terrain
+                    Terrain.flatten(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 1:
+                    // raise terrain
+                    Terrain.raise(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 2:
+                    //lower terrain
+                    Terrain.lower(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 3:
+                    // smooth terrain
+                    Terrain.smooth(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 4:
+                    // noise
+                    Terrain.noise(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 5:
+                    // revert
+                    Terrain.revert(north, west, size, (double)seconds / 100.0);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+
+                // CLIENT EXTENSIONS GO HERE
+                case 128:
+                    // erode-thermal
+                    break;
+                case 129:
+                    // erode-aerobic
+                    break;
+                case 130:
+                    // erode-hydraulic
+                    break;
+            }
+            return;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="type"></param>
+        /// <param name="fromPos"></param>
+        /// <param name="fromName"></param>
+        /// <param name="fromAgentID"></param>
+        public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+        {
+            Console.WriteLine("Chat message");
+            ScenePresence avatar = null;
+            foreach (IClientAPI client in m_clientThreads.Values)
+            {
+                int dis = -1000;
+                if (this.Avatars.ContainsKey(client.AgentId))
+                {
+                    
+                    avatar = this.Avatars[client.AgentId];
+                    // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
+                    dis= (int)avatar.Pos.GetDistanceTo(fromPos);
+                    Console.WriteLine("found avatar at " +dis);
+
+                }
+             
+                switch (type)
+                {
+                    case 0: // Whisper
+                        if ((dis < 10) && (dis > -10))
+                        {
+                            //should change so the message is sent through the avatar rather than direct to the ClientView
+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+                    case 1: // Say
+                        if ((dis < 30) && (dis > -30))
+                        {
+                            Console.WriteLine("sending chat");
+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+                    case 2: // Shout
+                        if ((dis < 100) && (dis > -100))
+                        {
+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+
+                    case 0xff: // Broadcast
+                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        break;
+                }
+
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primAsset"></param>
+        /// <param name="pos"></param>
+        public void RezObject(AssetBase primAsset, LLVector3 pos)
+        {
+          
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="packet"></param>
+        /// <param name="simClient"></param>
+        public void DeRezObject(Packet packet, IClientAPI simClient)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        public void SendAvatarsToClient(IClientAPI remoteClient)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="parentPrim"></param>
+        /// <param name="childPrims"></param>
+        public void LinkObjects(uint parentPrim, List<uint> childPrims)
+        {
+            
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primLocalID"></param>
+        /// <param name="shapeBlock"></param>
+        public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primLocalID"></param>
+        /// <param name="remoteClient"></param>
+        public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.LocalId == primLocalID)
+                {
+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);
+                    break;
+                }
+            }
+        }
+
+        public void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
+        {
+            if (this.Entities.ContainsKey(objectID))
+            {
+                ((Primitive)this.Entities[objectID]).GrapMovement(offset, pos, remoteClient);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="packet"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="texture"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="pos"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimPosition(uint localID, LLVector3 pos, IClientAPI remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.LocalId == localID)
+                {
+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).UpdatePosition(pos);
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="rot"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="scale"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimScale(uint localID, LLVector3 scale, IClientAPI remoteClient)
+        {
+        }
+
+        /// <summary>
+        /// Sends prims to a client
+        /// </summary>
+        /// <param name="RemoteClient">Client to send to</param>
+        public void GetInitialPrims(IClientAPI RemoteClient)
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs b/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
new file mode 100644
index 0000000..2249c3d
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
@@ -0,0 +1,184 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using libsecondlife;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public partial class Scene
+    {
+        private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void LoadScriptEngines()
+        {
+            this.LoadScriptPlugins();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        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]);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="FileName"></param>
+        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;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="scriptType"></param>
+        /// <param name="scriptName"></param>
+        /// <param name="script"></param>
+        /// <param name="ent"></param>
+        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
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <returns></returns>
+        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;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <param name="z"></param>
+        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");
+                }
+            }
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public uint GetRandomAvatarID()
+        {
+            //Console.WriteLine("script- getting random avatar id");
+            uint res = 0;
+            foreach (Entity entity in this.Entities.Values)
+            {
+                if (entity is ScenePresence)
+                {
+                    res = entity.LocalId;
+                }
+            }
+            return res;
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
new file mode 100644
index 0000000..ff54efa
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -0,0 +1,795 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.IO;
+using System.Threading;
+using System.Timers;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework;
+using OpenSim.Region.Environment.Scripting;
+using OpenSim.Region.Terrain;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Caches;
+using OpenSim.Region.Environment;
+using OpenSim.Framework.Servers;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public delegate bool FilterAvatarList(ScenePresence avatar);
+
+    public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
+    {
+        protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
+        protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars;
+        protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;
+        private PhysicsScene phyScene;
+        private float timeStep = 0.1f;
+        private Random Rand = new Random();
+        private uint _primCount = 702000;
+        private int storageCount;
+        private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers;
+        private Dictionary<string, ScriptFactory> m_scripts;
+        private Mutex updateLock;
+        
+        protected AuthenticateSessionsBase authenticateHandler;
+        protected RegionCommsListener regionCommsHost;
+        protected CommunicationsManager commsManager;
+
+        protected Dictionary<LLUUID, Capabilities.Caps> capsHandlers = new Dictionary<LLUUID, Capabilities.Caps>();
+        protected BaseHttpServer httpListener;
+
+        public ParcelManager parcelManager;
+        public EstateManager estateManager;
+        public EventManager eventManager;
+
+        #region Properties
+        /// <summary>
+        /// 
+        /// </summary>
+        public PhysicsScene PhysScene
+        {
+            set
+            {
+                this.phyScene = value;
+            }
+            get
+            {
+                return (this.phyScene);
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Creates a new World class, and a region to go with it.
+        /// </summary>
+        /// <param name="clientThreads">Dictionary to contain client threads</param>
+        /// <param name="regionHandle">Region Handle for this region</param>
+        /// <param name="regionName">Region Name for this region</param>
+        public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
+        {
+            try
+            {
+                updateLock = new Mutex(false);
+                this.authenticateHandler = authen;
+                this.commsManager = commsMan;
+                this.assetCache = assetCach;
+                m_clientThreads = clientThreads;
+                m_regInfo = regInfo;
+                m_regionHandle = m_regInfo.RegionHandle;
+                m_regionName = m_regInfo.RegionName;
+                this.m_datastore = m_regInfo.DataStore;
+                this.RegisterRegionWithComms();
+
+                parcelManager = new ParcelManager(this, this.m_regInfo);
+                estateManager = new EstateManager(this, this.m_regInfo);
+
+                eventManager = new EventManager();
+
+                m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
+                m_scripts = new Dictionary<string, ScriptFactory>();
+
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
+                Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
+                Avatars = new Dictionary<LLUUID, ScenePresence>();
+                Prims = new Dictionary<LLUUID, Primitive>();
+
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap");
+                Terrain = new TerrainEngine();
+
+                ScenePresence.LoadAnims();
+                this.httpListener = httpServer;
+                
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Error( "World.cs: Constructor failed with exception " + e.ToString());
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void StartTimer()
+        {
+            m_heartbeatTimer.Enabled = true;
+            m_heartbeatTimer.Interval = 100;
+            m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
+        }
+
+
+        #region Update Methods
+
+
+        /// <summary>
+        /// Performs per-frame updates regularly
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void Heartbeat(object sender, System.EventArgs e)
+        {
+            this.Update();
+        }
+
+        /// <summary>
+        /// Performs per-frame updates on the world, this should be the central world loop
+        /// </summary>
+        public override void Update()
+        {
+            updateLock.WaitOne();
+            try
+            {
+                if (this.phyScene.IsThreaded)
+                {
+                    this.phyScene.GetResults();
+
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].updateMovement();
+                }
+
+                lock (this.m_syncRoot)
+                {
+                    this.phyScene.Simulate(timeStep);
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].update();
+                }
+
+                // New
+                eventManager.TriggerOnFrame();
+
+                // TODO: Obsolete - Phase out
+                foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
+                {
+                    scriptHandler.OnFrame();
+                }
+                foreach (IScriptEngine scripteng in this.scriptEngines.Values)
+                {
+                    scripteng.OnFrame();
+                }
+
+                //backup world data
+                this.storageCount++;
+                if (storageCount > 1200) //set to how often you want to backup 
+                {
+                    this.Backup();
+                    storageCount = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
+            }
+            updateLock.ReleaseMutex();
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public bool Backup()
+        {
+            /*
+            try
+            {
+                // Terrain backup routines
+                if (Terrain.tainted > 0)
+                {
+                    Terrain.tainted = 0;
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain tainted, saving.");
+                    localStorage.SaveMap(Terrain.getHeights1D());
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain saved, informing Physics.");
+                    lock (this.m_syncRoot)
+                    {
+                        phyScene.SetTerrain(Terrain.getHeights1D());
+                    }
+                }
+
+                // Primitive backup routines
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Backing up Primitives");
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].BackUp();
+                }
+
+                //Parcel backup routines
+                ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
+                int i = 0;
+                foreach (OpenSim.Region.Environment.Parcel parcel in parcelManager.parcelList.Values)
+                {
+                    parcels[i] = parcel.parcelData;
+                    i++;
+                }
+                localStorage.SaveParcels(parcels);
+
+                // Backup successful
+                return true;
+            }
+            catch (Exception e)
+            {
+                // Backup failed
+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
+                return false;
+            }
+            */
+            return true;
+        }
+        #endregion
+
+        #region Regenerate Terrain
+
+        /// <summary>
+        /// Rebuilds the terrain using a procedural algorithm
+        /// </summary>
+        public void RegenerateTerrain()
+        {
+            try
+            {
+                Terrain.hills();
+
+                lock (this.m_syncRoot)
+                {
+                    this.phyScene.SetTerrain(Terrain.getHeights1D());
+                }
+                this.localStorage.SaveMap(this.Terrain.getHeights1D());
+
+                foreach (IClientAPI client in m_clientThreads.Values)
+                {
+                    this.SendLayerData(client);
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].LandRenegerated();
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Rebuilds the terrain using a 2D float array
+        /// </summary>
+        /// <param name="newMap">256,256 float array containing heights</param>
+        public void RegenerateTerrain(float[,] newMap)
+        {
+            try
+            {
+                this.Terrain.setHeights2D(newMap);
+                lock (this.m_syncRoot)
+                {
+                    this.phyScene.SetTerrain(this.Terrain.getHeights1D());
+                }
+                this.localStorage.SaveMap(this.Terrain.getHeights1D());
+
+                foreach (IClientAPI client in m_clientThreads.Values)
+                {
+                    this.SendLayerData(client);
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].LandRenegerated();
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Rebuilds the terrain assuming changes occured at a specified point[?]
+        /// </summary>
+        /// <param name="changes">???</param>
+        /// <param name="pointx">???</param>
+        /// <param name="pointy">???</param>
+        public void RegenerateTerrain(bool changes, int pointx, int pointy)
+        {
+            try
+            {
+                if (changes)
+                {
+                    /* Dont save here, rely on tainting system instead */
+
+                    foreach (IClientAPI client in m_clientThreads.Values)
+                    {
+                        this.SendLayerData(pointx, pointy, client);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+            }
+        }
+
+        #endregion
+
+        #region Load Terrain
+        /// <summary>
+        /// Loads the World heightmap
+        /// </summary>
+        /// 
+        public override void LoadWorldMap()
+        {
+            try
+            {
+                float[] map = this.localStorage.LoadWorld();
+                if (map == null)
+                {
+                    if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
+                    {
+                        Console.WriteLine("No default terrain, procedurally generating...");
+                        this.Terrain.hills();
+
+                        this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                    }
+                    else
+                    {
+                        try
+                        {
+                            this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);
+                            this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;
+                        }
+                        catch
+                        {
+                            Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
+                            Terrain.hills();
+                        }
+                        this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                    }
+                }
+                else
+                {
+                    this.Terrain.setHeights1D(map);
+                }
+
+                CreateTerrainTexture();
+
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void CreateTerrainTexture()
+        {
+            //create a texture asset of the terrain 
+            byte[] data = this.Terrain.exportJpegImage("defaultstripe.png");
+            this.m_regInfo.estateSettings.terrainImageID = LLUUID.Random();
+            AssetBase asset = new AssetBase();
+            asset.FullID = this.m_regInfo.estateSettings.terrainImageID;
+            asset.Data = data;
+            asset.Name = "terrainImage";
+            asset.Type = 0;
+            this.assetCache.AddAsset(asset);
+        }
+        #endregion
+
+        #region Primitives Methods
+
+
+        /// <summary>
+        /// Loads the World's objects
+        /// </summary>
+        public void LoadPrimsFromStorage()
+        {
+            try
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: LoadPrimsFromStorage() - Loading primitives");
+                this.localStorage.LoadPrimitives(this);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Loads a specific object from storage
+        /// </summary>
+        /// <param name="prim">The object to load</param>
+        public void PrimFromStorage(PrimData prim)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="agentClient"></param>
+        public void AddNewPrim(Packet addPacket, IClientAPI agentClient)
+        {
+            AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentId);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="ownerID"></param>
+        public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
+        {
+            try
+            {
+                Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
+
+                this.Entities.Add(prim.uuid, prim);
+                this._primCount++;
+
+                // Trigger event for listeners
+                eventManager.TriggerOnNewPrimitive(prim);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
+            }
+        }
+
+        #endregion
+
+        #region Add/Remove Avatar Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param          
+        /// <param name="agentID"></param>
+        /// <param name="child"></param>
+        public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child)
+        {
+            remoteClient.OnRegionHandShakeReply += this.SendLayerData;
+            //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
+            remoteClient.OnChatFromViewer += this.SimChat;
+            remoteClient.OnRequestWearables += this.InformClientOfNeighbours;
+            remoteClient.OnAddPrim += this.AddNewPrim;
+            remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;
+            remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;
+            remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
+           //remoteClient.OnObjectSelect += this.SelectPrim;
+            remoteClient.OnGrapUpdate += this.MoveObject;
+
+            /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
+            remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
+            remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
+            remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
+            remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
+            */
+
+            ScenePresence newAvatar = null;
+            try
+            {
+
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
+                newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo);
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");
+
+                //newAvatar.SendRegionHandshake();
+                this.estateManager.sendRegionHandshake(remoteClient);
+
+                PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
+                lock (this.m_syncRoot)
+                {
+                    newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
+                }
+
+                lock (Entities)
+                {
+                    if (!Entities.ContainsKey(agentID))
+                    {
+                        this.Entities.Add(agentID, newAvatar);
+                    }
+                    else
+                    {
+                        Entities[agentID] = newAvatar;
+                    }
+                }
+                lock (Avatars)
+                {
+                    if (Avatars.ContainsKey(agentID))
+                    {
+                        Avatars[agentID] = newAvatar;
+                    }
+                    else
+                    {
+                        this.Avatars.Add(agentID, newAvatar);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
+            }
+            return;
+        }
+
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agentID"></param>
+        public override void RemoveClient(LLUUID agentID)
+        {
+            eventManager.TriggerOnRemovePresence(agentID);
+
+            return;
+        }
+        #endregion
+
+        #region Request Avatars List Methods
+        //The idea is to have a group of method that return a list of avatars meeting some requirement
+        // ie it could be all Avatars within a certain range of the calling prim/avatar. 
+
+        /// <summary>
+        /// Request a List of all Avatars in this World
+        /// </summary>
+        /// <returns></returns>
+        public List<ScenePresence> RequestAvatarList()
+        {
+            List<ScenePresence> result = new List<ScenePresence>();
+
+            foreach (ScenePresence avatar in Avatars.Values)
+            {
+                result.Add(avatar);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Request a filtered list of Avatars in this World
+        /// </summary>
+        /// <returns></returns>
+        public List<ScenePresence> RequestAvatarList(FilterAvatarList filter)
+        {
+            List<ScenePresence> result = new List<ScenePresence>();
+
+            foreach (ScenePresence avatar in Avatars.Values)
+            {
+                if (filter(avatar))
+                {
+                    result.Add(avatar);
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Request a Avatar by UUID
+        /// </summary>
+        /// <param name="avatarID"></param>
+        /// <returns></returns>
+        public ScenePresence RequestAvatar(LLUUID avatarID)
+        {
+            if (this.Avatars.ContainsKey(avatarID))
+            {
+                return Avatars[avatarID];
+            }
+            return null;
+        }
+        #endregion
+
+
+        #region RegionCommsHost
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RegisterRegionWithComms()
+        {
+            GridInfo gridSettings = new GridInfo();
+            this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings);
+            if (this.regionCommsHost != null)
+            {
+                this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
+                this.regionCommsHost.OnAvatarCrossingIntoRegion += new AgentCrossing(this.AgentCrossing);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="agent"></param>
+        public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
+        {
+            // Console.WriteLine("World.cs - add new user connection");
+            //should just check that its meant for this region 
+            if (regionHandle == this.m_regInfo.RegionHandle)
+            {
+                if (agent.CapsPath != "")
+                {
+                    //Console.WriteLine("new user, so creating caps handler for it");
+                    Capabilities.Caps cap = new Capabilities.Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
+                    cap.RegisterHandlers();
+                    this.capsHandlers.Add(agent.AgentID, cap);
+                }
+                this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+            }
+        }
+
+        public void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (regionHandle == this.m_regInfo.RegionHandle)
+            {
+                if (this.Avatars.ContainsKey(agentID))
+                {
+                    this.Avatars[agentID].MakeAvatar(position);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void InformClientOfNeighbours(IClientAPI remoteClient)
+        {
+            // Console.WriteLine("informing client of neighbouring regions");
+            List<RegionInfo> neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo);
+
+            //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
+            if (neighbours != null)
+            {
+                for (int i = 0; i < neighbours.Count; i++)
+                {
+                    // Console.WriteLine("sending neighbours data");
+                    AgentCircuitData agent = remoteClient.RequestClientInfo();
+                    agent.BaseFolder = LLUUID.Zero;
+                    agent.InventoryFolder = LLUUID.Zero;
+                    agent.startpos = new LLVector3(128, 128, 70);
+                    agent.child = true;
+                    this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent);
+                    remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr), (ushort)neighbours[i].CommsIPListenPort);
+                    //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <returns></returns>
+        public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
+        {
+            return this.commsManager.GridServer.RequestNeighbourInfo(regionHandle);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="minX"></param>
+        /// <param name="minY"></param>
+        /// <param name="maxX"></param>
+        /// <param name="maxY"></param>
+        public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
+        {
+            List<MapBlockData> mapBlocks;
+            mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
+            remoteClient.SendMapBlock(mapBlocks);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="RegionHandle"></param>
+        /// <param name="position"></param>
+        /// <param name="lookAt"></param>
+        /// <param name="flags"></param>
+        public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags)
+        {
+            if (regionHandle == this.m_regionHandle)
+            {
+                if (this.Avatars.ContainsKey(remoteClient.AgentId))
+                {
+                    remoteClient.SendTeleportLocationStart();
+                    remoteClient.SendLocalTeleport(position, lookAt, flags);
+                    this.Avatars[remoteClient.AgentId].Teleport(position);
+                }
+            }
+            else
+            {
+                RegionInfo reg = this.RequestNeighbouringRegionInfo(regionHandle);
+                if (reg != null)
+                {
+                    remoteClient.SendTeleportLocationStart();
+                    AgentCircuitData agent = remoteClient.RequestClientInfo();
+                    agent.BaseFolder = LLUUID.Zero;
+                    agent.InventoryFolder = LLUUID.Zero;
+                    agent.startpos = new LLVector3(128, 128, 70);
+                    agent.child = true;
+                    this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
+                    this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position);
+                    remoteClient.SendRegionTeleport(regionHandle, 13, reg.CommsIPListenAddr, (ushort)reg.CommsIPListenPort, 4, (1 << 4));               
+                }
+                //remoteClient.SendTeleportCancel();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionhandle"></param>
+        /// <param name="agentID"></param>
+        /// <param name="position"></param>
+        public bool InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position)
+        {
+           return this.commsManager.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position);
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
new file mode 100644
index 0000000..3d8f522
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -0,0 +1,201 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.IO;
+using System.Threading;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Region.Environment.Scripting;
+using OpenSim.Region.Terrain;
+using OpenSim.Region.Caches;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public abstract class SceneBase :  IWorld 
+    {
+        public Dictionary<libsecondlife.LLUUID, Entity> Entities;
+        protected Dictionary<uint, IClientAPI> m_clientThreads;
+        protected ulong m_regionHandle;
+        protected string m_regionName;
+        protected RegionInfo m_regInfo;
+
+        public TerrainEngine Terrain;
+
+        public string m_datastore;
+        public ILocalStorage localStorage;
+
+        protected object m_syncRoot = new object();
+        private uint m_nextLocalId = 8880000;
+        protected AssetCache assetCache;
+
+        #region Update Methods
+        /// <summary>
+        /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
+        /// </summary>
+        public abstract void Update();
+
+        #endregion
+
+        #region Terrain Methods
+
+        /// <summary>
+        /// Loads the World heightmap
+        /// </summary>
+        public abstract void LoadWorldMap();
+
+        /// <summary>
+        /// Loads a new storage subsystem from a named library
+        /// </summary>
+        /// <param name="dllName">Storage Library</param>
+        /// <returns>Successful or not</returns>
+        public bool LoadStorageDLL(string dllName)
+        {
+            try
+            {
+                Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+                ILocalStorage store = null;
+
+                foreach (Type pluginType in pluginAssembly.GetTypes())
+                {
+                    if (pluginType.IsPublic)
+                    {
+                        if (!pluginType.IsAbstract)
+                        {
+                            Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
+
+                            if (typeInterface != null)
+                            {
+                                ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                                store = plug;
+
+                                store.Initialise(this.m_datastore);
+                                break;
+                            }
+
+                            typeInterface = null;
+                        }
+                    }
+                }
+                pluginAssembly = null;
+                this.localStorage = store;
+                return (store == null);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
+                return false;
+            }
+        }
+
+        
+        /// <summary>
+        /// Send the region heightmap to the client
+        /// </summary>
+        /// <param name="RemoteClient">Client to send to</param>
+        public virtual void SendLayerData(IClientAPI RemoteClient)
+        {
+            RemoteClient.SendLayerData(Terrain.getHeights1D());
+        }
+
+        /// <summary>
+        /// Sends a specified patch to a client
+        /// </summary>
+        /// <param name="px">Patch coordinate (x) 0..16</param>
+        /// <param name="py">Patch coordinate (y) 0..16</param>
+        /// <param name="RemoteClient">The client to send to</param>
+        public virtual void SendLayerData(int px, int py, IClientAPI RemoteClient)
+        {
+            RemoteClient.SendLayerData(px, py, Terrain.getHeights1D());
+        }
+
+        #endregion
+
+        #region Add/Remove Agent/Avatar
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="agentID"></param>
+        /// <param name="child"></param>
+        public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agentID"></param>
+        public abstract void RemoveClient(LLUUID agentID);
+       
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public virtual RegionInfo RegionInfo
+        {
+            get { return this.m_regInfo; }
+        }
+
+        public object SyncRoot
+        {
+            get { return m_syncRoot; }
+        }
+
+        public uint NextLocalId
+        {
+            get { return m_nextLocalId++; }
+        }
+
+        #region Shutdown
+        /// <summary>
+        /// Tidy before shutdown
+        /// </summary>
+        public virtual void Close()
+        {
+            try
+            {
+                this.localStorage.ShutDown();
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
+            }
+        }
+
+        #endregion
+
+ 
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
new file mode 100644
index 0000000..fa1bacb
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    /// <summary>
+    /// A class for triggering remote scene events.
+    /// </summary>
+    public class EventManager
+    {
+        public delegate void OnFrameDelegate();
+        public event OnFrameDelegate OnFrame;
+
+        public delegate void OnNewPresenceDelegate(ScenePresence presence);
+        public event OnNewPresenceDelegate OnNewPresence;
+
+        public delegate void OnNewPrimitiveDelegate(Primitive prim);
+        public event OnNewPrimitiveDelegate OnNewPrimitive;
+
+        public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
+        public event OnRemovePresenceDelegate OnRemovePresence;
+
+        public void TriggerOnFrame()
+        {
+            if (OnFrame != null)
+            {
+                OnFrame();
+            }
+        }
+
+        public void TriggerOnNewPrimitive(Primitive prim)
+        {
+            if (OnNewPrimitive != null)
+                OnNewPrimitive(prim);
+        }
+
+        public void TriggerOnNewPresence(ScenePresence presence)
+        {
+            if (OnNewPresence != null)
+                OnNewPresence(presence);
+        }
+
+        public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
+        {
+            if (OnRemovePresence != null)
+            {
+                OnRemovePresence(uuid);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
new file mode 100644
index 0000000..88fb160
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -0,0 +1,128 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public class SceneObject : Entity
+    {
+        private LLUUID rootUUID;
+        //private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>();
+        protected Primitive rootPrimitive;
+        private Scene m_world;
+        protected ulong regionHandle;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public SceneObject()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="agentID"></param>
+        /// <param name="localID"></param>
+        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
+        {
+            this.rootPrimitive = new Primitive( this.regionHandle, this.m_world, addPacket, agentID, localID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="data"></param>
+        public void CreateFromBytes(byte[] data)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void update()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void BackUp()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="client"></param>
+        public void GetProperites(IClientAPI client)
+        {
+            //needs changing
+            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
+            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
+            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
+            proper.ObjectData[0].ItemID = LLUUID.Zero;
+            proper.ObjectData[0].CreationDate = (ulong)this.rootPrimitive.primData.CreationDate;
+            proper.ObjectData[0].CreatorID = this.rootPrimitive.primData.OwnerID;
+            proper.ObjectData[0].FolderID = LLUUID.Zero;
+            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
+            proper.ObjectData[0].GroupID = LLUUID.Zero;
+            proper.ObjectData[0].InventorySerial = 0;
+            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
+            proper.ObjectData[0].ObjectID = this.uuid;
+            proper.ObjectData[0].OwnerID = this.rootPrimitive.primData.OwnerID;
+            proper.ObjectData[0].TouchName = new byte[0];
+            proper.ObjectData[0].TextureID = new byte[0];
+            proper.ObjectData[0].SitName = new byte[0];
+            proper.ObjectData[0].Name = new byte[0];
+            proper.ObjectData[0].Description = new byte[0];
+            proper.ObjectData[0].OwnerMask = this.rootPrimitive.primData.OwnerMask;
+            proper.ObjectData[0].NextOwnerMask = this.rootPrimitive.primData.NextOwnerMask;
+            proper.ObjectData[0].GroupMask = this.rootPrimitive.primData.GroupMask;
+            proper.ObjectData[0].EveryoneMask = this.rootPrimitive.primData.EveryoneMask;
+            proper.ObjectData[0].BaseMask = this.rootPrimitive.primData.BaseMask;
+
+            client.OutPacket(proper);
+            
+        }
+
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
new file mode 100644
index 0000000..2caabc2
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -0,0 +1,76 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using System.Xml;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    partial class ScenePresence
+    {
+        public class AvatarAnimations
+        {
+
+            public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
+            public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
+
+            public AvatarAnimations()
+            {
+            }
+
+            public void LoadAnims()
+            {
+                //OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
+                XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
+
+                XmlDocument doc = new XmlDocument();
+                doc.Load(reader);
+                foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+                {
+
+                    if (nod.Attributes["name"] != null)
+                    {
+                        AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
+                    }
+
+                }
+
+                reader.Close();
+
+                // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+
+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
+                {
+                    AnimsNames.Add(kp.Value, kp.Key);
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
new file mode 100644
index 0000000..2c81d2a
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
@@ -0,0 +1,90 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    partial class ScenePresence
+    {
+        public class Avatar : IScenePresenceBody
+        {
+            public Avatar()
+            {
+
+            }
+
+            public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
+            {
+            }
+
+            public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+            {
+            }
+
+            public void SendOurAppearance(IClientAPI OurClient)
+            {
+            }
+
+            public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
+            {
+            }
+        }
+
+        public class ChildAgent : IScenePresenceBody //is a ghost
+        {
+            public ChildAgent()
+            {
+
+            }
+
+            public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
+            {
+            }
+
+            public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+            {
+            }
+
+            public void SendOurAppearance(IClientAPI OurClient)
+            {
+            }
+
+            public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
+            {
+            }
+        }
+    }
+
+}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
new file mode 100644
index 0000000..96e5c94
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -0,0 +1,525 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using Axiom.MathLib;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+    public partial class ScenePresence : Entity
+    {
+        public static bool PhysicsEngineFlying = false;
+        public static AvatarAnimations Animations;
+        public static byte[] DefaultTexture;
+        public string firstname;
+        public string lastname;
+        public IClientAPI ControllingClient;
+        public LLUUID current_anim;
+        public int anim_seq;
+        private bool updateflag = false;
+        private byte movementflag = 0;
+        private List<NewForce> forcesList = new List<NewForce>();
+        private short _updateCount = 0;
+        private Axiom.MathLib.Quaternion bodyRot;
+        private LLObject.TextureEntry avatarAppearanceTexture = null;
+        private byte[] visualParams;
+        private AvatarWearable[] Wearables;
+        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
+        private ulong m_regionHandle;
+        private bool childAgent = false;
+        private bool newForce = false;
+        private bool newAvatar = false;
+        private IScenePresenceBody m_body;
+
+        protected RegionInfo m_regionInfo;
+
+        #region Properties
+        /// <summary>
+        /// 
+        /// </summary>
+        public PhysicsActor PhysActor
+        {
+            set
+            {
+                this._physActor = value;
+            }
+            get
+            {
+                return _physActor;
+            }
+        }
+        #endregion
+
+        #region Constructor(s)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="theClient"></param>
+        /// <param name="world"></param>
+        /// <param name="clientThreads"></param>
+        /// <param name="regionDat"></param>
+        public ScenePresence(IClientAPI theClient, Scene world, RegionInfo reginfo)
+        {
+
+            m_world = world;
+            this.uuid = theClient.AgentId;
+
+            m_regionInfo = reginfo;
+            m_regionHandle = reginfo.RegionHandle;
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");
+            ControllingClient = theClient;
+            this.firstname = ControllingClient.FirstName;
+            this.lastname = ControllingClient.LastName;
+            m_localId = m_world.NextLocalId;
+            Pos = ControllingClient.StartPos;
+            visualParams = new byte[218];
+            for (int i = 0; i < 218; i++)
+            {
+                visualParams[i] = 100;
+            }
+
+            Wearables = AvatarWearable.DefaultWearables;
+            
+            this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
+
+            //register for events
+            ControllingClient.OnRequestWearables += this.SendOurAppearance;
+            //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
+            ControllingClient.OnCompleteMovementToRegion += this.CompleteMovement;
+            ControllingClient.OnCompleteMovementToRegion += this.SendInitialData;
+            ControllingClient.OnAgentUpdate += this.HandleAgentUpdate;
+            // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
+            // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
+            //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
+
+        }
+        #endregion
+
+        #region Status Methods
+        /// <summary>
+        /// Not Used, most likely can be deleted
+        /// </summary>
+        /// <param name="status"></param>
+        public void ChildStatusChange(bool status)
+        {
+            this.childAgent = status;
+
+            if (this.childAgent == true)
+            {
+                this.Velocity = new LLVector3(0, 0, 0);
+                this.Pos = new LLVector3(128, 128, 70);
+                
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pos"></param>
+        public void MakeAvatar(LLVector3 pos)
+        {
+            //this.childAvatar = false;
+            this.Pos = pos;
+            this.newAvatar = true;
+            this.childAgent = false;
+        }
+
+        protected void MakeChildAgent()
+        {
+            this.Velocity = new LLVector3(0, 0, 0);
+            this.Pos = new LLVector3(128, 128, 70);
+            this.childAgent = true;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pos"></param>
+        public void Teleport(LLVector3 pos)
+        {
+            this.Pos = pos;
+            this.SendTerseUpdateToALLClients();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void StopMovement()
+        {
+
+        }
+        #endregion
+
+        #region Event Handlers
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="texture"></param>
+        /// <param name="visualParam"></param>
+        public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+        {
+
+        }
+
+        /// <summary>
+        /// Complete Avatar's movement into the region
+        /// </summary>
+        public void CompleteMovement()
+        {
+            LLVector3 look = this.Velocity;
+            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
+            {
+                look = new LLVector3(0.99f, 0.042f, 0);
+            }
+            this.ControllingClient.MoveAgentIntoRegion(m_regionInfo, Pos, look);
+            if (this.childAgent)
+            {
+                this.childAgent = false;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pack"></param>
+        public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
+        {  
+            if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
+            {
+                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+                if (((movementflag & 1) == 0) || (q != this.bodyRot))
+                {
+                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
+                    this.AddNewMovement(v3, q);
+                    movementflag = 1;
+                    this.bodyRot = q;
+                }
+            }
+            else if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
+            {
+                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+                if (((movementflag & 2) == 0) || (q != this.bodyRot))
+                {  
+                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
+                    this.AddNewMovement(v3, q);
+                    movementflag = 2;
+                    this.bodyRot = q;
+                }
+            }
+            else
+            {
+                if ((movementflag) != 0)
+                {
+                    NewForce newVelocity = new NewForce();
+                    newVelocity.X = 0;
+                    newVelocity.Y = 0;
+                    newVelocity.Z = 0;
+                    this.forcesList.Add(newVelocity);
+                    movementflag = 0;
+                }
+            }
+
+        }
+
+        protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation)
+        {
+            NewForce newVelocity = new NewForce();
+            Axiom.MathLib.Vector3 direc = rotation * vec;
+            direc.Normalize();
+
+            direc = direc * ((0.03f) * 128f);
+            if (this._physActor.Flying)
+                direc *= 4;
+
+            newVelocity.X = direc.x;
+            newVelocity.Y = direc.y;
+            newVelocity.Z = direc.z;
+            this.forcesList.Add(newVelocity);
+        }
+
+        #endregion
+
+        #region Overridden Methods
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void LandRenegerated()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void update()
+        {
+            if (this.childAgent == false)
+            {
+                if (this.newForce)
+                {
+                    this.SendTerseUpdateToALLClients();
+                    _updateCount = 0;
+                }
+                else if (movementflag != 0)
+                {
+                    _updateCount++;
+                    if (_updateCount > 3)
+                    {
+                        this.SendTerseUpdateToALLClients();
+                        _updateCount = 0;
+                    }
+                }
+
+                this.CheckForBorderCrossing();
+            }
+        }
+        #endregion
+
+        #region Update Client(s)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="RemoteClient"></param>
+        public void SendTerseUpdateToClient(IClientAPI RemoteClient)
+        {
+            LLVector3 pos = this.Pos;
+            LLVector3 vel = this.Velocity;
+            RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendTerseUpdateToALLClients()
+        {
+            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                this.SendTerseUpdateToClient(avatars[i].ControllingClient);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteAvatar"></param>
+        public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
+        {
+            remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendInitialData()
+        {
+            this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
+            if (this.newAvatar)
+            {
+                this.m_world.InformClientOfNeighbours(this.ControllingClient);
+                this.newAvatar = false;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="OurClient"></param>
+        public void SendOurAppearance(IClientAPI OurClient)
+        {
+            this.ControllingClient.SendWearables(this.Wearables);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="avatarInfo"></param>
+        public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="animID"></param>
+        /// <param name="seq"></param>
+        public void SendAnimPack(LLUUID animID, int seq)
+        {
+
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendAnimPack()
+        {
+
+        }
+        #endregion
+
+        #region Border Crossing Methods
+        /// <summary>
+        /// 
+        /// </summary>
+        protected void CheckForBorderCrossing()
+        {
+            LLVector3 pos2 = this.Pos;
+            LLVector3 vel = this.Velocity;
+
+            float timeStep = 0.2f;
+            pos2.X = pos2.X + (vel.X * timeStep);
+            pos2.Y = pos2.Y + (vel.Y * timeStep);
+            pos2.Z = pos2.Z + (vel.Z * timeStep);
+
+            if ((pos2.X < 0) || (pos2.X > 256))
+            {
+                this.CrossToNewRegion();
+            }
+
+            if ((pos2.Y < 0) || (pos2.Y > 256))
+            {
+                this.CrossToNewRegion();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected void CrossToNewRegion()
+        {
+            LLVector3 pos = this.Pos;
+            LLVector3 newpos = new LLVector3(pos.X, pos.Y, pos.Z);
+            uint neighbourx = this.m_regionInfo.RegionLocX;
+            uint neighboury = this.m_regionInfo.RegionLocY;
+
+            if (pos.X < 2)
+            {
+                neighbourx -= 1;
+                newpos.X = 254;
+            }
+            if (pos.X > 253)
+            {
+                neighbourx += 1;
+                newpos.X = 1;
+            }
+            if (pos.Y < 2)
+            {
+                neighboury -= 1;
+                newpos.Y = 254;
+            }
+            if (pos.Y > 253)
+            {
+                neighboury += 1;
+                newpos.Y = 1;
+            }
+
+            LLVector3 vel = this.velocity;
+            ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * 256), (uint)(neighboury * 256));
+            RegionInfo neighbourRegion = this.m_world.RequestNeighbouringRegionInfo(neighbourHandle);
+            if (neighbourRegion != null)
+            {
+                bool res = this.m_world.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos);
+                if (res)
+                {
+                    this.MakeChildAgent();
+                    this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.CommsIPListenAddr), (ushort)neighbourRegion.CommsIPListenPort);
+                }
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public static void LoadAnims()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void updateMovement()
+        {
+            newForce = false;
+            lock (this.forcesList)
+            {
+                if (this.forcesList.Count > 0)
+                {
+                    for (int i = 0; i < this.forcesList.Count; i++)
+                    {
+                        NewForce force = this.forcesList[i];
+
+                        this.updateflag = true;
+                        this.Velocity = new LLVector3(force.X, force.Y, force.Z);
+                        this.newForce = true;
+                    }
+                    for (int i = 0; i < this.forcesList.Count; i++)
+                    {
+                        this.forcesList.RemoveAt(0);
+                    }
+                }
+            }
+        }
+
+        public static void LoadTextureFile(string name)
+        {
+            FileInfo fInfo = new FileInfo(name);
+            long numBytes = fInfo.Length;
+            FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
+            BinaryReader br = new BinaryReader(fStream);
+            byte[] data1 = br.ReadBytes((int)numBytes);
+            br.Close();
+            fStream.Close();
+            DefaultTexture = data1;
+        }
+
+        public class NewForce
+        {
+            public float X;
+            public float Y;
+            public float Z;
+
+            public NewForce()
+            {
+
+            }
+        }
+    }
+
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
new file mode 100644
index 0000000..eb8a117
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Environment.Scripting
+{
+    public interface IScriptContext
+    {
+        IScriptEntity Entity { get; }
+        bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
new file mode 100644
index 0000000..e813626
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Environment.Scripting
+{
+    public interface IScriptReadonlyEntity
+    {
+        LLVector3 Pos { get; }
+        string Name { get; }
+    }
+    
+    public interface IScriptEntity
+    {
+        LLVector3 Pos { get; set; }
+        string Name { get; }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
new file mode 100644
index 0000000..115b4f4
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
@@ -0,0 +1,126 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Physics.Manager;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
+using Primitive = OpenSim.Region.Environment.Scenes.Primitive;
+
+namespace OpenSim.Region.Environment.Scripting
+{
+    public delegate void ScriptEventHandler(IScriptContext context);
+
+    public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
+    {
+        private Scene m_world;
+        private Script m_script;
+        private Entity m_entity;
+
+        public LLUUID ScriptId
+        {
+            get
+            {
+                return m_script.ScriptId;
+            }
+        }
+
+        public void OnFrame()
+        {
+            m_script.OnFrame(this);
+        }
+
+        public ScriptHandler(Script script, Entity entity, Scene world)
+        {
+            m_script = script;
+            m_entity = entity;
+            m_world = world;
+        }
+
+        #region IScriptContext Members
+
+        IScriptEntity IScriptContext.Entity
+        {
+            get
+            {
+                return this;
+            }
+        }
+
+        bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
+        {
+            foreach (Entity entity in m_world.Entities.Values )
+            {
+                if( entity is Avatar )
+                {
+                    avatar = entity;
+                    return true;
+                }
+            }
+            
+            avatar = null;
+            return false;
+        }
+
+        #endregion
+
+        #region IScriptEntity and IScriptReadonlyEntity Members
+
+        public string Name
+        {
+            get
+            {
+                return m_entity.Name;
+            }
+        }
+
+        public LLVector3 Pos
+        {
+            get
+            {
+                return m_entity.Pos;
+            }
+
+            set
+            {
+                if (m_entity is Primitive)
+                {
+                    Primitive prim = m_entity as Primitive;
+                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
+                   // prim.UpdatePosition( value );
+                }
+            }
+        }
+
+        #endregion
+    }
+
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
new file mode 100644
index 0000000..5d398b0
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Environment.Scripting
+{
+    public class Script
+    {
+        private LLUUID m_scriptId;        
+        public virtual LLUUID ScriptId
+        {
+            get
+            {
+                return m_scriptId;
+            }
+        }
+
+        public Script( LLUUID scriptId )
+        {
+            m_scriptId = scriptId;
+        }
+        
+        public ScriptEventHandler OnFrame;
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
new file mode 100644
index 0000000..0ce65ea
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Environment.Scripting
+{
+    public delegate Script ScriptFactory();
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
new file mode 100644
index 0000000..90c79e3
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
@@ -0,0 +1,64 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Environment.Scripting
+{
+    public class FollowRandomAvatar : Script
+    {
+        public FollowRandomAvatar()
+            : base(LLUUID.Random())
+        {
+            OnFrame += MyOnFrame;
+        }
+
+        private void MyOnFrame(IScriptContext context)
+        {
+            LLVector3 pos = context.Entity.Pos;
+
+            IScriptReadonlyEntity avatar;
+
+            if (context.TryGetRandomAvatar(out avatar))
+            {
+                LLVector3 avatarPos = avatar.Pos;
+
+                float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
+                float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
+
+                LLVector3 newPos = new LLVector3(x, y, pos.Z);
+
+                context.Entity.Pos = newPos;
+            }
+        }
+    }
+
+
+}
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 2eb5ac0..0a82172 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -122,7 +122,7 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj">
+    <ProjectReference Include="..\..\Environment\OpenSim.Region.Environment.csproj">
       <Name>OpenSim.Region.Environment</Name>
       <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenSim/Region/Simulation/Caps.cs b/OpenSim/Region/Simulation/Caps.cs
deleted file mode 100644
index 9edbd54..0000000
--- a/OpenSim/Region/Simulation/Caps.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Xml;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Types;
-using OpenSim.Region.Caches;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment
-{
-    public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
-
-    public class Caps
-    {
-        private string httpListenerAddress;
-        private uint httpListenPort;
-        private string capsObjectPath = "00001-";
-        private string requestPath = "0000/";
-        private string mapLayerPath = "0001/";
-        private string newInventory = "0002/";
-        private string requestTexture = "0003/";
-        private string eventQueue = "0100/";
-        private BaseHttpServer httpListener;
-        private LLUUID agentID;
-        private AssetCache assetCache;
-        private int eventQueueCount = 1;
-        private Queue<string> CapsEventQueue = new Queue<string>();
-
-        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
-        {
-            assetCache = assetCach;
-            capsObjectPath = capsPath;
-            httpListener = httpServer;
-            httpListenerAddress = httpListen;
-            httpListenPort = httpPort;
-            agentID = agent;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void RegisterHandlers()
-        {
-            Console.WriteLine("registering CAPS handlers");
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public string CapsRequest(string request, string path, string param)
-        {
-           // Console.WriteLine("Caps Request " + request);
-            string result = ""; 
-            result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
-            return result;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        protected LLSDCapsDetails GetCapabilities()
-        {
-           /* string capURLS = "";
-            capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>";
-            capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>";
-            //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>";
-            //capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>";
-            return capURLS;*/
-
-            LLSDCapsDetails caps = new LLSDCapsDetails();
-            caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath;
-            caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory;
-            return caps;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public string MapLayer(string request, string path, string param)
-        {
-            Encoding _enc = System.Text.Encoding.UTF8;
-            Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
-            LLSDMapRequest mapReq = new LLSDMapRequest();
-            LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
-
-            LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
-            mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
-            string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
-            
-            //Console.WriteLine(" Maplayer response is " + res);
-          
-            return res;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        protected LLSDMapLayer BuildLLSDMapLayerResponse()
-        {
-            LLSDMapLayer mapLayer = new LLSDMapLayer();
-            mapLayer.Right = 5000;
-            mapLayer.Top = 5000;
-            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
-
-            return mapLayer;
-        }
-
-        public string ProcessEventQueue(string request, string path, string param)
-        {
-            //  Console.WriteLine("event queue request " + request);
-            string res = "";
-            int timer = 0;
-
-            /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
-             {
-                 timer++;
-             }*/
-            if (this.CapsEventQueue.Count > 0)
-            {
-                lock (this.CapsEventQueue)
-                {
-                    string item = CapsEventQueue.Dequeue();
-                    res = item;
-                }
-            }
-            else
-            {
-                res = this.CreateEmptyEventResponse();
-            }
-            return res;
-        }
-
-        public string CreateEstablishAgentComms(string caps, string ipAddressPort)
-        {
-            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
-            res += "<key>events</key><array><map>";
-            res += "<key>message</key><string>EstablishAgentCommunication</string>";
-            res += "<key>body</key><map>";
-            res += "<key>sim-ip-and-port</key><string>" + ipAddressPort + "</string>";
-            res += "<key>seed-capability</key><string>" + caps + "</string>";
-            res += "<key>agent-id</key><uuid>" + this.agentID.ToStringHyphenated() + "</uuid>";
-            res += "</map>";
-            res += "</map></array>";
-            res += "</map></llsd>";
-            eventQueueCount++;
-            this.CapsEventQueue.Enqueue(res);
-            return res;
-        }
-
-        public string CreateEmptyEventResponse()
-        {
-            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
-            res += "<key>events</key><array><map>";
-            res += "</map></array>";
-            res += "</map></llsd>";
-            eventQueueCount++;
-            return res;
-        }
-
-        public string NewAgentInventory(string request, string path, string param)
-        {
-            //Console.WriteLine("received upload request:"+ request);
-            string res = "";
-            LLUUID newAsset = LLUUID.Random();
-            LLUUID newInvItem = LLUUID.Random();
-            string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
-            AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
-            httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
-            string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
-            //Console.WriteLine("uploader url is " + uploaderURL);
-            res += "<llsd><map>";
-            res += "<key>uploader</key><string>" + uploaderURL + "</string>";
-            //res += "<key>success</key><boolean>true</boolean>";
-            res += "<key>state</key><string>upload</string>";
-            res += "</map></llsd>";
-            uploader.OnUpLoad += this.UploadHandler;
-            return res;
-        }
-
-        public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
-        {
-            // Console.WriteLine("upload handler called");
-            AssetBase asset;
-            asset = new AssetBase();
-            asset.FullID = assetID;
-            asset.Type = 0;
-            asset.InvType = 0;
-            asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
-            asset.Data = data;
-            this.assetCache.AddAsset(asset);
-        }
-
-        public class AssetUploader
-        {
-            public event UpLoadedTexture OnUpLoad;
-
-            private string uploaderPath = "";
-            private LLUUID newAssetID;
-            private LLUUID inventoryItemID;
-            private BaseHttpServer httpListener;
-            public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
-            {
-                newAssetID = assetID;
-                inventoryItemID = inventoryItem;
-                uploaderPath = path;
-                httpListener = httpServer;
-
-            }
-
-            public string uploaderCaps(string request, string path, string param)
-            {
-                Encoding _enc = System.Text.Encoding.UTF8;
-                byte[] data = _enc.GetBytes(request);
-                //Console.WriteLine("recieved upload " + Util.FieldToString(data));
-                LLUUID inv = this.inventoryItemID;
-                string res = "";
-                res += "<llsd><map>";
-                res += "<key>new_asset</key><string>" + newAssetID.ToStringHyphenated() + "</string>";
-                res += "<key>new_inventory_item</key><uuid>" + inv.ToStringHyphenated() + "</uuid>";
-                res += "<key>state</key><string>complete</string>";
-                res += "</map></llsd>";
-
-               // Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
-                httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
-                if (OnUpLoad != null)
-                {
-                    OnUpLoad(newAssetID, inv, data);
-                }
-
-                /*FileStream fs = File.Create("upload.jp2");
-                BinaryWriter bw = new BinaryWriter(fs);
-                bw.Write(data);
-                bw.Close();
-                fs.Close();*/
-                return res;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/Simulation/EstateManager.cs b/OpenSim/Region/Simulation/EstateManager.cs
deleted file mode 100644
index c2c1ecf..0000000
--- a/OpenSim/Region/Simulation/EstateManager.cs
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim;
-using libsecondlife;
-using libsecondlife.Packets;
-using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
-
-
-namespace OpenSim.Region.Environment
-{
-
-    /// <summary>
-    /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
-    /// </summary>
-    public class EstateManager
-    {
-        private Scene m_world;
-        private RegionInfo m_regInfo;
-
-        public EstateManager(Scene world,RegionInfo reginfo)
-        {
-            m_world = world; //Estate settings found at world.m_regInfo.estateSettings      
-            m_regInfo = reginfo;
-        }
-
-        private bool convertParamStringToBool(byte[] field)
-        {
-            string s = Helpers.FieldToUTF8String(field);
-            if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true")
-            {
-                return true;
-            }
-            return false;
-        }
-
-        public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, IClientAPI remote_client)
-        {
-            if (remote_client.AgentId == m_regInfo.MasterAvatarAssignedUUID)
-            {
-                switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
-                {
-                    case "getinfo":
-                        Console.WriteLine("GETINFO Requested");
-                        this.sendRegionInfoPacketToAll();
-
-                        break;
-                    case "setregioninfo":
-                        if (packet.ParamList.Length != 9)
-                        {
-                            OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
-                        }
-                        else
-                        {
-                            m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;
-
-                            if (convertParamStringToBool(packet.ParamList[0].Parameter))
-                            {
-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;
-                            }
-
-                            if (convertParamStringToBool(packet.ParamList[1].Parameter))
-                            {
-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;
-                            }
-
-                            if (convertParamStringToBool(packet.ParamList[2].Parameter))
-                            {
-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;
-                            }
-
-                            if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
-                            {
-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;
-                            }
-
-
-                            int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter)));
-                            m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents;
-
-                            float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
-                            m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
-
-                            int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
-                            m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;
-                            
-
-                            if (convertParamStringToBool(packet.ParamList[7].Parameter))
-                            {
-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;
-                            }
-
-                            if (convertParamStringToBool(packet.ParamList[8].Parameter))
-                            {
-                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;
-                            }
-
-                            sendRegionInfoPacketToAll();
-                            
-                        }
-                        break;
-                    case "texturebase":
-                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
-                        {
-                            string s = Helpers.FieldToUTF8String(block.Parameter);
-                            string[] splitField = s.Split(' ');
-                            if (splitField.Length == 2)
-                            {
-                                LLUUID tempUUID = new LLUUID(splitField[1]);
-                                switch (Convert.ToInt16(splitField[0]))
-                                {
-                                    case 0:
-                                        m_regInfo.estateSettings.terrainBase0 = tempUUID;
-                                        break;
-                                    case 1:
-                                        m_regInfo.estateSettings.terrainBase1 = tempUUID;
-                                        break;
-                                    case 2:
-                                        m_regInfo.estateSettings.terrainBase2 = tempUUID;
-                                        break;
-                                    case 3:
-                                        m_regInfo.estateSettings.terrainBase3 = tempUUID;
-                                        break;
-                                }
-                            }
-                        }
-                        break;
-                    case "texturedetail":
-                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
-                        {
-
-                            string s = Helpers.FieldToUTF8String(block.Parameter);
-                            string[] splitField = s.Split(' ');
-                            if (splitField.Length == 2)
-                            {
-                                LLUUID tempUUID = new LLUUID(splitField[1]);
-                                switch (Convert.ToInt16(splitField[0]))
-                                {
-                                    case 0:
-                                        m_regInfo.estateSettings.terrainDetail0 = tempUUID;
-                                        break;
-                                    case 1:
-                                        m_regInfo.estateSettings.terrainDetail1 = tempUUID;
-                                        break;
-                                    case 2:
-                                        m_regInfo.estateSettings.terrainDetail2 = tempUUID;
-                                        break;
-                                    case 3:
-                                        m_regInfo.estateSettings.terrainDetail3 = tempUUID;
-                                        break;
-                                }
-                            }
-                        }
-                        break;
-                    case "textureheights":
-                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
-                        {
-
-                            string s = Helpers.FieldToUTF8String(block.Parameter);
-                            string[] splitField = s.Split(' ');
-                            if (splitField.Length == 3)
-                            {
-
-                                float tempHeightLow = (float)Convert.ToDecimal(splitField[1]);
-                                float tempHeightHigh = (float)Convert.ToDecimal(splitField[2]);
-
-                                switch (Convert.ToInt16(splitField[0]))
-                                {
-                                    case 0:
-                                        m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow;
-                                        m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh;
-                                        break;
-                                    case 1:
-                                        m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow;
-                                        m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh;
-                                        break;
-                                    case 2:
-                                        m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow;
-                                        m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh;
-                                        break;
-                                    case 3:
-                                        m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow;
-                                        m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh;
-                                        break;
-                                }
-                            }
-                        }
-                        break;
-                    case "texturecommit":
-                        sendRegionHandshakeToAll();
-                        break;
-                    case "setregionterrain":
-                        if (packet.ParamList.Length != 9)
-                        {
-                            OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
-                        }
-                        else
-                        {
-                            m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter));
-                            m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter));
-                            m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter));
-                            m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter);
-                            m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
-
-                            sendRegionInfoPacketToAll();
-                        }
-                        break;
-                    default:
-                        OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
-                        break;
-                }
-            }
-        }
-
-        public void sendRegionInfoPacketToAll()
-        {
-             List<Avatar> avatars = m_world.RequestAvatarList();
-
-             for (int i = 0; i < avatars.Count; i++)
-             {
-                 this.sendRegionInfoPacket(avatars[i].ControllingClient);
-             }
-        }
-
-        public void sendRegionHandshakeToAll()
-        {
-            List<Avatar> avatars = m_world.RequestAvatarList();
-
-            for (int i = 0; i < avatars.Count; i++)
-            {
-                this.sendRegionHandshake(avatars[i].ControllingClient);
-            }         
-        }
-
-        public void sendRegionInfoPacket(IClientAPI remote_client)
-        {
-            Encoding _enc = System.Text.Encoding.ASCII;
-
-            AgentCircuitData circuitData = remote_client.RequestClientInfo();
-
-            RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
-            regionInfoPacket.AgentData.AgentID = circuitData.AgentID;
-            regionInfoPacket.AgentData.SessionID = circuitData.SessionID;
-            regionInfoPacket.RegionInfo.BillableFactor = m_regInfo.estateSettings.billableFactor;
-            regionInfoPacket.RegionInfo.EstateID = m_regInfo.estateSettings.estateID;
-            regionInfoPacket.RegionInfo.MaxAgents = m_regInfo.estateSettings.maxAgents;
-            regionInfoPacket.RegionInfo.ObjectBonusFactor = m_regInfo.estateSettings.objectBonusFactor;
-            regionInfoPacket.RegionInfo.ParentEstateID = m_regInfo.estateSettings.parentEstateID;
-            regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.estateSettings.pricePerMeter;
-            regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.estateSettings.redirectGridX;
-            regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.estateSettings.redirectGridY;
-            regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags;
-            regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess;
-            regionInfoPacket.RegionInfo.SimName = _enc.GetBytes( m_regInfo.RegionName);
-            regionInfoPacket.RegionInfo.SunHour = m_regInfo.estateSettings.sunHour;
-            regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.estateSettings.terrainLowerLimit;
-            regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.estateSettings.terrainRaiseLimit;
-            regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.estateSettings.useFixedSun;
-            regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.estateSettings.waterHeight;
-
-            remote_client.OutPacket(regionInfoPacket);
-        }
-
-        public void sendRegionHandshake(IClientAPI remoteClient)
-        {
-            remoteClient.SendRegionHandshake(m_regInfo);
-        }
-
-    }
-}
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
deleted file mode 100644
index 3f8b60d..0000000
--- a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
+++ /dev/null
@@ -1,211 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DCBA491C-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Region.Environment</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Region.Environment</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll" >
-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="XMLRPC.dll" >
-      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
-      <Name>OpenSim.Framework.Communications</Name>
-      <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenSim.Framework.Console</Name>
-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
-      <Name>OpenSim.Framework.GenericConfig.Xml</Name>
-      <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
-      <Name>OpenSim.Framework.Servers</Name>
-      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
-      <Name>OpenSim.Region.Caches</Name>
-      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
-      <Name>OpenSim.Region.Physics.Manager</Name>
-      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
-      <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
-      <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="RegionManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="EstateManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParcelManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Caps.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Entity.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Scene.Scripting.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\SceneEvents.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\ScenePresence.Animations.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Scene.PacketHandlers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\SceneObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Primitive.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\Scene.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\IScriptHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\ScriptFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\IScriptContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\Script.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\IScriptEntity.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim/Region/Simulation/ParcelManager.cs b/OpenSim/Region/Simulation/ParcelManager.cs
deleted file mode 100644
index 1cab4ab..0000000
--- a/OpenSim/Region/Simulation/ParcelManager.cs
+++ /dev/null
@@ -1,892 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Region.Environment.Scenes;
-using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
-
-namespace OpenSim.Region.Environment
-{
-
-
-    #region ParcelManager Class
-    /// <summary>
-    /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
-    /// </summary>
-    public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver
-    {
-
-        #region Constants
-        //Parcel types set with flags in ParcelOverlay.
-        //Only one of these can be used. 
-        public const byte PARCEL_TYPE_PUBLIC = (byte)0;      //Equals 00000000
-        public const byte PARCEL_TYPE_OWNED_BY_OTHER = (byte)1;      //Equals 00000001
-        public const byte PARCEL_TYPE_OWNED_BY_GROUP = (byte)2;      //Equals 00000010
-        public const byte PARCEL_TYPE_OWNED_BY_REQUESTER = (byte)3;      //Equals 00000011
-        public const byte PARCEL_TYPE_IS_FOR_SALE = (byte)4;      //Equals 00000100
-        public const byte PARCEL_TYPE_IS_BEING_AUCTIONED = (byte)5;      //Equals 00000101
-
-
-        //Flags that when set, a border on the given side will be placed
-        //NOTE: North and East is assumable by the west and south sides (if parcel to east has a west border, then I have an east border; etc)
-        //This took forever to figure out -- jeesh. /blame LL for even having to send these
-        public const byte PARCEL_FLAG_PROPERTY_BORDER_WEST = (byte)64;     //Equals 01000000
-        public const byte PARCEL_FLAG_PROPERTY_BORDER_SOUTH = (byte)128;    //Equals 10000000
-
-        //RequestResults (I think these are right, they seem to work):
-        public const int PARCEL_RESULT_ONE_PARCEL = 0;	// The request they made contained only one parcel
-        public const int PARCEL_RESULT_MULTIPLE_PARCELS = 1;	// The request they made contained more than one parcel
-
-        //These are other constants. Yay!
-        public const int START_PARCEL_LOCAL_ID = 1;
-        #endregion
-
-        #region Member Variables
-        public Dictionary<int, Parcel> parcelList = new Dictionary<int, Parcel>();
-        private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
-        private int[,] parcelIDList = new int[64, 64];
-
-        private Scene m_world;
-        private RegionInfo m_regInfo;
-
-        #endregion
-
-        #region Constructors
-        public ParcelManager(Scene world, RegionInfo reginfo)
-        {
-
-            m_world = world;
-            m_regInfo = reginfo;
-            parcelIDList.Initialize();
-
-        }
-        #endregion
-
-        #region Member Functions
-
-        #region Parcel From Storage Functions
-        public void ParcelFromStorage(ParcelData data)
-        {
-            Parcel new_parcel = new Parcel(data.ownerID, data.isGroupOwned, m_world);
-            new_parcel.parcelData = data.Copy();
-            new_parcel.setParcelBitmapFromByteArray();
-            addParcel(new_parcel);
-
-        }
-
-        public void NoParcelDataFromStorage()
-        {
-            resetSimParcels();
-        }
-        #endregion
-
-        #region Parcel Add/Remove/Get/Create
-        /// <summary>
-        /// Creates a basic Parcel object without an owner (a zeroed key)
-        /// </summary>
-        /// <returns></returns>
-        public Parcel createBaseParcel()
-        {
-            return new Parcel(new LLUUID(), false, m_world);
-        }
-
-        /// <summary>
-        /// Adds a parcel to the stored list and adds them to the parcelIDList to what they own
-        /// </summary>
-        /// <param name="new_parcel">The parcel being added</param>
-        public void addParcel(Parcel new_parcel)
-        {
-            lastParcelLocalID++;
-            new_parcel.parcelData.localID = lastParcelLocalID;
-            parcelList.Add(lastParcelLocalID, new_parcel.Copy());
-
-
-            bool[,] parcelBitmap = new_parcel.getParcelBitmap();
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (parcelBitmap[x, y])
-                    {
-                        parcelIDList[x, y] = lastParcelLocalID;
-                    }
-                }
-            }
-            parcelList[lastParcelLocalID].forceUpdateParcelInfo();
-
-
-        }
-        /// <summary>
-        /// Removes a parcel from the list. Will not remove if local_id is still owning an area in parcelIDList
-        /// </summary>
-        /// <param name="local_id">Parcel.localID of the parcel to remove.</param>
-        public void removeParcel(int local_id)
-        {
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (parcelIDList[x, y] == local_id)
-                    {
-                        throw new Exception("Could not remove parcel. Still being used at " + x + ", " + y);
-                    }
-                }
-            }
-            m_world.localStorage.RemoveParcel(parcelList[local_id].parcelData);
-            parcelList.Remove(local_id);
-        }
-
-        private void performFinalParcelJoin(Parcel master, Parcel slave)
-        {
-            int x, y;
-            bool[,] parcelBitmapSlave = slave.getParcelBitmap();
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (parcelBitmapSlave[x, y])
-                    {
-                        parcelIDList[x, y] = master.parcelData.localID;
-                    }
-                }
-            }
-            removeParcel(slave.parcelData.localID);
-        }
-        /// <summary>
-        /// Get the parcel at the specified point
-        /// </summary>
-        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
-        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
-        /// <returns>Parcel at the point supplied</returns>
-        public Parcel getParcel(int x, int y)
-        {
-            if (x > 256 || y > 256 || x < 0 || y < 0)
-            {
-                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
-            }
-            else
-            {
-                return parcelList[parcelIDList[x / 4, y / 4]];
-            }
-
-        }
-        #endregion
-
-        #region Parcel Modification
-        /// <summary>
-        /// Subdivides a parcel
-        /// </summary>
-        /// <param name="start_x">West Point</param>
-        /// <param name="start_y">South Point</param>
-        /// <param name="end_x">East Point</param>
-        /// <param name="end_y">North Point</param>
-        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
-        /// <returns>Returns true if successful</returns>
-        private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
-        {
-            //First, lets loop through the points and make sure they are all in the same parcel
-            //Get the parcel at start
-            Parcel startParcel = getParcel(start_x, start_y);
-            if (startParcel == null) return false; //No such parcel at the beginning
-
-            //Loop through the points
-            try
-            {
-                int totalX = end_x - start_x;
-                int totalY = end_y - start_y;
-                int x, y;
-                for (y = 0; y < totalY; y++)
-                {
-                    for (x = 0; x < totalX; x++)
-                    {
-                        Parcel tempParcel = getParcel(start_x + x, start_y + y);
-                        if (tempParcel == null) return false; //No such parcel at that point
-                        if (tempParcel != startParcel) return false; //Subdividing over 2 parcels; no-no
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                return false; //Exception. For now, lets skip subdivision
-            }
-
-            //If we are still here, then they are subdividing within one parcel
-            //Check owner
-            if (startParcel.parcelData.ownerID != attempting_user_id)
-            {
-                return false; //They cant do this!
-            }
-
-            //Lets create a new parcel with bitmap activated at that point (keeping the old parcels info)
-            Parcel newParcel = startParcel.Copy();
-            newParcel.parcelData.parcelName = "Subdivision of " + newParcel.parcelData.parcelName;
-            newParcel.parcelData.globalID = LLUUID.Random();
-
-            newParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(start_x, start_y, end_x, end_y));
-
-            //Now, lets set the subdivision area of the original to false
-            int startParcelIndex = startParcel.parcelData.localID;
-            parcelList[startParcelIndex].setParcelBitmap(Parcel.modifyParcelBitmapSquare(startParcel.getParcelBitmap(), start_x, start_y, end_x, end_y, false));
-            parcelList[startParcelIndex].forceUpdateParcelInfo();
-
-
-            //Now add the new parcel
-            addParcel(newParcel);
-
-
-
-
-
-            return true;
-        }
-        /// <summary>
-        /// Join 2 parcels together
-        /// </summary>
-        /// <param name="start_x">x value in first parcel</param>
-        /// <param name="start_y">y value in first parcel</param>
-        /// <param name="end_x">x value in second parcel</param>
-        /// <param name="end_y">y value in second parcel</param>
-        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the parcels</param>
-        /// <returns>Returns true if successful</returns>
-        private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
-        {
-            end_x -= 4;
-            end_y -= 4;
-
-            //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
-            //This should be fixed later -- somewhat "incomplete code" --Ming
-            Parcel startParcel, endParcel;
-
-            try
-            {
-                startParcel = getParcel(start_x, start_y);
-                endParcel = getParcel(end_x, end_y);
-            }
-            catch (Exception)
-            {
-                return false; //Error occured when trying to get the start and end parcels
-            }
-            if (startParcel == endParcel)
-            {
-                return false; //Subdivision of the same parcel is not allowed
-            }
-
-            //Check the parcel owners:
-            if (startParcel.parcelData.ownerID != endParcel.parcelData.ownerID)
-            {
-                return false;
-            }
-            if (startParcel.parcelData.ownerID != attempting_user_id)
-            {
-                //TODO: Group editing stuff. Avatar owner support for now
-                return false;
-            }
-
-            //Same owners! Lets join them
-            //Merge them to startParcel
-            parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
-            performFinalParcelJoin(startParcel, endParcel);
-
-            return true;
-
-
-
-        }
-        #endregion
-
-        #region Parcel Updating
-        /// <summary>
-        /// Where we send the ParcelOverlay packet to the client
-        /// </summary>
-        /// <param name="remote_client">The object representing the client</param>
-        public void sendParcelOverlay(IClientAPI remote_client)
-        {
-            const int PARCEL_BLOCKS_PER_PACKET = 1024;
-            int x, y = 0;
-            byte[] byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
-            int byteArrayCount = 0;
-            int sequenceID = 0;
-            ParcelOverlayPacket packet;
-
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    byte tempByte = (byte)0; //This represents the byte for the current 4x4
-                    Parcel currentParcelBlock = getParcel(x * 4, y * 4);
-
-                    if (currentParcelBlock.parcelData.ownerID == remote_client.AgentId)
-                    {
-                        //Owner Flag
-                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_REQUESTER);
-                    }
-                    else if (currentParcelBlock.parcelData.salePrice > 0 && (currentParcelBlock.parcelData.authBuyerID == LLUUID.Zero || currentParcelBlock.parcelData.authBuyerID == remote_client.AgentId))
-                    {
-                        //Sale Flag
-                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);
-                    }
-                    else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)
-                    {
-                        //Public Flag
-                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
-                    }
-                    else
-                    {
-                        //Other Flag
-                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_OTHER);
-                    }
-
-
-                    //Now for border control
-                    if (x == 0)
-                    {
-                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
-                    }
-                    else if (getParcel((x - 1) * 4, y * 4) != currentParcelBlock)
-                    {
-                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
-                    }
-
-                    if (y == 0)
-                    {
-                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
-                    }
-                    else if (getParcel(x * 4, (y - 1) * 4) != currentParcelBlock)
-                    {
-                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
-                    }
-
-                    byteArray[byteArrayCount] = tempByte;
-                    byteArrayCount++;
-                    if (byteArrayCount >= PARCEL_BLOCKS_PER_PACKET)
-                    {
-                        byteArrayCount = 0;
-                        packet = new ParcelOverlayPacket();
-                        packet.ParcelData.Data = byteArray;
-                        packet.ParcelData.SequenceID = sequenceID;
-                        remote_client.OutPacket((Packet)packet);
-                        sequenceID++;
-                        byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
-                    }
-                }
-            }
-
-            packet = new ParcelOverlayPacket();
-            packet.ParcelData.Data = byteArray;
-            packet.ParcelData.SequenceID = sequenceID; //Eh?
-            remote_client.OutPacket((Packet)packet);
-        }
-
-        public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)
-        {
-            //Get the parcels within the bounds
-            List<Parcel> temp = new List<Parcel>();
-            int x, y, i;
-            int inc_x = end_x - start_x;
-            int inc_y = end_y - start_y;
-            for (x = 0; x < inc_x; x++)
-            {
-                for (y = 0; y < inc_y; y++)
-                {
-                    OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);
-                    if (!temp.Contains(currentParcel))
-                    {
-                        currentParcel.forceUpdateParcelInfo();
-                        temp.Add(currentParcel);
-                    }
-                }
-            }
-
-            int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL;
-            if (temp.Count > 1)
-            {
-                requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;
-            }
-
-            for (i = 0; i < temp.Count; i++)
-            {
-                temp[i].sendParcelProperties(sequence_id, snap_selection, requestResult, remote_client);
-            }
-
-
-            sendParcelOverlay(remote_client);
-        }
-
-        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
-        {
-            if (parcelList.ContainsKey(packet.ParcelData.LocalID))
-            {
-                parcelList[packet.ParcelData.LocalID].updateParcelProperties(packet, remote_client);
-            }
-        }
-        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
-        {
-            subdivide(west, south, east, north, remote_client.AgentId);
-        }
-        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
-        {
-            join(west, south, east, north, remote_client.AgentId);
-
-        }
-        #endregion
-
-        /// <summary>
-        /// Resets the sim to the default parcel (full sim parcel owned by the default user)
-        /// </summary>
-        public void resetSimParcels()
-        {
-            //Remove all the parcels in the sim and add a blank, full sim parcel set to public
-            parcelList.Clear();
-            lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
-            parcelIDList.Initialize();
-
-            Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world);
-
-            fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
-            fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
-            fullSimParcel.parcelData.parcelDesc = "";
-
-            fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
-            fullSimParcel.parcelData.salePrice = 1;
-            fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
-            fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
-
-            addParcel(fullSimParcel);
-
-        }
-        #endregion
-    }
-    #endregion
-
-
-    #region Parcel Class
-    /// <summary>
-    /// Keeps track of a specific parcel's information
-    /// </summary>
-    public class Parcel
-    {
-        #region Member Variables
-        public ParcelData parcelData = new ParcelData();
-        public Scene m_world;
-
-        private bool[,] parcelBitmap = new bool[64, 64];
-
-        #endregion
-
-
-        #region Constructors
-        public Parcel(LLUUID owner_id, bool is_group_owned, Scene world)
-        {
-            m_world = world;
-            parcelData.ownerID = owner_id;
-            parcelData.isGroupOwned = is_group_owned;
-
-        }
-        #endregion
-
-
-        #region Member Functions
-
-        #region General Functions
-        /// <summary>
-        /// Checks to see if this parcel contains a point
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns>Returns true if the parcel contains the specified point</returns>
-        public bool containsPoint(int x, int y)
-        {
-            if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
-            {
-                return (parcelBitmap[x / 4, y / 4] == true);
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        public Parcel Copy()
-        {
-            Parcel newParcel = new Parcel(this.parcelData.ownerID, this.parcelData.isGroupOwned, m_world);
-
-            //Place all new variables here!
-            newParcel.parcelBitmap = (bool[,])(this.parcelBitmap.Clone());
-            newParcel.parcelData = parcelData.Copy();
-
-            return newParcel;
-        }
-
-        #endregion
-
-
-        #region Packet Request Handling
-        /// <summary>
-        /// Sends parcel properties as requested
-        /// </summary>
-        /// <param name="sequence_id">ID sent by client for them to keep track of</param>
-        /// <param name="snap_selection">Bool sent by client for them to use</param>
-        /// <param name="remote_client">Object representing the client</param>
-        public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
-        {
-
-            ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();
-            updatePacket.ParcelData.AABBMax = parcelData.AABBMax;
-            updatePacket.ParcelData.AABBMin = parcelData.AABBMin;
-            updatePacket.ParcelData.Area = parcelData.area;
-            updatePacket.ParcelData.AuctionID = parcelData.auctionID;
-            updatePacket.ParcelData.AuthBuyerID = parcelData.authBuyerID; //unemplemented
-
-            updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
-
-            updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);
-            updatePacket.ParcelData.Category = (byte)parcelData.category;
-            updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
-            updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
-            updatePacket.ParcelData.GroupID = parcelData.groupID;
-            updatePacket.ParcelData.GroupPrims = parcelData.groupPrims;
-            updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;
-            updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;
-            updatePacket.ParcelData.LocalID = parcelData.localID;
-            updatePacket.ParcelData.MaxPrims = 1000; //unemplemented
-            updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;
-            updatePacket.ParcelData.MediaID = parcelData.mediaID;
-            updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);
-            updatePacket.ParcelData.MusicURL = Helpers.StringToField(parcelData.musicURL);
-            updatePacket.ParcelData.Name = Helpers.StringToField(parcelData.parcelName);
-            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
-            updatePacket.ParcelData.OtherCount = 0; //unemplemented
-            updatePacket.ParcelData.OtherPrims = 0; //unemplented
-            updatePacket.ParcelData.OwnerID = parcelData.ownerID;
-            updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
-            updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented
-            updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented
-            updatePacket.ParcelData.PassHours = parcelData.passHours;
-            updatePacket.ParcelData.PassPrice = parcelData.passPrice;
-            updatePacket.ParcelData.PublicCount = 0; //unemplemented
-            updatePacket.ParcelData.RegionDenyAnonymous = false; //unemplemented
-            updatePacket.ParcelData.RegionDenyIdentified = false; //unemplemented
-            updatePacket.ParcelData.RegionDenyTransacted = false; //unemplemented
-            updatePacket.ParcelData.RegionPushOverride = true; //unemplemented
-            updatePacket.ParcelData.RentPrice = 0; //??
-            updatePacket.ParcelData.RequestResult = request_result;
-            updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented
-            updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented
-            updatePacket.ParcelData.SelfCount = 0;//unemplemented
-            updatePacket.ParcelData.SequenceID = sequence_id;
-            updatePacket.ParcelData.SimWideMaxPrims = 15000; //unemplemented
-            updatePacket.ParcelData.SimWideTotalPrims = 0; //unemplemented
-            updatePacket.ParcelData.SnapSelection = snap_selection;
-            updatePacket.ParcelData.SnapshotID = parcelData.snapshotID;
-            updatePacket.ParcelData.Status = (byte)parcelData.parcelStatus;
-            updatePacket.ParcelData.TotalPrims = 0; //unemplemented
-            updatePacket.ParcelData.UserLocation = parcelData.userLocation;
-            updatePacket.ParcelData.UserLookAt = parcelData.userLookAt;
-            remote_client.OutPacket((Packet)updatePacket);
-        }
-
-        public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
-        {
-            if (remote_client.AgentId == parcelData.ownerID)
-            {
-                //Needs later group support
-                parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
-                parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
-                parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
-                parcelData.groupID = packet.ParcelData.GroupID;
-                parcelData.landingType = packet.ParcelData.LandingType;
-                parcelData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
-                parcelData.mediaID = packet.ParcelData.MediaID;
-                parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
-                parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
-                parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);
-                parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
-                parcelData.passHours = packet.ParcelData.PassHours;
-                parcelData.passPrice = packet.ParcelData.PassPrice;
-                parcelData.salePrice = packet.ParcelData.SalePrice;
-                parcelData.snapshotID = packet.ParcelData.SnapshotID;
-                parcelData.userLocation = packet.ParcelData.UserLocation;
-                parcelData.userLookAt = packet.ParcelData.UserLookAt;
-
-                List<Avatar> avatars = m_world.RequestAvatarList();
-
-                for (int i = 0; i < avatars.Count; i++)
-                {
-                    Parcel over = m_world.parcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));
-                    if (over == this)
-                    {
-                        sendParcelProperties(0, false, 0, avatars[i].ControllingClient);
-                    }
-                }
-
-            }
-        }
-        #endregion
-
-
-        #region Update Functions
-        /// <summary>
-        /// Updates the AABBMin and AABBMax values after area/shape modification of parcel
-        /// </summary>
-        private void updateAABBAndAreaValues()
-        {
-            int min_x = 64;
-            int min_y = 64;
-            int max_x = 0;
-            int max_y = 0;
-            int tempArea = 0;
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (parcelBitmap[x, y] == true)
-                    {
-                        if (min_x > x) min_x = x;
-                        if (min_y > y) min_y = y;
-                        if (max_x < x) max_x = x;
-                        if (max_y < y) max_y = y;
-                        tempArea += 16; //16sqm parcel
-                    }
-                }
-            }
-            parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);
-            parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);
-            parcelData.area = tempArea;
-        }
-
-        public void updateParcelBitmapByteArray()
-        {
-            parcelData.parcelBitmapByteArray = convertParcelBitmapToBytes();
-        }
-
-        /// <summary>
-        /// Update all settings in parcel such as area, bitmap byte array, etc
-        /// </summary>
-        public void forceUpdateParcelInfo()
-        {
-            this.updateAABBAndAreaValues();
-            this.updateParcelBitmapByteArray();
-        }
-
-        public void setParcelBitmapFromByteArray()
-        {
-            parcelBitmap = convertBytesToParcelBitmap();
-        }
-        #endregion
-
-
-        #region Parcel Bitmap Functions
-        /// <summary>
-        /// Sets the parcel's bitmap manually
-        /// </summary>
-        /// <param name="bitmap">64x64 block representing where this parcel is on a map</param>
-        public void setParcelBitmap(bool[,] bitmap)
-        {
-            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap");
-            }
-            else
-            {
-                //Valid: Lets set it
-                parcelBitmap = bitmap;
-                forceUpdateParcelInfo();
-
-            }
-        }
-        /// <summary>
-        /// Gets the parcels bitmap manually
-        /// </summary>
-        /// <returns></returns>
-        public bool[,] getParcelBitmap()
-        {
-            return parcelBitmap;
-        }
-        /// <summary>
-        /// Converts the parcel bitmap to a packet friendly byte array
-        /// </summary>
-        /// <returns></returns>
-        private byte[] convertParcelBitmapToBytes()
-        {
-            byte[] tempConvertArr = new byte[512];
-            byte tempByte = 0;
-            int x, y, i, byteNum = 0;
-            i = 0;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(parcelBitmap[x, y]) << (i++ % 8));
-                    if (i % 8 == 0)
-                    {
-                        tempConvertArr[byteNum] = tempByte;
-                        tempByte = (byte)0;
-                        i = 0;
-                        byteNum++;
-                    }
-                }
-            }
-            return tempConvertArr;
-        }
-
-        private bool[,] convertBytesToParcelBitmap()
-        {
-            bool[,] tempConvertMap = new bool[64, 64];
-            tempConvertMap.Initialize();
-            byte tempByte = 0;
-            int x = 0, y = 0, i = 0, bitNum = 0;
-            for (i = 0; i < 512; i++)
-            {
-                tempByte = parcelData.parcelBitmapByteArray[i];
-                for (bitNum = 0; bitNum < 8; bitNum++)
-                {
-                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);
-                    tempConvertMap[x, y] = bit;
-                    x++;
-                    if (x > 63)
-                    {
-                        x = 0;
-                        y++;
-                    }
-
-                }
-
-            }
-            return tempConvertMap;
-        }
-        /// <summary>
-        /// Full sim parcel creation
-        /// </summary>
-        /// <returns></returns>
-        public static bool[,] basicFullRegionParcelBitmap()
-        {
-            return getSquareParcelBitmap(0, 0, 256, 256);
-        }
-
-        /// <summary>
-        /// Used to modify the bitmap between the x and y points. Points use 64 scale
-        /// </summary>
-        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
-        /// <returns></returns>
-        public static bool[,] getSquareParcelBitmap(int start_x, int start_y, int end_x, int end_y)
-        {
-
-            bool[,] tempBitmap = new bool[64, 64];
-            tempBitmap.Initialize();
-
-            tempBitmap = modifyParcelBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
-            return tempBitmap;
-        }
-
-        /// <summary>
-        /// Change a parcel's bitmap at within a square and set those points to a specific value
-        /// </summary>
-        /// <param name="parcel_bitmap"></param>
-        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
-        /// <param name="set_value"></param>
-        /// <returns></returns>
-        public static bool[,] modifyParcelBitmapSquare(bool[,] parcel_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)
-        {
-            if (parcel_bitmap.GetLength(0) != 64 || parcel_bitmap.GetLength(1) != 64 || parcel_bitmap.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap in modifyParcelBitmapSquare()");
-            }
-
-            int x, y;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    if (x >= start_x / 4 && x < end_x / 4
-                        && y >= start_y / 4 && y < end_y / 4)
-                    {
-                        parcel_bitmap[x, y] = set_value;
-                    }
-                }
-            }
-            return parcel_bitmap;
-        }
-        /// <summary>
-        /// Join the true values of 2 bitmaps together
-        /// </summary>
-        /// <param name="bitmap_base"></param>
-        /// <param name="bitmap_add"></param>
-        /// <returns></returns>
-        public static bool[,] mergeParcelBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
-        {
-            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeParcelBitmaps");
-            }
-            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeParcelBitmaps");
-
-            }
-
-            int x, y;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    if (bitmap_add[x, y])
-                    {
-                        bitmap_base[x, y] = true;
-                    }
-                }
-            }
-            return bitmap_base;
-        }
-        #endregion
-
-        #endregion
-
-
-    }
-    #endregion
-
-
-}
diff --git a/OpenSim/Region/Simulation/RegionManager.cs b/OpenSim/Region/Simulation/RegionManager.cs
deleted file mode 100644
index 17d9aad..0000000
--- a/OpenSim/Region/Simulation/RegionManager.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Servers;
-
-namespace OpenSim.Region.Environment
-{
-    public class RegionManager //needs renaming , but first we need to rename the namespace
-    {
-        protected AuthenticateSessionsBase authenticateHandler;
-        protected RegionCommsListener regionCommsHost;
-        protected CommunicationsManager commsManager;
-        protected List<Caps> capsHandlers = new List<Caps>();
-        protected BaseHttpServer httpListener;
-
-        protected Scenes.Scene m_Scene;
-
-        public ParcelManager parcelManager;
-        public EstateManager estateManager;
-
-        public RegionManager()
-        {
-
-        }
-
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/Entity.cs b/OpenSim/Region/Simulation/Scenes/Entity.cs
deleted file mode 100644
index bbba34d..0000000
--- a/OpenSim/Region/Simulation/Scenes/Entity.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Axiom.MathLib;
-using OpenSim.Physics.Manager;
-using libsecondlife;
-using OpenSim.Region.Environment.Scripting;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public abstract class Entity : IScriptReadonlyEntity
-    {
-        public libsecondlife.LLUUID uuid;
-        public Quaternion rotation;
-        protected List<Entity> children;
-        
-        protected PhysicsActor _physActor;
-        protected Scene m_world;
-        protected string m_name;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual string Name
-        {
-            get { return m_name; }
-        }
-
-        protected LLVector3 m_pos;
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual LLVector3 Pos
-        {
-            get
-            {
-                if (this._physActor != null)
-                {
-                    m_pos.X = _physActor.Position.X;
-                    m_pos.Y = _physActor.Position.Y;
-                    m_pos.Z = _physActor.Position.Z;
-                }
-
-                return m_pos;
-            }
-            set
-            {
-                if (this._physActor != null)
-                {
-                    try
-                    {
-                        lock (this.m_world.SyncRoot)
-                        {
-
-                            this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e.Message);
-                    }
-                }
-
-                m_pos = value;
-            }
-        }
-
-        public LLVector3 velocity;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual LLVector3 Velocity
-        {
-            get
-            {
-                if (this._physActor != null)
-                {
-                    velocity.X = _physActor.Velocity.X;
-                    velocity.Y = _physActor.Velocity.Y;
-                    velocity.Z = _physActor.Velocity.Z;
-                }
-
-                return velocity;
-            }
-            set
-            {
-                if (this._physActor != null)
-                {
-                    try
-                    {
-                        lock (this.m_world.SyncRoot)
-                        {
-
-                            this._physActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e.Message);
-                    }
-                }
-
-                velocity = value;
-            }
-        }
-
-        protected uint m_localId;
-
-        public uint LocalId
-        {
-            get { return m_localId; }
-        }
-
-        /// <summary>
-        /// Creates a new Entity (should not occur on it's own)
-        /// </summary>
-        public Entity()
-        {
-            uuid = new libsecondlife.LLUUID();
-
-            m_pos = new LLVector3();
-            velocity = new LLVector3();
-            rotation = new Quaternion();
-            m_name = "(basic entity)";
-            children = new List<Entity>();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual void updateMovement()
-        {
-        	foreach (Entity child in children)
-            {
-                child.updateMovement();
-            }
-        }
-
-        /// <summary>
-        /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
-        /// </summary>
-        public virtual void update() {
-            // Do any per-frame updates needed that are applicable to every type of entity
-            foreach (Entity child in children)
-            {
-                child.update();
-            }
-        }
-
-        /// <summary>
-        /// Called at a set interval to inform entities that they should back themsleves up to the DB 
-        /// </summary>
-        public virtual void BackUp()
-        {
-        	
-        }
-
-        /// <summary>
-        /// Infoms the entity that the land (heightmap) has changed
-        /// </summary>
-        public virtual void LandRenegerated()
-        {
-
-        }
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
deleted file mode 100644
index 36023d0..0000000
--- a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public interface IScenePresenceBody
-    {
-        void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
-        void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
-        void SendOurAppearance(IClientAPI OurClient);
-        void SendAppearanceToOtherAgent(ScenePresence avatarInfo);
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/Primitive.cs b/OpenSim/Region/Simulation/Scenes/Primitive.cs
deleted file mode 100644
index 0f649b2..0000000
--- a/OpenSim/Region/Simulation/Scenes/Primitive.cs
+++ /dev/null
@@ -1,582 +0,0 @@
-
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public class Primitive : Entity
-    {
-        internal PrimData primData;
-        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
-       // private Dictionary<uint, IClientAPI> m_clientThreads;
-        private ulong m_regionHandle;
-        private const uint FULL_MASK_PERMISSIONS = 2147483647;
-        private bool physicsEnabled = false;
-        private byte updateFlag = 0;
-        private uint flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
-
-        private Dictionary<LLUUID, InventoryItem> inventoryItems;
-
-        #region Properties
-
-        public LLVector3 Scale
-        {
-            set
-            {
-                this.primData.Scale = value;
-                //this.dirtyFlag = true;
-            }
-            get
-            {
-                return this.primData.Scale;
-            }
-        }
-
-        public PhysicsActor PhysActor
-        {
-            set
-            {
-                this._physActor = value;
-            }
-        }
-
-        public override LLVector3 Pos
-        {
-            get
-            {
-                return base.Pos;
-            }
-            set
-            {
-                base.Pos = value;
-            }
-        }
-        #endregion
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="clientThreads"></param>
-        /// <param name="regionHandle"></param>
-        /// <param name="world"></param>
-        public Primitive( ulong regionHandle, Scene world)
-        {
-           // m_clientThreads = clientThreads;
-            m_regionHandle = regionHandle;
-            m_world = world;
-            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="world"></param>
-        /// <param name="addPacket"></param>
-        /// <param name="ownerID"></param>
-        /// <param name="localID"></param>
-        public Primitive(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
-        {
-            // m_clientThreads = clientThreads;
-            m_regionHandle = regionHandle;
-            m_world = world;
-            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
-            this.CreateFromPacket(addPacket, ownerID, localID);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="clientThreads"></param>
-        /// <param name="regionHandle"></param>
-        /// <param name="world"></param>
-        /// <param name="owner"></param>
-        /// <param name="fullID"></param>
-        /// <param name="localID"></param>
-        public Primitive( ulong regionHandle, Scene world, LLUUID owner, LLUUID fullID, uint localID)
-        {
-          //  m_clientThreads = clientThreads;
-            m_regionHandle = regionHandle;
-            m_world = world;
-            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
-            this.primData = new PrimData();
-            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-            this.primData.OwnerID = owner;
-            this.primData.FullID = this.uuid = fullID;
-            this.primData.LocalID = m_localId = localID;
-        }
-
-        /// <summary>
-        /// Constructor to create a default cube 
-        /// </summary>
-        /// <param name="clientThreads"></param>
-        /// <param name="regionHandle"></param>
-        /// <param name="world"></param>
-        /// <param name="owner"></param>
-        /// <param name="localID"></param>
-        /// <param name="position"></param>
-        public Primitive( ulong regionHandle, Scene world, LLUUID owner, uint localID, LLVector3 position)
-        {
-            //m_clientThreads = clientThreads;
-            m_regionHandle = regionHandle;
-            m_world = world;
-            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
-            this.primData = PrimData.DefaultCube();
-            this.primData.OwnerID = owner;
-            this.primData.LocalID = m_localId = localID;
-            this.Pos = this.primData.Position = position;
-
-            this.updateFlag = 1;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public byte[] GetByteArray()
-        {
-            byte[] result = null;
-            List<byte[]> dataArrays = new List<byte[]>();
-            dataArrays.Add(primData.ToBytes());
-            foreach (Entity child in children)
-            {
-                if (child is OpenSim.Region.Environment.Scenes.Primitive)
-                {
-                    dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());
-                }
-            }
-            byte[] primstart = Helpers.StringToField("<Prim>");
-            byte[] primend = Helpers.StringToField("</Prim>");
-            int totalLength = primstart.Length + primend.Length;
-            for (int i = 0; i < dataArrays.Count; i++)
-            {
-                totalLength += dataArrays[i].Length;
-            }
-
-            result = new byte[totalLength];
-            int arraypos = 0;
-            Array.Copy(primstart, 0, result, 0, primstart.Length);
-            arraypos += primstart.Length;
-            for (int i = 0; i < dataArrays.Count; i++)
-            {
-                Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length);
-                arraypos += dataArrays[i].Length;
-            }
-            Array.Copy(primend, 0, result, arraypos, primend.Length);
-
-            return result;
-        }
-
-        #region Overridden Methods
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void update()
-        {
-            if (this.updateFlag == 1) // is a new prim just been created/reloaded 
-            {
-                this.SendFullUpdateToAllClients();
-                this.updateFlag = 0;
-            }
-            if (this.updateFlag == 2) //some change has been made so update the clients
-            {
-                this.SendTerseUpdateToALLClients();
-                this.updateFlag = 0;
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void BackUp()
-        {
-
-        }
-
-        #endregion
-
-        #region Packet handlers
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="pos"></param>
-        public void UpdatePosition(LLVector3 pos)
-        {
-            this.Pos = new LLVector3(pos.X, pos.Y, pos.Z);
-            this.updateFlag = 2;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="addPacket"></param>
-        public void UpdateShape(ObjectShapePacket.ObjectDataBlock updatePacket)
-        {
-            this.primData.PathBegin = updatePacket.PathBegin;
-            this.primData.PathEnd = updatePacket.PathEnd;
-            this.primData.PathScaleX = updatePacket.PathScaleX;
-            this.primData.PathScaleY = updatePacket.PathScaleY;
-            this.primData.PathShearX = updatePacket.PathShearX;
-            this.primData.PathShearY = updatePacket.PathShearY;
-            this.primData.PathSkew = updatePacket.PathSkew;
-            this.primData.ProfileBegin = updatePacket.ProfileBegin;
-            this.primData.ProfileEnd = updatePacket.ProfileEnd;
-            this.primData.PathCurve = updatePacket.PathCurve;
-            this.primData.ProfileCurve = updatePacket.ProfileCurve;
-            this.primData.ProfileHollow = updatePacket.ProfileHollow;
-            this.primData.PathRadiusOffset = updatePacket.PathRadiusOffset;
-            this.primData.PathRevolutions = updatePacket.PathRevolutions;
-            this.primData.PathTaperX = updatePacket.PathTaperX;
-            this.primData.PathTaperY = updatePacket.PathTaperY;
-            this.primData.PathTwist = updatePacket.PathTwist;
-            this.primData.PathTwistBegin = updatePacket.PathTwistBegin;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="tex"></param>
-        public void UpdateTexture(byte[] tex)
-        {
-            this.primData.TextureEntry = tex;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="pack"></param>
-        public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="prim"></param>
-        public void AssignToParent(Primitive prim)
-        {
-
-        }
-
-        #endregion
-
-        # region Inventory Methods
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns></returns>
-        public bool AddToInventory(InventoryItem item)
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="itemID"></param>
-        /// <returns></returns>
-        public InventoryItem RemoveFromInventory(LLUUID itemID)
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="simClient"></param>
-        /// <param name="packet"></param>
-        public void RequestInventoryInfo(IClientAPI simClient, RequestTaskInventoryPacket packet)
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="simClient"></param>
-        /// <param name="xferID"></param>
-        public void RequestXferInventory(IClientAPI simClient, ulong xferID)
-        {
-            //will only currently work if the total size of the inventory data array is under about 1000 bytes
-            SendXferPacketPacket send = new SendXferPacketPacket();
-
-            send.XferID.ID = xferID;
-            send.XferID.Packet = 1 + 2147483648;
-            send.DataPacket.Data = this.ConvertInventoryToBytes();
-
-            simClient.OutPacket(send);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public byte[] ConvertInventoryToBytes()
-        {
-            System.Text.Encoding enc = System.Text.Encoding.ASCII;
-            byte[] result = new byte[0];
-            List<byte[]> inventoryData = new List<byte[]>();
-            int totallength = 0;
-            foreach (InventoryItem invItem in inventoryItems.Values)
-            {
-                byte[] data = enc.GetBytes(invItem.ExportString());
-                inventoryData.Add(data);
-                totallength += data.Length;
-            }
-            //TODO: copy arrays into the single result array
-
-            return result;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="data"></param>
-        public void CreateInventoryFromBytes(byte[] data)
-        {
-
-        }
-
-        #endregion
-
-        #region Update viewers Methods
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        public void SendFullUpdateForAllChildren(IClientAPI remoteClient)
-        {
-            this.SendFullUpdateToClient(remoteClient);
-            for (int i = 0; i < this.children.Count; i++)
-            {
-                if (this.children[i] is Primitive)
-                {
-                    ((Primitive)this.children[i]).SendFullUpdateForAllChildren(remoteClient);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        public void SendFullUpdateToClient(IClientAPI remoteClient)
-        {
-            LLVector3 lPos;
-            if (this._physActor != null && this.physicsEnabled)
-            {
-                PhysicsVector pPos = this._physActor.Position;
-                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
-            }
-            else
-            {
-                lPos = this.Pos;
-            }
-
-            remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.LocalId, this.primData, lPos, new LLUUID("00000000-0000-0000-9999-000000000005"), this.flags);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void SendFullUpdateToAllClients()
-        {
-            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
-            for (int i = 0; i < avatars.Count; i++)
-            {
-                this.SendFullUpdateToClient(avatars[i].ControllingClient);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="RemoteClient"></param>
-        public void SendTerseUpdateToClient(IClientAPI RemoteClient)
-        {
-            LLVector3 lPos;
-            Axiom.MathLib.Quaternion lRot;
-            if (this._physActor != null && this.physicsEnabled) //is this needed ? doesn't the property fields do this for us?
-            {
-                PhysicsVector pPos = this._physActor.Position;
-                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
-                lRot = this._physActor.Orientation;
-            }
-            else
-            {
-                lPos = this.Pos;
-                lRot = this.rotation;
-            }
-            LLQuaternion mRot = new LLQuaternion(lRot.x, lRot.y, lRot.z, lRot.w);
-            RemoteClient.SendPrimTerseUpdate(this.m_regionHandle, 64096, this.LocalId, lPos, mRot);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void SendTerseUpdateToALLClients()
-        {
-            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
-            for (int i = 0; i < avatars.Count; i++)
-            {
-                this.SendTerseUpdateToClient(avatars[i].ControllingClient);
-            }
-        }
-
-        #endregion
-
-        #region Create Methods
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="addPacket"></param>
-        /// <param name="ownerID"></param>
-        /// <param name="localID"></param>
-        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
-        {
-            PrimData PData = new PrimData();
-            this.primData = PData;
-            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-
-            PData.OwnerID = ownerID;
-            PData.PCode = addPacket.ObjectData.PCode;
-            PData.PathBegin = addPacket.ObjectData.PathBegin;
-            PData.PathEnd = addPacket.ObjectData.PathEnd;
-            PData.PathScaleX = addPacket.ObjectData.PathScaleX;
-            PData.PathScaleY = addPacket.ObjectData.PathScaleY;
-            PData.PathShearX = addPacket.ObjectData.PathShearX;
-            PData.PathShearY = addPacket.ObjectData.PathShearY;
-            PData.PathSkew = addPacket.ObjectData.PathSkew;
-            PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
-            PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
-            PData.Scale = addPacket.ObjectData.Scale;
-            PData.PathCurve = addPacket.ObjectData.PathCurve;
-            PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
-            PData.ParentID = 0;
-            PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
-            PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
-            PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
-            PData.PathTaperX = addPacket.ObjectData.PathTaperX;
-            PData.PathTaperY = addPacket.ObjectData.PathTaperY;
-            PData.PathTwist = addPacket.ObjectData.PathTwist;
-            PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
-            LLVector3 pos1 = addPacket.ObjectData.RayEnd;
-            this.primData.FullID = this.uuid = LLUUID.Random();
-            this.primData.LocalID = m_localId = (uint)(localID);
-            this.primData.Position = this.Pos = pos1;
-
-            this.updateFlag = 1;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="data"></param>
-        public void CreateFromBytes(byte[] data)
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="primData"></param>
-        public void CreateFromPrimData(PrimData primData)
-        {
-            this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="primData"></param>
-        /// <param name="posi"></param>
-        /// <param name="localID"></param>
-        /// <param name="newprim"></param>
-        public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
-        {
-
-        }
-        
-        public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
-        {
-           // Console.WriteLine("moving prim to new location " + pos.X + " , " + pos.Y + " , " + pos.Z);
-            this.Pos = pos;
-            this.SendTerseUpdateToALLClients();
-        }
-
-        public void GetProperites(IClientAPI client)
-        {
-            //needs changing
-            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
-            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
-            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
-            proper.ObjectData[0].ItemID = LLUUID.Zero;
-            proper.ObjectData[0].CreationDate = (ulong)primData.CreationDate;
-            proper.ObjectData[0].CreatorID = primData.OwnerID;
-            proper.ObjectData[0].FolderID = LLUUID.Zero;
-            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
-            proper.ObjectData[0].GroupID = LLUUID.Zero;
-            proper.ObjectData[0].InventorySerial = 0;
-            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
-            proper.ObjectData[0].ObjectID = this.uuid;
-            proper.ObjectData[0].OwnerID = primData.OwnerID;
-            proper.ObjectData[0].TouchName = new byte[0];
-            proper.ObjectData[0].TextureID = new byte[0];
-            proper.ObjectData[0].SitName = new byte[0];
-            proper.ObjectData[0].Name = new byte[0];
-            proper.ObjectData[0].Description = new byte[0];
-            proper.ObjectData[0].OwnerMask = primData.OwnerMask;
-            proper.ObjectData[0].NextOwnerMask = primData.NextOwnerMask;
-            proper.ObjectData[0].GroupMask = primData.GroupMask;
-            proper.ObjectData[0].EveryoneMask = primData.EveryoneMask;
-            proper.ObjectData[0].BaseMask = primData.BaseMask;
-
-            client.OutPacket(proper);
-
-        }
-
-        #endregion
-
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
deleted file mode 100644
index 1d55c4d..0000000
--- a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public partial class Scene
-    {
-        /// <summary>
-        /// Modifies terrain using the specified information
-        /// </summary>
-        /// <param name="height">The height at which the user started modifying the terrain</param>
-        /// <param name="seconds">The number of seconds the modify button was pressed</param>
-        /// <param name="brushsize">The size of the brush used</param>
-        /// <param name="action">The action to be performed</param>
-        /// <param name="north">Distance from the north border where the cursor is located</param>
-        /// <param name="west">Distance from the west border where the cursor is located</param>
-        public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west)
-        {
-            // Shiny.
-            double size = (double)(1 << brushsize);
-
-            switch (action)
-            {
-                case 0:
-                    // flatten terrain
-                    Terrain.flatten(north, west, size, (double)seconds / 100.0);
-                    RegenerateTerrain(true, (int)north, (int)west);
-                    break;
-                case 1:
-                    // raise terrain
-                    Terrain.raise(north, west, size, (double)seconds / 100.0);
-                    RegenerateTerrain(true, (int)north, (int)west);
-                    break;
-                case 2:
-                    //lower terrain
-                    Terrain.lower(north, west, size, (double)seconds / 100.0);
-                    RegenerateTerrain(true, (int)north, (int)west);
-                    break;
-                case 3:
-                    // smooth terrain
-                    Terrain.smooth(north, west, size, (double)seconds / 100.0);
-                    RegenerateTerrain(true, (int)north, (int)west);
-                    break;
-                case 4:
-                    // noise
-                    Terrain.noise(north, west, size, (double)seconds / 100.0);
-                    RegenerateTerrain(true, (int)north, (int)west);
-                    break;
-                case 5:
-                    // revert
-                    Terrain.revert(north, west, size, (double)seconds / 100.0);
-                    RegenerateTerrain(true, (int)north, (int)west);
-                    break;
-
-                // CLIENT EXTENSIONS GO HERE
-                case 128:
-                    // erode-thermal
-                    break;
-                case 129:
-                    // erode-aerobic
-                    break;
-                case 130:
-                    // erode-hydraulic
-                    break;
-            }
-            return;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="type"></param>
-        /// <param name="fromPos"></param>
-        /// <param name="fromName"></param>
-        /// <param name="fromAgentID"></param>
-        public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
-        {
-            Console.WriteLine("Chat message");
-            ScenePresence avatar = null;
-            foreach (IClientAPI client in m_clientThreads.Values)
-            {
-                int dis = -1000;
-                if (this.Avatars.ContainsKey(client.AgentId))
-                {
-                    
-                    avatar = this.Avatars[client.AgentId];
-                    // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
-                    dis= (int)avatar.Pos.GetDistanceTo(fromPos);
-                    Console.WriteLine("found avatar at " +dis);
-
-                }
-             
-                switch (type)
-                {
-                    case 0: // Whisper
-                        if ((dis < 10) && (dis > -10))
-                        {
-                            //should change so the message is sent through the avatar rather than direct to the ClientView
-                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                        }
-                        break;
-                    case 1: // Say
-                        if ((dis < 30) && (dis > -30))
-                        {
-                            Console.WriteLine("sending chat");
-                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                        }
-                        break;
-                    case 2: // Shout
-                        if ((dis < 100) && (dis > -100))
-                        {
-                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                        }
-                        break;
-
-                    case 0xff: // Broadcast
-                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                        break;
-                }
-
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="primAsset"></param>
-        /// <param name="pos"></param>
-        public void RezObject(AssetBase primAsset, LLVector3 pos)
-        {
-          
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="packet"></param>
-        /// <param name="simClient"></param>
-        public void DeRezObject(Packet packet, IClientAPI simClient)
-        {
-           
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        public void SendAvatarsToClient(IClientAPI remoteClient)
-        {
-            
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="parentPrim"></param>
-        /// <param name="childPrims"></param>
-        public void LinkObjects(uint parentPrim, List<uint> childPrims)
-        {
-            
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="primLocalID"></param>
-        /// <param name="shapeBlock"></param>
-        public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
-        {
-           
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="primLocalID"></param>
-        /// <param name="remoteClient"></param>
-        public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
-        {
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.LocalId == primLocalID)
-                {
-                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);
-                    break;
-                }
-            }
-        }
-
-        public void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
-        {
-            if (this.Entities.ContainsKey(objectID))
-            {
-                ((Primitive)this.Entities[objectID]).GrapMovement(offset, pos, remoteClient);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="packet"></param>
-        /// <param name="remoteClient"></param>
-        public void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient)
-        {
-           
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="texture"></param>
-        /// <param name="remoteClient"></param>
-        public void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
-        {
-            
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="pos"></param>
-        /// <param name="remoteClient"></param>
-        public void UpdatePrimPosition(uint localID, LLVector3 pos, IClientAPI remoteClient)
-        {
-            foreach (Entity ent in Entities.Values)
-            {
-                if (ent.LocalId == localID)
-                {
-                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).UpdatePosition(pos);
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="rot"></param>
-        /// <param name="remoteClient"></param>
-        public void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient)
-        {
-            
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="scale"></param>
-        /// <param name="remoteClient"></param>
-        public void UpdatePrimScale(uint localID, LLVector3 scale, IClientAPI remoteClient)
-        {
-        }
-
-        /// <summary>
-        /// Sends prims to a client
-        /// </summary>
-        /// <param name="RemoteClient">Client to send to</param>
-        public void GetInitialPrims(IClientAPI RemoteClient)
-        {
-
-        }
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
deleted file mode 100644
index 2249c3d..0000000
--- a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Reflection;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public partial class Scene
-    {
-        private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();
-
-        /// <summary>
-        /// 
-        /// </summary>
-        private void LoadScriptEngines()
-        {
-            this.LoadScriptPlugins();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        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]);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="FileName"></param>
-        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;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="scriptType"></param>
-        /// <param name="scriptName"></param>
-        /// <param name="script"></param>
-        /// <param name="ent"></param>
-        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
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <returns></returns>
-        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;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <param name="z"></param>
-        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");
-                }
-            }
-           
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public uint GetRandomAvatarID()
-        {
-            //Console.WriteLine("script- getting random avatar id");
-            uint res = 0;
-            foreach (Entity entity in this.Entities.Values)
-            {
-                if (entity is ScenePresence)
-                {
-                    res = entity.LocalId;
-                }
-            }
-            return res;
-        }
-
-        #endregion
-
-
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.cs b/OpenSim/Region/Simulation/Scenes/Scene.cs
deleted file mode 100644
index e71f601..0000000
--- a/OpenSim/Region/Simulation/Scenes/Scene.cs
+++ /dev/null
@@ -1,795 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using libsecondlife;
-using libsecondlife.Packets;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework;
-using OpenSim.Region.Environment.Scripting;
-using OpenSim.Region.Terrain;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Caches;
-using OpenSim.Region.Environment;
-using OpenSim.Framework.Servers;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public delegate bool FilterAvatarList(ScenePresence avatar);
-
-    public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
-    {
-        protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
-        protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars;
-        protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;
-        private PhysicsScene phyScene;
-        private float timeStep = 0.1f;
-        private Random Rand = new Random();
-        private uint _primCount = 702000;
-        private int storageCount;
-        private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers;
-        private Dictionary<string, ScriptFactory> m_scripts;
-        private Mutex updateLock;
-        
-        protected AuthenticateSessionsBase authenticateHandler;
-        protected RegionCommsListener regionCommsHost;
-        protected CommunicationsManager commsManager;
-
-        protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
-        protected BaseHttpServer httpListener;
-
-        public ParcelManager parcelManager;
-        public EstateManager estateManager;
-        public EventManager eventManager;
-
-        #region Properties
-        /// <summary>
-        /// 
-        /// </summary>
-        public PhysicsScene PhysScene
-        {
-            set
-            {
-                this.phyScene = value;
-            }
-            get
-            {
-                return (this.phyScene);
-            }
-        }
-
-        #endregion
-
-        #region Constructors
-        /// <summary>
-        /// Creates a new World class, and a region to go with it.
-        /// </summary>
-        /// <param name="clientThreads">Dictionary to contain client threads</param>
-        /// <param name="regionHandle">Region Handle for this region</param>
-        /// <param name="regionName">Region Name for this region</param>
-        public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
-        {
-            try
-            {
-                updateLock = new Mutex(false);
-                this.authenticateHandler = authen;
-                this.commsManager = commsMan;
-                this.assetCache = assetCach;
-                m_clientThreads = clientThreads;
-                m_regInfo = regInfo;
-                m_regionHandle = m_regInfo.RegionHandle;
-                m_regionName = m_regInfo.RegionName;
-                this.m_datastore = m_regInfo.DataStore;
-                this.RegisterRegionWithComms();
-
-                parcelManager = new ParcelManager(this, this.m_regInfo);
-                estateManager = new EstateManager(this, this.m_regInfo);
-
-                eventManager = new EventManager();
-
-                m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
-                m_scripts = new Dictionary<string, ScriptFactory>();
-
-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
-                Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
-                Avatars = new Dictionary<LLUUID, ScenePresence>();
-                Prims = new Dictionary<LLUUID, Primitive>();
-
-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap");
-                Terrain = new TerrainEngine();
-
-                ScenePresence.LoadAnims();
-                this.httpListener = httpServer;
-                
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Error( "World.cs: Constructor failed with exception " + e.ToString());
-            }
-        }
-        #endregion
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void StartTimer()
-        {
-            m_heartbeatTimer.Enabled = true;
-            m_heartbeatTimer.Interval = 100;
-            m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
-        }
-
-
-        #region Update Methods
-
-
-        /// <summary>
-        /// Performs per-frame updates regularly
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void Heartbeat(object sender, System.EventArgs e)
-        {
-            this.Update();
-        }
-
-        /// <summary>
-        /// Performs per-frame updates on the world, this should be the central world loop
-        /// </summary>
-        public override void Update()
-        {
-            updateLock.WaitOne();
-            try
-            {
-                if (this.phyScene.IsThreaded)
-                {
-                    this.phyScene.GetResults();
-
-                }
-
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].updateMovement();
-                }
-
-                lock (this.m_syncRoot)
-                {
-                    this.phyScene.Simulate(timeStep);
-                }
-
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].update();
-                }
-
-                // New
-                eventManager.TriggerOnFrame();
-
-                // TODO: Obsolete - Phase out
-                foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
-                {
-                    scriptHandler.OnFrame();
-                }
-                foreach (IScriptEngine scripteng in this.scriptEngines.Values)
-                {
-                    scripteng.OnFrame();
-                }
-
-                //backup world data
-                this.storageCount++;
-                if (storageCount > 1200) //set to how often you want to backup 
-                {
-                    this.Backup();
-                    storageCount = 0;
-                }
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
-            }
-            updateLock.ReleaseMutex();
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public bool Backup()
-        {
-            /*
-            try
-            {
-                // Terrain backup routines
-                if (Terrain.tainted > 0)
-                {
-                    Terrain.tainted = 0;
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain tainted, saving.");
-                    localStorage.SaveMap(Terrain.getHeights1D());
-                    OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain saved, informing Physics.");
-                    lock (this.m_syncRoot)
-                    {
-                        phyScene.SetTerrain(Terrain.getHeights1D());
-                    }
-                }
-
-                // Primitive backup routines
-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Backing up Primitives");
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].BackUp();
-                }
-
-                //Parcel backup routines
-                ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
-                int i = 0;
-                foreach (OpenSim.Region.Environment.Parcel parcel in parcelManager.parcelList.Values)
-                {
-                    parcels[i] = parcel.parcelData;
-                    i++;
-                }
-                localStorage.SaveParcels(parcels);
-
-                // Backup successful
-                return true;
-            }
-            catch (Exception e)
-            {
-                // Backup failed
-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
-                return false;
-            }
-            */
-            return true;
-        }
-        #endregion
-
-        #region Regenerate Terrain
-
-        /// <summary>
-        /// Rebuilds the terrain using a procedural algorithm
-        /// </summary>
-        public void RegenerateTerrain()
-        {
-            try
-            {
-                Terrain.hills();
-
-                lock (this.m_syncRoot)
-                {
-                    this.phyScene.SetTerrain(Terrain.getHeights1D());
-                }
-                this.localStorage.SaveMap(this.Terrain.getHeights1D());
-
-                foreach (IClientAPI client in m_clientThreads.Values)
-                {
-                    this.SendLayerData(client);
-                }
-
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].LandRenegerated();
-                }
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Rebuilds the terrain using a 2D float array
-        /// </summary>
-        /// <param name="newMap">256,256 float array containing heights</param>
-        public void RegenerateTerrain(float[,] newMap)
-        {
-            try
-            {
-                this.Terrain.setHeights2D(newMap);
-                lock (this.m_syncRoot)
-                {
-                    this.phyScene.SetTerrain(this.Terrain.getHeights1D());
-                }
-                this.localStorage.SaveMap(this.Terrain.getHeights1D());
-
-                foreach (IClientAPI client in m_clientThreads.Values)
-                {
-                    this.SendLayerData(client);
-                }
-
-                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
-                {
-                    Entities[UUID].LandRenegerated();
-                }
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Rebuilds the terrain assuming changes occured at a specified point[?]
-        /// </summary>
-        /// <param name="changes">???</param>
-        /// <param name="pointx">???</param>
-        /// <param name="pointy">???</param>
-        public void RegenerateTerrain(bool changes, int pointx, int pointy)
-        {
-            try
-            {
-                if (changes)
-                {
-                    /* Dont save here, rely on tainting system instead */
-
-                    foreach (IClientAPI client in m_clientThreads.Values)
-                    {
-                        this.SendLayerData(pointx, pointy, client);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
-            }
-        }
-
-        #endregion
-
-        #region Load Terrain
-        /// <summary>
-        /// Loads the World heightmap
-        /// </summary>
-        /// 
-        public override void LoadWorldMap()
-        {
-            try
-            {
-                float[] map = this.localStorage.LoadWorld();
-                if (map == null)
-                {
-                    if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
-                    {
-                        Console.WriteLine("No default terrain, procedurally generating...");
-                        this.Terrain.hills();
-
-                        this.localStorage.SaveMap(this.Terrain.getHeights1D());
-                    }
-                    else
-                    {
-                        try
-                        {
-                            this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);
-                            this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;
-                        }
-                        catch
-                        {
-                            Console.WriteLine("Unable to load default terrain, procedurally generating instead...");
-                            Terrain.hills();
-                        }
-                        this.localStorage.SaveMap(this.Terrain.getHeights1D());
-                    }
-                }
-                else
-                {
-                    this.Terrain.setHeights1D(map);
-                }
-
-                CreateTerrainTexture();
-
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        private void CreateTerrainTexture()
-        {
-            //create a texture asset of the terrain 
-            byte[] data = this.Terrain.exportJpegImage("defaultstripe.png");
-            this.m_regInfo.estateSettings.terrainImageID = LLUUID.Random();
-            AssetBase asset = new AssetBase();
-            asset.FullID = this.m_regInfo.estateSettings.terrainImageID;
-            asset.Data = data;
-            asset.Name = "terrainImage";
-            asset.Type = 0;
-            this.assetCache.AddAsset(asset);
-        }
-        #endregion
-
-        #region Primitives Methods
-
-
-        /// <summary>
-        /// Loads the World's objects
-        /// </summary>
-        public void LoadPrimsFromStorage()
-        {
-            try
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: LoadPrimsFromStorage() - Loading primitives");
-                this.localStorage.LoadPrimitives(this);
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Loads a specific object from storage
-        /// </summary>
-        /// <param name="prim">The object to load</param>
-        public void PrimFromStorage(PrimData prim)
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="addPacket"></param>
-        /// <param name="agentClient"></param>
-        public void AddNewPrim(Packet addPacket, IClientAPI agentClient)
-        {
-            AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentId);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="addPacket"></param>
-        /// <param name="ownerID"></param>
-        public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
-        {
-            try
-            {
-                Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
-
-                this.Entities.Add(prim.uuid, prim);
-                this._primCount++;
-
-                // Trigger event for listeners
-                eventManager.TriggerOnNewPrimitive(prim);
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
-            }
-        }
-
-        #endregion
-
-        #region Add/Remove Avatar Methods
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteClient"></param          
-        /// <param name="agentID"></param>
-        /// <param name="child"></param>
-        public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child)
-        {
-            remoteClient.OnRegionHandShakeReply += this.SendLayerData;
-            //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
-            remoteClient.OnChatFromViewer += this.SimChat;
-            remoteClient.OnRequestWearables += this.InformClientOfNeighbours;
-            remoteClient.OnAddPrim += this.AddNewPrim;
-            remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;
-            remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;
-            remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
-           //remoteClient.OnObjectSelect += this.SelectPrim;
-            remoteClient.OnGrapUpdate += this.MoveObject;
-
-            /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
-            remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
-            remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
-            remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
-            remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
-            */
-
-            ScenePresence newAvatar = null;
-            try
-            {
-
-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
-                newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo);
-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");
-
-                //newAvatar.SendRegionHandshake();
-                this.estateManager.sendRegionHandshake(remoteClient);
-
-                PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
-                lock (this.m_syncRoot)
-                {
-                    newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
-                }
-
-                lock (Entities)
-                {
-                    if (!Entities.ContainsKey(agentID))
-                    {
-                        this.Entities.Add(agentID, newAvatar);
-                    }
-                    else
-                    {
-                        Entities[agentID] = newAvatar;
-                    }
-                }
-                lock (Avatars)
-                {
-                    if (Avatars.ContainsKey(agentID))
-                    {
-                        Avatars[agentID] = newAvatar;
-                    }
-                    else
-                    {
-                        this.Avatars.Add(agentID, newAvatar);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
-            }
-            return;
-        }
-
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="agentID"></param>
-        public override void RemoveClient(LLUUID agentID)
-        {
-            eventManager.TriggerOnRemovePresence(agentID);
-
-            return;
-        }
-        #endregion
-
-        #region Request Avatars List Methods
-        //The idea is to have a group of method that return a list of avatars meeting some requirement
-        // ie it could be all Avatars within a certain range of the calling prim/avatar. 
-
-        /// <summary>
-        /// Request a List of all Avatars in this World
-        /// </summary>
-        /// <returns></returns>
-        public List<ScenePresence> RequestAvatarList()
-        {
-            List<ScenePresence> result = new List<ScenePresence>();
-
-            foreach (ScenePresence avatar in Avatars.Values)
-            {
-                result.Add(avatar);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Request a filtered list of Avatars in this World
-        /// </summary>
-        /// <returns></returns>
-        public List<ScenePresence> RequestAvatarList(FilterAvatarList filter)
-        {
-            List<ScenePresence> result = new List<ScenePresence>();
-
-            foreach (ScenePresence avatar in Avatars.Values)
-            {
-                if (filter(avatar))
-                {
-                    result.Add(avatar);
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Request a Avatar by UUID
-        /// </summary>
-        /// <param name="avatarID"></param>
-        /// <returns></returns>
-        public ScenePresence RequestAvatar(LLUUID avatarID)
-        {
-            if (this.Avatars.ContainsKey(avatarID))
-            {
-                return Avatars[avatarID];
-            }
-            return null;
-        }
-        #endregion
-
-
-        #region RegionCommsHost
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void RegisterRegionWithComms()
-        {
-            GridInfo gridSettings = new GridInfo();
-            this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings);
-            if (this.regionCommsHost != null)
-            {
-                this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
-                this.regionCommsHost.OnAvatarCrossingIntoRegion += new AgentCrossing(this.AgentCrossing);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="agent"></param>
-        public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
-        {
-            // Console.WriteLine("World.cs - add new user connection");
-            //should just check that its meant for this region 
-            if (regionHandle == this.m_regInfo.RegionHandle)
-            {
-                if (agent.CapsPath != "")
-                {
-                    //Console.WriteLine("new user, so creating caps handler for it");
-                    Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
-                    cap.RegisterHandlers();
-                    this.capsHandlers.Add(agent.AgentID, cap);
-                }
-                this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
-            }
-        }
-
-        public void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (regionHandle == this.m_regInfo.RegionHandle)
-            {
-                if (this.Avatars.ContainsKey(agentID))
-                {
-                    this.Avatars[agentID].MakeAvatar(position);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void InformClientOfNeighbours(IClientAPI remoteClient)
-        {
-            // Console.WriteLine("informing client of neighbouring regions");
-            List<RegionInfo> neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo);
-
-            //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
-            if (neighbours != null)
-            {
-                for (int i = 0; i < neighbours.Count; i++)
-                {
-                    // Console.WriteLine("sending neighbours data");
-                    AgentCircuitData agent = remoteClient.RequestClientInfo();
-                    agent.BaseFolder = LLUUID.Zero;
-                    agent.InventoryFolder = LLUUID.Zero;
-                    agent.startpos = new LLVector3(128, 128, 70);
-                    agent.child = true;
-                    this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent);
-                    remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr), (ushort)neighbours[i].CommsIPListenPort);
-                    //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
-        {
-            return this.commsManager.GridServer.RequestNeighbourInfo(regionHandle);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="minX"></param>
-        /// <param name="minY"></param>
-        /// <param name="maxX"></param>
-        /// <param name="maxY"></param>
-        public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
-        {
-            List<MapBlockData> mapBlocks;
-            mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
-            remoteClient.SendMapBlock(mapBlocks);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="RegionHandle"></param>
-        /// <param name="position"></param>
-        /// <param name="lookAt"></param>
-        /// <param name="flags"></param>
-        public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags)
-        {
-            if (regionHandle == this.m_regionHandle)
-            {
-                if (this.Avatars.ContainsKey(remoteClient.AgentId))
-                {
-                    remoteClient.SendTeleportLocationStart();
-                    remoteClient.SendLocalTeleport(position, lookAt, flags);
-                    this.Avatars[remoteClient.AgentId].Teleport(position);
-                }
-            }
-            else
-            {
-                RegionInfo reg = this.RequestNeighbouringRegionInfo(regionHandle);
-                if (reg != null)
-                {
-                    remoteClient.SendTeleportLocationStart();
-                    AgentCircuitData agent = remoteClient.RequestClientInfo();
-                    agent.BaseFolder = LLUUID.Zero;
-                    agent.InventoryFolder = LLUUID.Zero;
-                    agent.startpos = new LLVector3(128, 128, 70);
-                    agent.child = true;
-                    this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
-                    this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position);
-                    remoteClient.SendRegionTeleport(regionHandle, 13, reg.CommsIPListenAddr, (ushort)reg.CommsIPListenPort, 4, (1 << 4));               
-                }
-                //remoteClient.SendTeleportCancel();
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionhandle"></param>
-        /// <param name="agentID"></param>
-        /// <param name="position"></param>
-        public bool InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position)
-        {
-           return this.commsManager.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position);
-        }
-
-        #endregion
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/SceneBase.cs b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
deleted file mode 100644
index 3d8f522..0000000
--- a/OpenSim/Region/Simulation/Scenes/SceneBase.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using libsecondlife;
-using libsecondlife.Packets;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
-using System.Threading;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Region.Environment.Scripting;
-using OpenSim.Region.Terrain;
-using OpenSim.Region.Caches;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public abstract class SceneBase :  IWorld 
-    {
-        public Dictionary<libsecondlife.LLUUID, Entity> Entities;
-        protected Dictionary<uint, IClientAPI> m_clientThreads;
-        protected ulong m_regionHandle;
-        protected string m_regionName;
-        protected RegionInfo m_regInfo;
-
-        public TerrainEngine Terrain;
-
-        public string m_datastore;
-        public ILocalStorage localStorage;
-
-        protected object m_syncRoot = new object();
-        private uint m_nextLocalId = 8880000;
-        protected AssetCache assetCache;
-
-        #region Update Methods
-        /// <summary>
-        /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
-        /// </summary>
-        public abstract void Update();
-
-        #endregion
-
-        #region Terrain Methods
-
-        /// <summary>
-        /// Loads the World heightmap
-        /// </summary>
-        public abstract void LoadWorldMap();
-
-        /// <summary>
-        /// Loads a new storage subsystem from a named library
-        /// </summary>
-        /// <param name="dllName">Storage Library</param>
-        /// <returns>Successful or not</returns>
-        public bool LoadStorageDLL(string dllName)
-        {
-            try
-            {
-                Assembly pluginAssembly = Assembly.LoadFrom(dllName);
-                ILocalStorage store = null;
-
-                foreach (Type pluginType in pluginAssembly.GetTypes())
-                {
-                    if (pluginType.IsPublic)
-                    {
-                        if (!pluginType.IsAbstract)
-                        {
-                            Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
-
-                            if (typeInterface != null)
-                            {
-                                ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                store = plug;
-
-                                store.Initialise(this.m_datastore);
-                                break;
-                            }
-
-                            typeInterface = null;
-                        }
-                    }
-                }
-                pluginAssembly = null;
-                this.localStorage = store;
-                return (store == null);
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
-                return false;
-            }
-        }
-
-        
-        /// <summary>
-        /// Send the region heightmap to the client
-        /// </summary>
-        /// <param name="RemoteClient">Client to send to</param>
-        public virtual void SendLayerData(IClientAPI RemoteClient)
-        {
-            RemoteClient.SendLayerData(Terrain.getHeights1D());
-        }
-
-        /// <summary>
-        /// Sends a specified patch to a client
-        /// </summary>
-        /// <param name="px">Patch coordinate (x) 0..16</param>
-        /// <param name="py">Patch coordinate (y) 0..16</param>
-        /// <param name="RemoteClient">The client to send to</param>
-        public virtual void SendLayerData(int px, int py, IClientAPI RemoteClient)
-        {
-            RemoteClient.SendLayerData(px, py, Terrain.getHeights1D());
-        }
-
-        #endregion
-
-        #region Add/Remove Agent/Avatar
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="agentID"></param>
-        /// <param name="child"></param>
-        public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="agentID"></param>
-        public abstract void RemoveClient(LLUUID agentID);
-       
-        #endregion
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public virtual RegionInfo RegionInfo
-        {
-            get { return this.m_regInfo; }
-        }
-
-        public object SyncRoot
-        {
-            get { return m_syncRoot; }
-        }
-
-        public uint NextLocalId
-        {
-            get { return m_nextLocalId++; }
-        }
-
-        #region Shutdown
-        /// <summary>
-        /// Tidy before shutdown
-        /// </summary>
-        public virtual void Close()
-        {
-            try
-            {
-                this.localStorage.ShutDown();
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
-            }
-        }
-
-        #endregion
-
- 
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
deleted file mode 100644
index fa1bacb..0000000
--- a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    /// <summary>
-    /// A class for triggering remote scene events.
-    /// </summary>
-    public class EventManager
-    {
-        public delegate void OnFrameDelegate();
-        public event OnFrameDelegate OnFrame;
-
-        public delegate void OnNewPresenceDelegate(ScenePresence presence);
-        public event OnNewPresenceDelegate OnNewPresence;
-
-        public delegate void OnNewPrimitiveDelegate(Primitive prim);
-        public event OnNewPrimitiveDelegate OnNewPrimitive;
-
-        public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
-        public event OnRemovePresenceDelegate OnRemovePresence;
-
-        public void TriggerOnFrame()
-        {
-            if (OnFrame != null)
-            {
-                OnFrame();
-            }
-        }
-
-        public void TriggerOnNewPrimitive(Primitive prim)
-        {
-            if (OnNewPrimitive != null)
-                OnNewPrimitive(prim);
-        }
-
-        public void TriggerOnNewPresence(ScenePresence presence)
-        {
-            if (OnNewPresence != null)
-                OnNewPresence(presence);
-        }
-
-        public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
-        {
-            if (OnRemovePresence != null)
-            {
-                OnRemovePresence(uuid);
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/SceneObject.cs b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
deleted file mode 100644
index 88fb160..0000000
--- a/OpenSim/Region/Simulation/Scenes/SceneObject.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public class SceneObject : Entity
-    {
-        private LLUUID rootUUID;
-        //private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>();
-        protected Primitive rootPrimitive;
-        private Scene m_world;
-        protected ulong regionHandle;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public SceneObject()
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="addPacket"></param>
-        /// <param name="agentID"></param>
-        /// <param name="localID"></param>
-        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
-        {
-            this.rootPrimitive = new Primitive( this.regionHandle, this.m_world, addPacket, agentID, localID);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="data"></param>
-        public void CreateFromBytes(byte[] data)
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void update()
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void BackUp()
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="client"></param>
-        public void GetProperites(IClientAPI client)
-        {
-            //needs changing
-            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
-            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
-            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
-            proper.ObjectData[0].ItemID = LLUUID.Zero;
-            proper.ObjectData[0].CreationDate = (ulong)this.rootPrimitive.primData.CreationDate;
-            proper.ObjectData[0].CreatorID = this.rootPrimitive.primData.OwnerID;
-            proper.ObjectData[0].FolderID = LLUUID.Zero;
-            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
-            proper.ObjectData[0].GroupID = LLUUID.Zero;
-            proper.ObjectData[0].InventorySerial = 0;
-            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
-            proper.ObjectData[0].ObjectID = this.uuid;
-            proper.ObjectData[0].OwnerID = this.rootPrimitive.primData.OwnerID;
-            proper.ObjectData[0].TouchName = new byte[0];
-            proper.ObjectData[0].TextureID = new byte[0];
-            proper.ObjectData[0].SitName = new byte[0];
-            proper.ObjectData[0].Name = new byte[0];
-            proper.ObjectData[0].Description = new byte[0];
-            proper.ObjectData[0].OwnerMask = this.rootPrimitive.primData.OwnerMask;
-            proper.ObjectData[0].NextOwnerMask = this.rootPrimitive.primData.NextOwnerMask;
-            proper.ObjectData[0].GroupMask = this.rootPrimitive.primData.GroupMask;
-            proper.ObjectData[0].EveryoneMask = this.rootPrimitive.primData.EveryoneMask;
-            proper.ObjectData[0].BaseMask = this.rootPrimitive.primData.BaseMask;
-
-            client.OutPacket(proper);
-            
-        }
-
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
deleted file mode 100644
index 2caabc2..0000000
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using System.Xml;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    partial class ScenePresence
-    {
-        public class AvatarAnimations
-        {
-
-            public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
-            public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
-
-            public AvatarAnimations()
-            {
-            }
-
-            public void LoadAnims()
-            {
-                //OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
-                XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
-
-                XmlDocument doc = new XmlDocument();
-                doc.Load(reader);
-                foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
-                {
-
-                    if (nod.Attributes["name"] != null)
-                    {
-                        AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
-                    }
-
-                }
-
-                reader.Close();
-
-                // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-
-                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
-                {
-                    AnimsNames.Add(kp.Value, kp.Key);
-                }
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
deleted file mode 100644
index 2c81d2a..0000000
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    partial class ScenePresence
-    {
-        public class Avatar : IScenePresenceBody
-        {
-            public Avatar()
-            {
-
-            }
-
-            public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
-            {
-            }
-
-            public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
-            {
-            }
-
-            public void SendOurAppearance(IClientAPI OurClient)
-            {
-            }
-
-            public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
-            {
-            }
-        }
-
-        public class ChildAgent : IScenePresenceBody //is a ghost
-        {
-            public ChildAgent()
-            {
-
-            }
-
-            public void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
-            {
-            }
-
-            public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
-            {
-            }
-
-            public void SendOurAppearance(IClientAPI OurClient)
-            {
-            }
-
-            public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
-            {
-            }
-        }
-    }
-
-}
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
deleted file mode 100644
index 96e5c94..0000000
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using Axiom.MathLib;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public partial class ScenePresence : Entity
-    {
-        public static bool PhysicsEngineFlying = false;
-        public static AvatarAnimations Animations;
-        public static byte[] DefaultTexture;
-        public string firstname;
-        public string lastname;
-        public IClientAPI ControllingClient;
-        public LLUUID current_anim;
-        public int anim_seq;
-        private bool updateflag = false;
-        private byte movementflag = 0;
-        private List<NewForce> forcesList = new List<NewForce>();
-        private short _updateCount = 0;
-        private Axiom.MathLib.Quaternion bodyRot;
-        private LLObject.TextureEntry avatarAppearanceTexture = null;
-        private byte[] visualParams;
-        private AvatarWearable[] Wearables;
-        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
-        private ulong m_regionHandle;
-        private bool childAgent = false;
-        private bool newForce = false;
-        private bool newAvatar = false;
-        private IScenePresenceBody m_body;
-
-        protected RegionInfo m_regionInfo;
-
-        #region Properties
-        /// <summary>
-        /// 
-        /// </summary>
-        public PhysicsActor PhysActor
-        {
-            set
-            {
-                this._physActor = value;
-            }
-            get
-            {
-                return _physActor;
-            }
-        }
-        #endregion
-
-        #region Constructor(s)
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="theClient"></param>
-        /// <param name="world"></param>
-        /// <param name="clientThreads"></param>
-        /// <param name="regionDat"></param>
-        public ScenePresence(IClientAPI theClient, Scene world, RegionInfo reginfo)
-        {
-
-            m_world = world;
-            this.uuid = theClient.AgentId;
-
-            m_regionInfo = reginfo;
-            m_regionHandle = reginfo.RegionHandle;
-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");
-            ControllingClient = theClient;
-            this.firstname = ControllingClient.FirstName;
-            this.lastname = ControllingClient.LastName;
-            m_localId = m_world.NextLocalId;
-            Pos = ControllingClient.StartPos;
-            visualParams = new byte[218];
-            for (int i = 0; i < 218; i++)
-            {
-                visualParams[i] = 100;
-            }
-
-            Wearables = AvatarWearable.DefaultWearables;
-            
-            this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
-
-            //register for events
-            ControllingClient.OnRequestWearables += this.SendOurAppearance;
-            //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
-            ControllingClient.OnCompleteMovementToRegion += this.CompleteMovement;
-            ControllingClient.OnCompleteMovementToRegion += this.SendInitialData;
-            ControllingClient.OnAgentUpdate += this.HandleAgentUpdate;
-            // ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
-            // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
-            //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
-
-        }
-        #endregion
-
-        #region Status Methods
-        /// <summary>
-        /// Not Used, most likely can be deleted
-        /// </summary>
-        /// <param name="status"></param>
-        public void ChildStatusChange(bool status)
-        {
-            this.childAgent = status;
-
-            if (this.childAgent == true)
-            {
-                this.Velocity = new LLVector3(0, 0, 0);
-                this.Pos = new LLVector3(128, 128, 70);
-                
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="pos"></param>
-        public void MakeAvatar(LLVector3 pos)
-        {
-            //this.childAvatar = false;
-            this.Pos = pos;
-            this.newAvatar = true;
-            this.childAgent = false;
-        }
-
-        protected void MakeChildAgent()
-        {
-            this.Velocity = new LLVector3(0, 0, 0);
-            this.Pos = new LLVector3(128, 128, 70);
-            this.childAgent = true;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="pos"></param>
-        public void Teleport(LLVector3 pos)
-        {
-            this.Pos = pos;
-            this.SendTerseUpdateToALLClients();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void StopMovement()
-        {
-
-        }
-        #endregion
-
-        #region Event Handlers
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="texture"></param>
-        /// <param name="visualParam"></param>
-        public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
-        {
-
-        }
-
-        /// <summary>
-        /// Complete Avatar's movement into the region
-        /// </summary>
-        public void CompleteMovement()
-        {
-            LLVector3 look = this.Velocity;
-            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
-            {
-                look = new LLVector3(0.99f, 0.042f, 0);
-            }
-            this.ControllingClient.MoveAgentIntoRegion(m_regionInfo, Pos, look);
-            if (this.childAgent)
-            {
-                this.childAgent = false;
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="pack"></param>
-        public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
-        {  
-            if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
-            {
-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
-                if (((movementflag & 1) == 0) || (q != this.bodyRot))
-                {
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
-                    this.AddNewMovement(v3, q);
-                    movementflag = 1;
-                    this.bodyRot = q;
-                }
-            }
-            else if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
-            {
-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
-                if (((movementflag & 2) == 0) || (q != this.bodyRot))
-                {  
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
-                    this.AddNewMovement(v3, q);
-                    movementflag = 2;
-                    this.bodyRot = q;
-                }
-            }
-            else
-            {
-                if ((movementflag) != 0)
-                {
-                    NewForce newVelocity = new NewForce();
-                    newVelocity.X = 0;
-                    newVelocity.Y = 0;
-                    newVelocity.Z = 0;
-                    this.forcesList.Add(newVelocity);
-                    movementflag = 0;
-                }
-            }
-
-        }
-
-        protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation)
-        {
-            NewForce newVelocity = new NewForce();
-            Axiom.MathLib.Vector3 direc = rotation * vec;
-            direc.Normalize();
-
-            direc = direc * ((0.03f) * 128f);
-            if (this._physActor.Flying)
-                direc *= 4;
-
-            newVelocity.X = direc.x;
-            newVelocity.Y = direc.y;
-            newVelocity.Z = direc.z;
-            this.forcesList.Add(newVelocity);
-        }
-
-        #endregion
-
-        #region Overridden Methods
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void LandRenegerated()
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void update()
-        {
-            if (this.childAgent == false)
-            {
-                if (this.newForce)
-                {
-                    this.SendTerseUpdateToALLClients();
-                    _updateCount = 0;
-                }
-                else if (movementflag != 0)
-                {
-                    _updateCount++;
-                    if (_updateCount > 3)
-                    {
-                        this.SendTerseUpdateToALLClients();
-                        _updateCount = 0;
-                    }
-                }
-
-                this.CheckForBorderCrossing();
-            }
-        }
-        #endregion
-
-        #region Update Client(s)
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="RemoteClient"></param>
-        public void SendTerseUpdateToClient(IClientAPI RemoteClient)
-        {
-            LLVector3 pos = this.Pos;
-            LLVector3 vel = this.Velocity;
-            RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z));
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void SendTerseUpdateToALLClients()
-        {
-            List<ScenePresence> avatars = this.m_world.RequestAvatarList();
-            for (int i = 0; i < avatars.Count; i++)
-            {
-                this.SendTerseUpdateToClient(avatars[i].ControllingClient);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="remoteAvatar"></param>
-        public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
-        {
-            remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void SendInitialData()
-        {
-            this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);
-            if (this.newAvatar)
-            {
-                this.m_world.InformClientOfNeighbours(this.ControllingClient);
-                this.newAvatar = false;
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="OurClient"></param>
-        public void SendOurAppearance(IClientAPI OurClient)
-        {
-            this.ControllingClient.SendWearables(this.Wearables);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="avatarInfo"></param>
-        public void SendAppearanceToOtherAgent(ScenePresence avatarInfo)
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="animID"></param>
-        /// <param name="seq"></param>
-        public void SendAnimPack(LLUUID animID, int seq)
-        {
-
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void SendAnimPack()
-        {
-
-        }
-        #endregion
-
-        #region Border Crossing Methods
-        /// <summary>
-        /// 
-        /// </summary>
-        protected void CheckForBorderCrossing()
-        {
-            LLVector3 pos2 = this.Pos;
-            LLVector3 vel = this.Velocity;
-
-            float timeStep = 0.2f;
-            pos2.X = pos2.X + (vel.X * timeStep);
-            pos2.Y = pos2.Y + (vel.Y * timeStep);
-            pos2.Z = pos2.Z + (vel.Z * timeStep);
-
-            if ((pos2.X < 0) || (pos2.X > 256))
-            {
-                this.CrossToNewRegion();
-            }
-
-            if ((pos2.Y < 0) || (pos2.Y > 256))
-            {
-                this.CrossToNewRegion();
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        protected void CrossToNewRegion()
-        {
-            LLVector3 pos = this.Pos;
-            LLVector3 newpos = new LLVector3(pos.X, pos.Y, pos.Z);
-            uint neighbourx = this.m_regionInfo.RegionLocX;
-            uint neighboury = this.m_regionInfo.RegionLocY;
-
-            if (pos.X < 2)
-            {
-                neighbourx -= 1;
-                newpos.X = 254;
-            }
-            if (pos.X > 253)
-            {
-                neighbourx += 1;
-                newpos.X = 1;
-            }
-            if (pos.Y < 2)
-            {
-                neighboury -= 1;
-                newpos.Y = 254;
-            }
-            if (pos.Y > 253)
-            {
-                neighboury += 1;
-                newpos.Y = 1;
-            }
-
-            LLVector3 vel = this.velocity;
-            ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * 256), (uint)(neighboury * 256));
-            RegionInfo neighbourRegion = this.m_world.RequestNeighbouringRegionInfo(neighbourHandle);
-            if (neighbourRegion != null)
-            {
-                bool res = this.m_world.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos);
-                if (res)
-                {
-                    this.MakeChildAgent();
-                    this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.CommsIPListenAddr), (ushort)neighbourRegion.CommsIPListenPort);
-                }
-            }
-        }
-        #endregion
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public static void LoadAnims()
-        {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public override void updateMovement()
-        {
-            newForce = false;
-            lock (this.forcesList)
-            {
-                if (this.forcesList.Count > 0)
-                {
-                    for (int i = 0; i < this.forcesList.Count; i++)
-                    {
-                        NewForce force = this.forcesList[i];
-
-                        this.updateflag = true;
-                        this.Velocity = new LLVector3(force.X, force.Y, force.Z);
-                        this.newForce = true;
-                    }
-                    for (int i = 0; i < this.forcesList.Count; i++)
-                    {
-                        this.forcesList.RemoveAt(0);
-                    }
-                }
-            }
-        }
-
-        public static void LoadTextureFile(string name)
-        {
-            FileInfo fInfo = new FileInfo(name);
-            long numBytes = fInfo.Length;
-            FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
-            BinaryReader br = new BinaryReader(fStream);
-            byte[] data1 = br.ReadBytes((int)numBytes);
-            br.Close();
-            fStream.Close();
-            DefaultTexture = data1;
-        }
-
-        public class NewForce
-        {
-            public float X;
-            public float Y;
-            public float Z;
-
-            public NewForce()
-            {
-
-            }
-        }
-    }
-
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
deleted file mode 100644
index eb8a117..0000000
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public interface IScriptContext
-    {
-        IScriptEntity Entity { get; }
-        bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
deleted file mode 100644
index e813626..0000000
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public interface IScriptReadonlyEntity
-    {
-        LLVector3 Pos { get; }
-        string Name { get; }
-    }
-    
-    public interface IScriptEntity
-    {
-        LLVector3 Pos { get; set; }
-        string Name { get; }
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
deleted file mode 100644
index 115b4f4..0000000
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Physics.Manager;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
-using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
-using Primitive = OpenSim.Region.Environment.Scenes.Primitive;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public delegate void ScriptEventHandler(IScriptContext context);
-
-    public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
-    {
-        private Scene m_world;
-        private Script m_script;
-        private Entity m_entity;
-
-        public LLUUID ScriptId
-        {
-            get
-            {
-                return m_script.ScriptId;
-            }
-        }
-
-        public void OnFrame()
-        {
-            m_script.OnFrame(this);
-        }
-
-        public ScriptHandler(Script script, Entity entity, Scene world)
-        {
-            m_script = script;
-            m_entity = entity;
-            m_world = world;
-        }
-
-        #region IScriptContext Members
-
-        IScriptEntity IScriptContext.Entity
-        {
-            get
-            {
-                return this;
-            }
-        }
-
-        bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
-        {
-            foreach (Entity entity in m_world.Entities.Values )
-            {
-                if( entity is Avatar )
-                {
-                    avatar = entity;
-                    return true;
-                }
-            }
-            
-            avatar = null;
-            return false;
-        }
-
-        #endregion
-
-        #region IScriptEntity and IScriptReadonlyEntity Members
-
-        public string Name
-        {
-            get
-            {
-                return m_entity.Name;
-            }
-        }
-
-        public LLVector3 Pos
-        {
-            get
-            {
-                return m_entity.Pos;
-            }
-
-            set
-            {
-                if (m_entity is Primitive)
-                {
-                    Primitive prim = m_entity as Primitive;
-                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
-                   // prim.UpdatePosition( value );
-                }
-            }
-        }
-
-        #endregion
-    }
-
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
deleted file mode 100644
index 5d398b0..0000000
--- a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public class Script
-    {
-        private LLUUID m_scriptId;        
-        public virtual LLUUID ScriptId
-        {
-            get
-            {
-                return m_scriptId;
-            }
-        }
-
-        public Script( LLUUID scriptId )
-        {
-            m_scriptId = scriptId;
-        }
-        
-        public ScriptEventHandler OnFrame;
-    }
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
deleted file mode 100644
index 0ce65ea..0000000
--- a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public delegate Script ScriptFactory();
-}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
deleted file mode 100644
index 90c79e3..0000000
--- a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public class FollowRandomAvatar : Script
-    {
-        public FollowRandomAvatar()
-            : base(LLUUID.Random())
-        {
-            OnFrame += MyOnFrame;
-        }
-
-        private void MyOnFrame(IScriptContext context)
-        {
-            LLVector3 pos = context.Entity.Pos;
-
-            IScriptReadonlyEntity avatar;
-
-            if (context.TryGetRandomAvatar(out avatar))
-            {
-                LLVector3 avatarPos = avatar.Pos;
-
-                float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
-                float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
-
-                LLVector3 newPos = new LLVector3(x, y, pos.Z);
-
-                context.Entity.Pos = newPos;
-            }
-        }
-    }
-
-
-}
diff --git a/prebuild.xml b/prebuild.xml
index 2ef8e8f..b4cfc63 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -125,7 +125,7 @@
       </Files>
     </Project>
 
-	<Project name="OpenSim.Region.Caps" path="OpenSim/Region/Caps" type="Library">
+	<Project name="OpenSim.Region.Capabilities" path="OpenSim/Region/Capabilities" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -598,7 +598,6 @@
       <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.FrameworkGenericConfig.Xml"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Region.Caches"/>
@@ -611,7 +610,7 @@
 
 
 
-    <Project name="OpenSim.Region.Environment" path="OpenSim/Region/Simulation" type="Library">
+    <Project name="OpenSim.Region.Environment" path="OpenSim/Region/Environment" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -636,6 +635,7 @@
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Framework.Servers"/>
 	<Reference name="OpenSim.Region.Caches"/>
+	<Reference name="OpenSim.Region.Capabilities"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
 
-- 
cgit v1.1


From 440bb4a358cdc01559f624dbcbb7391d260616e0 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 02:07:59 +0000
Subject: *Fixed UserServer and OpenSim so now they start without crashing.

---
 OpenSim/Grid/UserServer/Main.cs                           | 2 +-
 OpenSim/Region/Application/OpenSimMain.cs                 | 4 ++--
 OpenSim/Region/Examples/SimpleApp/Program.cs              | 2 +-
 OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs   | 2 +-
 OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index c0ff649..8ae4dbf 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.UserServer
     /// </summary>
     public class OpenUser_Main :  conscmd_callback
     {
-        private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";
+        private string ConfigDll = "OpenSim.Grid.UserServer.Config.dll";
         private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
         private UserConfig Cfg;
         protected IGenericConfig localXMLConfig;
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e06d38c..7bf6b8d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -154,7 +154,7 @@ namespace OpenSim
         {
             try
             {
-                AssetCache = new AssetCache("OpenSim.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+                AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
                 InventoryCache = new InventoryCache();
             }
             catch (Exception e)
@@ -169,7 +169,7 @@ namespace OpenSim
         {
             try
             {
-                AssetCache = new AssetCache("OpenSim.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
+                AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
                 InventoryCache = new InventoryCache();
             }
             catch (Exception e)
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 8c1e965..4060d68 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using OpenSim;
-using OpenSim.GridInterfaces.Local;
+using OpenSim.Region.GridInterfaces.Local;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index 87eff49..95d03f1 100644
--- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -38,7 +38,7 @@ using libsecondlife;
 using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
 
-namespace OpenSim.GridInterfaces.Local
+namespace OpenSim.Region.GridInterfaces.Local
 {
     public class LocalAssetPlugin : IAssetPlugin
     {
diff --git a/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
index ca01c68..4652f70 100644
--- a/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
 
-namespace OpenSim.GridInterfaces.Remote
+namespace OpenSim.Region.GridInterfaces.Remote
 {
     public class RemoteAssetServer : IAssetServer
     {
-- 
cgit v1.1


From 50b180b545b178a8fc0147145ae73ee23d7f962f Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 02:09:57 +0000
Subject: *Added missing files from last commit (oops!)

---
 bin/avatar-texture.dat | Bin 0 -> 268 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bin/avatar-texture.dat

diff --git a/bin/avatar-texture.dat b/bin/avatar-texture.dat
new file mode 100644
index 0000000..6548a8a
Binary files /dev/null and b/bin/avatar-texture.dat differ
-- 
cgit v1.1


From 14ea54b44158a68aed767bbf5cc3497b4f64850c Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 28 Jun 2007 11:54:51 +0000
Subject: should now work.

---
 OpenSim/Framework/Servers/BaseHttpServer.cs        |   1 -
 .../Communications/Local/CommunicationsLocal.cs    |   2 +-
 bin/TerrainDatafiles/Alien/HOWTO.txt               |  19 ++++
 bin/TerrainDatafiles/Alien/alienworld.bmp          | Bin 0 -> 1048630 bytes
 bin/TerrainDatafiles/Alien/alienworld_0_0.bmp      | Bin 0 -> 262198 bytes
 bin/TerrainDatafiles/Alien/alienworld_0_0.r32      | Bin 0 -> 262144 bytes
 bin/TerrainDatafiles/Alien/alienworld_0_1.bmp      | Bin 0 -> 262198 bytes
 bin/TerrainDatafiles/Alien/alienworld_0_1.r32      | Bin 0 -> 262144 bytes
 bin/TerrainDatafiles/Alien/alienworld_0_2.bmp      | Bin 0 -> 262198 bytes
 bin/TerrainDatafiles/Alien/alienworld_0_2.r32      | Bin 0 -> 262144 bytes
 bin/TerrainDatafiles/Alien/alienworld_1_0.bmp      | Bin 0 -> 262198 bytes
 bin/TerrainDatafiles/Alien/alienworld_1_0.r32      | Bin 0 -> 262144 bytes
 bin/TerrainDatafiles/Alien/alienworld_1_1.bmp      | Bin 0 -> 262198 bytes
 bin/TerrainDatafiles/Alien/alienworld_1_1.r32      | Bin 0 -> 262144 bytes
 bin/TerrainDatafiles/Alien/alienworld_1_2.bmp      | Bin 0 -> 262198 bytes
 bin/TerrainDatafiles/Alien/alienworld_1_2.r32      | Bin 0 -> 262144 bytes
 bin/TerrainDatafiles/Alien/alienworld_2_0.bmp      | Bin 0 -> 262198 bytes
 bin/TerrainDatafiles/Alien/alienworld_2_0.r32      | Bin 0 -> 262144 bytes
 bin/TerrainDatafiles/Alien/alienworld_2_1.bmp      | Bin 0 -> 262198 bytes
 bin/TerrainDatafiles/Alien/alienworld_2_1.r32      | Bin 0 -> 262144 bytes
 bin/TerrainDatafiles/Alien/alienworld_2_2.bmp      | Bin 0 -> 262198 bytes
 bin/TerrainDatafiles/Alien/alienworld_2_2.r32      | Bin 0 -> 262144 bytes
 bin/TerrainDatafiles/Alien/alienworld_gray.bmp     | Bin 0 -> 786486 bytes
 bin/TerrainFilters/demofilter.cs                   |  50 ++++++++++
 bin/assets/base_shape.dat                          | 105 +++++++++++++++++++++
 bin/assets/bricks.jp2                              | Bin 0 -> 32865 bytes
 bin/assets/granite.jp2                             | Bin 0 -> 32897 bytes
 bin/assets/hardwood.jp2                            | Bin 0 -> 32876 bytes
 bin/assets/map1.jp2                                | Bin 0 -> 570 bytes
 bin/assets/map_base.jp2                            | Bin 0 -> 153 bytes
 bin/assets/plywood.jp2                             | Bin 0 -> 32794 bytes
 bin/assets/rocks.jp2                               | Bin 0 -> 32731 bytes
 bin/assets/testpic2.jp2                            | Bin 0 -> 291 bytes
 bin/libsecondlife.dll                              | Bin 2166784 -> 2256896 bytes
 34 files changed, 175 insertions(+), 2 deletions(-)
 create mode 100644 bin/TerrainDatafiles/Alien/HOWTO.txt
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_0_0.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_0_0.r32
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_0_1.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_0_1.r32
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_0_2.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_0_2.r32
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_1_0.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_1_0.r32
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_1_1.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_1_1.r32
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_1_2.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_1_2.r32
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_2_0.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_2_0.r32
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_2_1.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_2_1.r32
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_2_2.bmp
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_2_2.r32
 create mode 100644 bin/TerrainDatafiles/Alien/alienworld_gray.bmp
 create mode 100644 bin/TerrainFilters/demofilter.cs
 create mode 100644 bin/assets/base_shape.dat
 create mode 100644 bin/assets/bricks.jp2
 create mode 100644 bin/assets/granite.jp2
 create mode 100644 bin/assets/hardwood.jp2
 create mode 100644 bin/assets/map1.jp2
 create mode 100644 bin/assets/map_base.jp2
 create mode 100644 bin/assets/plywood.jp2
 create mode 100644 bin/assets/rocks.jp2
 create mode 100644 bin/assets/testpic2.jp2

diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index bc638dd..8c8204a 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -31,7 +31,6 @@ using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-//using OpenSim.CAPS;
 using Nwc.XmlRpc;
 using System.Collections;
 using OpenSim.Framework.Console;
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index c98cd11..8837bdb 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Communications.Local
             : base(serversInfo)
         {
             UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
-            UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll");
+            UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
             UserServer = UserServices;
             GridServer = SandBoxServices;
             InterRegion = SandBoxServices;
diff --git a/bin/TerrainDatafiles/Alien/HOWTO.txt b/bin/TerrainDatafiles/Alien/HOWTO.txt
new file mode 100644
index 0000000..00a65d7
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/HOWTO.txt
@@ -0,0 +1,19 @@
+Use the "terrain load" command to import these datafiles.
+They are stored as Float-32 arrays, use the F32 import type.
+
+These files are formatted on a scale of 0 to 1, they are designed for a range of 0..58.81
+use the 'multiply' command to multiply them by 58.81 to achieve correct height values.
+
+Example ------------------
+Region# : terrain load f32 c:\opensim\datafiles\output_x0_y0.r32
+Region# : terrain multiply 58.81
+
+
+
+	<AdamZaius>	0,0 - 1,0 - 2,0
+	<AdamZaius>	0,1 - 1,1 - 2,1
+	<AdamZaius>	0,2 - 1,2, 2,2
+
+
+for a 3x3 area on the grid
+
diff --git a/bin/TerrainDatafiles/Alien/alienworld.bmp b/bin/TerrainDatafiles/Alien/alienworld.bmp
new file mode 100644
index 0000000..0e2405e
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_0.bmp b/bin/TerrainDatafiles/Alien/alienworld_0_0.bmp
new file mode 100644
index 0000000..0a3afc0
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_0_0.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_0.r32 b/bin/TerrainDatafiles/Alien/alienworld_0_0.r32
new file mode 100644
index 0000000..299dc8c
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_0_0.r32 differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_1.bmp b/bin/TerrainDatafiles/Alien/alienworld_0_1.bmp
new file mode 100644
index 0000000..ec3b5d2
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_0_1.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_1.r32 b/bin/TerrainDatafiles/Alien/alienworld_0_1.r32
new file mode 100644
index 0000000..0dd41fc
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_0_1.r32 differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_2.bmp b/bin/TerrainDatafiles/Alien/alienworld_0_2.bmp
new file mode 100644
index 0000000..ce341e5
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_0_2.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_2.r32 b/bin/TerrainDatafiles/Alien/alienworld_0_2.r32
new file mode 100644
index 0000000..28df00a
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_0_2.r32 differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_0.bmp b/bin/TerrainDatafiles/Alien/alienworld_1_0.bmp
new file mode 100644
index 0000000..7fb3d96
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_1_0.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_0.r32 b/bin/TerrainDatafiles/Alien/alienworld_1_0.r32
new file mode 100644
index 0000000..99d5072
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_1_0.r32 differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_1.bmp b/bin/TerrainDatafiles/Alien/alienworld_1_1.bmp
new file mode 100644
index 0000000..bd5d31a
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_1_1.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_1.r32 b/bin/TerrainDatafiles/Alien/alienworld_1_1.r32
new file mode 100644
index 0000000..fdb3acf
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_1_1.r32 differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_2.bmp b/bin/TerrainDatafiles/Alien/alienworld_1_2.bmp
new file mode 100644
index 0000000..a5a719d
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_1_2.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_2.r32 b/bin/TerrainDatafiles/Alien/alienworld_1_2.r32
new file mode 100644
index 0000000..4e0155b
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_1_2.r32 differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_0.bmp b/bin/TerrainDatafiles/Alien/alienworld_2_0.bmp
new file mode 100644
index 0000000..a5c6792
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_2_0.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_0.r32 b/bin/TerrainDatafiles/Alien/alienworld_2_0.r32
new file mode 100644
index 0000000..0c12470
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_2_0.r32 differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_1.bmp b/bin/TerrainDatafiles/Alien/alienworld_2_1.bmp
new file mode 100644
index 0000000..e1f6376
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_2_1.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_1.r32 b/bin/TerrainDatafiles/Alien/alienworld_2_1.r32
new file mode 100644
index 0000000..96534b8
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_2_1.r32 differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_2.bmp b/bin/TerrainDatafiles/Alien/alienworld_2_2.bmp
new file mode 100644
index 0000000..eabdd93
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_2_2.bmp differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_2.r32 b/bin/TerrainDatafiles/Alien/alienworld_2_2.r32
new file mode 100644
index 0000000..20724c3
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_2_2.r32 differ
diff --git a/bin/TerrainDatafiles/Alien/alienworld_gray.bmp b/bin/TerrainDatafiles/Alien/alienworld_gray.bmp
new file mode 100644
index 0000000..9cc3699
Binary files /dev/null and b/bin/TerrainDatafiles/Alien/alienworld_gray.bmp differ
diff --git a/bin/TerrainFilters/demofilter.cs b/bin/TerrainFilters/demofilter.cs
new file mode 100644
index 0000000..1fdfc95
--- /dev/null
+++ b/bin/TerrainFilters/demofilter.cs
@@ -0,0 +1,50 @@
+using System;
+using libTerrain;
+using OpenSim.Terrain;
+
+/// <summary>
+/// A Demonstration Filter
+/// </summary>
+public class DemoFilter : ITerrainFilter
+{
+    public void Filter(Channel heightmap, string[] args)
+    {
+        Console.WriteLine("Hello world");
+    }
+
+    public string Register()
+    {
+        return "demofilter";
+    }
+
+    public string Help()
+    {
+        return "demofilter - Does nothing\n";
+    }
+}
+
+public class SineFilter : ITerrainFilter
+{
+    public void Filter(Channel heightmap, string[] args)
+    {
+        double max = heightmap.findMax();
+
+        for (int x = 0; x < heightmap.w; x++)
+        {
+            for (int y = 0; y < heightmap.h; y++)
+            {
+                heightmap.set(x,y,((Math.Sin(heightmap.get(x,y) * Convert.ToDouble(args[1])) + 1) / 2) * max);
+            }
+        }
+    }
+
+    public string Register()
+    {
+        return "sinefilter";
+    }
+
+    public string Help()
+    {
+        return "sinefilter <theta> - Converts the heightmap to the functional output of a sine wave";
+    }
+}
\ No newline at end of file
diff --git a/bin/assets/base_shape.dat b/bin/assets/base_shape.dat
new file mode 100644
index 0000000..920c775
--- /dev/null
+++ b/bin/assets/base_shape.dat
@@ -0,0 +1,105 @@
+LLWearable version 22
+Female Shape and Outfit 3 Shape
+Created by system from avatar's appearance.
+	permissions 0
+	{
+		base_mask	00082000
+		owner_mask	00082000
+		group_mask	00082000
+		everyone_mask	00082000
+		next_owner_mask	00082000
+		creator_id	3d924400-038e-6ad9-920b-cfbb9b40585c
+		owner_id	542ffb8e-8932-49b9-8664-58f53e442797
+		last_owner_id	3d924400-038e-6ad9-920b-cfbb9b40585c
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	0
+	}
+type 0
+parameters 82
+1 .21
+2 -.5
+4 -.11
+5 -.1
+6 -.3
+7 -.4
+8 -.5
+10 .7
+11 .34
+12 -.5
+13 0
+14 .04
+15 .58
+17 .56
+18 -.26
+19 -.73
+20 -.34
+21 -.01
+22 1
+23 -.5
+24 -.63
+25 .44
+27 .05
+33 -.24
+34 -.7
+35 -.16
+36 -.2
+37 -.98
+38 -.5
+80 0
+105 .07
+155 -.22
+157 0
+185 -1
+193 .86
+196 -.74
+505 .65
+506 .12
+507 -1.5
+515 0
+517 .16
+518 .8
+629 0
+637 0
+646 .4
+647 1
+649 .36
+650 .85
+652 .49
+653 -1
+656 0
+659 .65
+662 .5
+663 0
+664 0
+665 0
+675 -.15
+676 .26
+678 .28
+682 .27
+683 -.19
+684 -.09
+685 0
+690 .45
+692 .4
+693 -0
+753 -.5
+756 -.08
+758 .24
+759 .6
+760 .11
+764 -.38
+765 -.3
+769 .42
+773 .51
+795 .16
+796 .11
+799 .36
+841 0
+842 -.82
+879 0
+880 0
+textures 0
diff --git a/bin/assets/bricks.jp2 b/bin/assets/bricks.jp2
new file mode 100644
index 0000000..09c65ab
Binary files /dev/null and b/bin/assets/bricks.jp2 differ
diff --git a/bin/assets/granite.jp2 b/bin/assets/granite.jp2
new file mode 100644
index 0000000..b842eb8
Binary files /dev/null and b/bin/assets/granite.jp2 differ
diff --git a/bin/assets/hardwood.jp2 b/bin/assets/hardwood.jp2
new file mode 100644
index 0000000..8ae695e
Binary files /dev/null and b/bin/assets/hardwood.jp2 differ
diff --git a/bin/assets/map1.jp2 b/bin/assets/map1.jp2
new file mode 100644
index 0000000..cd2fd94
Binary files /dev/null and b/bin/assets/map1.jp2 differ
diff --git a/bin/assets/map_base.jp2 b/bin/assets/map_base.jp2
new file mode 100644
index 0000000..5ad1fd0
Binary files /dev/null and b/bin/assets/map_base.jp2 differ
diff --git a/bin/assets/plywood.jp2 b/bin/assets/plywood.jp2
new file mode 100644
index 0000000..1643ff1
Binary files /dev/null and b/bin/assets/plywood.jp2 differ
diff --git a/bin/assets/rocks.jp2 b/bin/assets/rocks.jp2
new file mode 100644
index 0000000..f0bbd89
Binary files /dev/null and b/bin/assets/rocks.jp2 differ
diff --git a/bin/assets/testpic2.jp2 b/bin/assets/testpic2.jp2
new file mode 100644
index 0000000..e6840e2
Binary files /dev/null and b/bin/assets/testpic2.jp2 differ
diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll
index c89788b..1715011 100644
Binary files a/bin/libsecondlife.dll and b/bin/libsecondlife.dll differ
-- 
cgit v1.1


From 3456d951d89fbc83f742d40ca8ca2a1a79d414eb Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 28 Jun 2007 13:13:17 +0000
Subject: Imported the scripting changes, so now should be up to date with
 sugilite.

---
 OpenGridServices.build                             | 100 +++++++
 OpenGridServices.sln                               | 127 +++++----
 OpenSim.build                                      | 142 ++++++++++
 OpenSim.sln                                        | 307 +++++++++++++--------
 .../OpenSim.Framework.Communications.csproj        |   6 +-
 .../OpenSim.Framework.Communications.dll.build     |  47 ++++
 .../Console/OpenSim.Framework.Console.csproj       |   4 +-
 .../Console/OpenSim.Framework.Console.dll.build    |  42 +++
 .../Data.DB4o/OpenSim.Framework.Data.DB4o.csproj   |   4 +-
 .../OpenSim.Framework.Data.DB4o.dll.build          |  47 ++++
 .../OpenSim.Framework.Data.MSSQL.dll.build         |  45 +++
 .../Data.MySQL/OpenSim.Framework.Data.MySQL.csproj |  10 +-
 .../OpenSim.Framework.Data.MySQL.dll.build         |  49 ++++
 .../OpenSim.Framework.Data.SQLite.csproj           |   4 +-
 .../OpenSim.Framework.Data.SQLite.dll.build        |  46 +++
 .../Framework/Data/OpenSim.Framework.Data.csproj   |  12 +-
 .../Data/OpenSim.Framework.Data.dll.build          |  50 ++++
 OpenSim/Framework/General/LLSDHelpers.cs           | 246 -----------------
 OpenSim/Framework/General/OpenSim.Framework.csproj |  63 ++---
 .../Framework/General/OpenSim.Framework.dll.build  |  80 ++++++
 .../OpenSim.Framework.GenericConfig.Xml.dll.build  |  42 +++
 .../Servers/OpenSim.Framework.Servers.csproj       |   8 +-
 .../Servers/OpenSim.Framework.Servers.dll.build    |  48 ++++
 .../OpenSim.Framework.UserManagement.csproj        |   4 +-
 .../OpenSim.Framework.UserManagement.dll.build     |  50 ++++
 .../AssetServer/OpenSim.Grid.AssetServer.csproj    |   4 +-
 .../AssetServer/OpenSim.Grid.AssetServer.exe.build |  49 ++++
 .../OpenSim.Grid.Framework.Manager.dll.build       |  44 +++
 .../OpenSim.Grid.GridServer.Config.dll.build       |  46 +++
 .../GridServer/OpenSim.Grid.GridServer.exe.build   |  52 ++++
 .../OpenSim.Grid.UserServer.Config.dll.build       |  46 +++
 .../UserServer/OpenSim.Grid.UserServer.exe.build   |  52 ++++
 OpenSim/Region/Application/OpenSim.csproj          |   4 +-
 OpenSim/Region/Application/OpenSim.exe.build       |  59 ++++
 .../Region/Caches/OpenSim.Region.Caches.dll.build  |  43 +++
 .../OpenSim.Region.Capabilities.csproj             |  26 +-
 .../OpenSim.Region.Capabilities.dll.build          |  56 ++++
 .../ClientStack/OpenSim.Region.ClientStack.csproj  |  12 +-
 .../OpenSim.Region.ClientStack.dll.build           |  60 ++++
 .../Communications/Local/CommunicationsLocal.cs    |   1 -
 .../OpenSim.Region.Communications.Local.csproj     |   6 +-
 .../OpenSim.Region.Communications.Local.dll.build  |  48 ++++
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj |   6 +-
 .../OpenSim.Region.Communications.OGS1.dll.build   |  53 ++++
 .../Environment/OpenSim.Region.Environment.csproj  |  42 +--
 .../OpenSim.Region.Environment.dll.build           |  75 +++++
 OpenSim/Region/Environment/Scenes/Entity.cs        |   3 +-
 OpenSim/Region/Environment/Scenes/Scene.cs         |  30 +-
 OpenSim/Region/Environment/Scenes/SceneBase.cs     |   1 -
 .../Scenes/scripting/Engines/CSharpScriptEngine.cs | 104 +++++++
 .../Scenes/scripting/Engines/JScriptEngine.cs      | 104 +++++++
 .../Scenes/scripting/Engines/JSharpScriptEngine.cs | 104 +++++++
 .../Environment/Scenes/scripting/IScriptContext.cs |  40 ---
 .../Environment/Scenes/scripting/IScriptEntity.cs  |  46 ---
 .../Environment/Scenes/scripting/IScriptHandler.cs | 126 ---------
 .../Region/Environment/Scenes/scripting/Script.cs  |  53 ----
 .../Environment/Scenes/scripting/ScriptFactory.cs  |  35 ---
 .../Environment/Scenes/scripting/ScriptInfo.cs     |  58 ++++
 .../Environment/Scenes/scripting/ScriptManager.cs  |  99 +++++++
 .../Scenes/scripting/Scripts/FollowRandomAvatar.cs |  64 -----
 .../Region/Examples/SimpleApp/SimpleApp.exe.build  |  54 ++++
 .../OpenSim.Region.GridInterfaces.Local.dll.build  |  45 +++
 .../OpenSim.Region.GridInterfaces.Remote.dll.build |  45 +++
 ...Sim.Region.Physics.BasicPhysicsPlugin.dll.build |  42 +++
 .../OpenSim.Region.Physics.Manager.dll.build       |  47 ++++
 .../OpenSim.Region.Physics.OdePlugin.dll.build     |  43 +++
 .../OpenSim.Region.Physics.PhysXPlugin.dll.build   |  43 +++
 ...Region.Storage.LocalStorageBerkeleyDB.dll.build |  46 +++
 .../OpenSim.Region.Storage.LocalStorageDb4o.csproj |   6 +-
 ...enSim.Region.Storage.LocalStorageDb4o.dll.build |  48 ++++
 ...Sim.Region.Storage.LocalStorageSQLite.dll.build |  46 +++
 .../OpenSim.Region.Terrain.BasicTerrain.csproj     |   4 +-
 .../OpenSim.Region.Terrain.BasicTerrain.dll.build  |  47 ++++
 .../Region/Terrain.BasicTerrain/TerrainFilter.cs   |  29 +-
 Prebuild/src/Prebuild.csproj                       |  56 ++--
 Prebuild/src/Prebuild.exe.build                    |  34 +--
 prebuild.xml                                       |   8 +-
 77 files changed, 2907 insertions(+), 970 deletions(-)
 create mode 100644 OpenGridServices.build
 create mode 100644 OpenSim.build
 create mode 100644 OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
 create mode 100644 OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
 create mode 100644 OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
 create mode 100644 OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
 create mode 100644 OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
 create mode 100644 OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
 create mode 100644 OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
 delete mode 100644 OpenSim/Framework/General/LLSDHelpers.cs
 create mode 100644 OpenSim/Framework/General/OpenSim.Framework.dll.build
 create mode 100644 OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build
 create mode 100644 OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
 create mode 100644 OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
 create mode 100644 OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
 create mode 100644 OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
 create mode 100644 OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
 create mode 100644 OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
 create mode 100644 OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
 create mode 100644 OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
 create mode 100644 OpenSim/Region/Application/OpenSim.exe.build
 create mode 100644 OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
 create mode 100644 OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
 create mode 100644 OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
 create mode 100644 OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
 create mode 100644 OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
 create mode 100644 OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
 delete mode 100644 OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
 delete mode 100644 OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
 delete mode 100644 OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
 delete mode 100644 OpenSim/Region/Environment/Scenes/scripting/Script.cs
 delete mode 100644 OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
 delete mode 100644 OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
 create mode 100644 OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
 create mode 100644 OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build
 create mode 100644 OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build
 create mode 100644 OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
 create mode 100644 OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
 create mode 100644 OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
 create mode 100644 OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
 create mode 100644 OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build
 create mode 100644 OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
 create mode 100644 OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
 create mode 100644 OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build

diff --git a/OpenGridServices.build b/OpenGridServices.build
new file mode 100644
index 0000000..2efeac9
--- /dev/null
+++ b/OpenGridServices.build
@@ -0,0 +1,100 @@
+<?xml version="1.0" ?>
+<project name="OpenGridServices" default="build">
+    <echo message="Using '${nant.settings.currentframework}' Framework"/>
+
+    <property name="bin.dir" value="bin" />
+    <property name="obj.dir" value="obj" />
+    <property name="doc.dir" value="doc" />
+    <property name="project.main.dir" value="${project::get-base-directory()}" />
+
+    <target name="Debug" description="">
+        <property name="project.config" value="Debug" />
+        <property name="build.debug" value="true" />
+    </target>
+
+    <property name="project.config" value="Release" />
+
+    <target name="Release" description="">
+        <property name="project.config" value="Release" />
+        <property name="build.debug" value="false" />
+    </target>
+
+    <target name="net-1.1" description="Sets framework to .NET 1.1">
+        <property name="nant.settings.currentframework" value="net-1.1" />
+    </target>
+
+    <target name="net-2.0" description="Sets framework to .NET 2.0">
+        <property name="nant.settings.currentframework" value="net-2.0" />
+    </target>
+
+    <target name="mono-2.0" description="Sets framework to mono 2.0">
+        <property name="nant.settings.currentframework" value="mono-2.0" />
+    </target>
+
+    <target name="mono-1.0" description="Sets framework to mono 1.0">
+        <property name="nant.settings.currentframework" value="mono-1.0" />
+    </target>
+
+    <target name="init" description="">
+        <call target="${project.config}" />
+        <sysinfo />
+        <echo message="Platform ${sys.os.platform}" />
+        <property name="build.dir" value="${bin.dir}/${project.config}" />
+    </target>
+
+    <target name="clean" description="">
+        <echo message="Deleting all builds from all configurations" />
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+        <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build" target="clean" />
+        <nant buildfile="OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build" target="clean" />
+        <nant buildfile="OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build" target="clean" />
+        <nant buildfile="OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build" target="clean" />
+    </target>
+
+    <target name="build" depends="init" description="">
+        <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build" target="build" />
+        <nant buildfile="OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build" target="build" />
+        <nant buildfile="OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build" target="build" />
+        <nant buildfile="OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build" target="build" />
+        <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="build" />
+        <nant buildfile="OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build" target="build" />
+        <nant buildfile="OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build" target="build" />
+        <nant buildfile="OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build" target="build" />
+    </target>
+
+    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
+
+    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
+
+    <target name="package" depends="clean, doc" description="Builds all" />
+
+    <target name="doc" depends="build-release">
+        <echo message="Generating all documentation from all builds" />
+        <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build" target="doc" />
+        <nant buildfile="OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build" target="doc" />
+        <nant buildfile="OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build" target="doc" />
+        <nant buildfile="OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build" target="doc" />
+    </target>
+
+</project>
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 5f47b6b..2343bc0 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.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.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,61 +25,72 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-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
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08F87229-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
+    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
+    ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenSim.build b/OpenSim.build
new file mode 100644
index 0000000..5803b42
--- /dev/null
+++ b/OpenSim.build
@@ -0,0 +1,142 @@
+<?xml version="1.0" ?>
+<project name="OpenSim" default="build">
+    <echo message="Using '${nant.settings.currentframework}' Framework"/>
+
+    <property name="bin.dir" value="bin" />
+    <property name="obj.dir" value="obj" />
+    <property name="doc.dir" value="doc" />
+    <property name="project.main.dir" value="${project::get-base-directory()}" />
+
+    <target name="Debug" description="">
+        <property name="project.config" value="Debug" />
+        <property name="build.debug" value="true" />
+    </target>
+
+    <property name="project.config" value="Release" />
+
+    <target name="Release" description="">
+        <property name="project.config" value="Release" />
+        <property name="build.debug" value="false" />
+    </target>
+
+    <target name="net-1.1" description="Sets framework to .NET 1.1">
+        <property name="nant.settings.currentframework" value="net-1.1" />
+    </target>
+
+    <target name="net-2.0" description="Sets framework to .NET 2.0">
+        <property name="nant.settings.currentframework" value="net-2.0" />
+    </target>
+
+    <target name="mono-2.0" description="Sets framework to mono 2.0">
+        <property name="nant.settings.currentframework" value="mono-2.0" />
+    </target>
+
+    <target name="mono-1.0" description="Sets framework to mono 1.0">
+        <property name="nant.settings.currentframework" value="mono-1.0" />
+    </target>
+
+    <target name="init" description="">
+        <call target="${project.config}" />
+        <sysinfo />
+        <echo message="Platform ${sys.os.platform}" />
+        <property name="build.dir" value="${bin.dir}/${project.config}" />
+    </target>
+
+    <target name="clean" description="">
+        <echo message="Deleting all builds from all configurations" />
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+        <nant buildfile="OpenSim/Region/Application/OpenSim.exe.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/General/OpenSim.Framework.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build" target="clean" />
+        <nant buildfile="OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build" target="clean" />
+    </target>
+
+    <target name="build" depends="init" description="">
+        <nant buildfile="OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/General/OpenSim.Framework.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="build" />
+        <nant buildfile="OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build" target="build" />
+        <nant buildfile="OpenSim/Region/Application/OpenSim.exe.build" target="build" />
+        <nant buildfile="OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build" target="build" />
+    </target>
+
+    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
+
+    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
+
+    <target name="package" depends="clean, doc" description="Builds all" />
+
+    <target name="doc" depends="build-release">
+        <echo message="Generating all documentation from all builds" />
+        <nant buildfile="OpenSim/Region/Application/OpenSim.exe.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/General/OpenSim.Framework.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build" target="doc" />
+        <nant buildfile="OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build" target="doc" />
+    </target>
+
+</project>
diff --git a/OpenSim.sln b/OpenSim.sln
index 66e79d2..68465d8 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", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
@@ -53,117 +53,196 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-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
-		{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
-		{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
-		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{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
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24B12448-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
+    ({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).6 = ({C74E4A30-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).7 = ({2CC71860-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).8 = ({586E2916-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).10 = ({DC3698B2-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).11 = ({BFB5D807-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).12 = ({4806E378-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).13 = ({DCBA491C-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).14 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).15 = ({C9E0F891-0000-0000-0000-000000000000})
+    ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000})
+    ({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({39038E85-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({39038E85-0000-0000-0000-000000000000}).2 = ({2CC71860-0000-0000-0000-000000000000})
+    ({39038E85-0000-0000-0000-000000000000}).3 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).6 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).7 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).8 = ({C9E0F891-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).5 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).10 = ({39038E85-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).11 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).12 = ({C9E0F891-0000-0000-0000-000000000000})
+    ({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000})
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {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
+    {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
+    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {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
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 0ee62e9..31ab172 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,16 +86,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IUserServices.cs">
+    <Compile Include="CommunicationsManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="IGridServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CommunicationsManager.cs">
+    <Compile Include="IInterRegionCommunications.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IInterRegionCommunications.cs">
+    <Compile Include="IUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
new file mode 100644
index 0000000..52d29f6
--- /dev/null
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.Communications" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="CommunicationsManager.cs" />
+                <include name="IGridServices.cs" />
+                <include name="IInterRegionCommunications.cs" />
+                <include name="IUserServices.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index c02a506..f3dcec5 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -69,10 +69,10 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LogBase.cs">
+    <Compile Include="ConsoleCallbacksBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ConsoleCallbacksBase.cs">
+    <Compile Include="LogBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MainLog.cs">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
new file mode 100644
index 0000000..eb40c0d
--- /dev/null
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.Console" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="ConsoleCallbacksBase.cs" />
+                <include name="LogBase.cs" />
+                <include name="MainLog.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index f6e8311..b09cecf 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DB4oUserData.cs">
+    <Compile Include="DB4oGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="DB4oManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DB4oGridData.cs">
+    <Compile Include="DB4oUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
new file mode 100644
index 0000000..f124eb5
--- /dev/null
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.Data.DB4o" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="DB4oGridData.cs" />
+                <include name="DB4oManager.cs" />
+                <include name="DB4oUserData.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
new file mode 100644
index 0000000..a2b2e3d
--- /dev/null
+++ b/OpenSim/Framework/Data.MSSQL/OpenSim.Framework.Data.MSSQL.dll.build
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.Data.MSSQL" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.Data.MSSQL" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="MSSQLGridData.cs" />
+                <include name="MSSQLManager.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 09a32b5..62e3887 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MySQLInventoryData.cs">
+    <Compile Include="MySQLGridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLUserData.cs">
+    <Compile Include="MySQLInventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLManager.cs">
+    <Compile Include="MySQLLogData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLLogData.cs">
+    <Compile Include="MySQLManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLGridData.cs">
+    <Compile Include="MySQLUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
new file mode 100644
index 0000000..594ec52
--- /dev/null
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.Data.MySQL" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="MySQLGridData.cs" />
+                <include name="MySQLInventoryData.cs" />
+                <include name="MySQLLogData.cs" />
+                <include name="MySQLManager.cs" />
+                <include name="MySQLUserData.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/MySql.Data.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index dab22ea..4ba24f1 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
new file mode 100644
index 0000000..e28d0a6
--- /dev/null
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.Data.SQLite" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="SQLiteGridData.cs" />
+                <include name="SQLiteManager.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="../../../bin/System.Data.SQLite.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index 47b9ba3..dcafbcd 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -78,15 +78,9 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ReservationData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="GridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="ILogData.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -96,6 +90,12 @@
     <Compile Include="InventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="ReservationData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimProfileData.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="UserData.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
new file mode 100644
index 0000000..aefb02b
--- /dev/null
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -0,0 +1,50 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.Data" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="GridData.cs" />
+                <include name="ILogData.cs" />
+                <include name="IniConfig.cs" />
+                <include name="InventoryData.cs" />
+                <include name="ReservationData.cs" />
+                <include name="SimProfileData.cs" />
+                <include name="UserData.cs" />
+                <include name="UserProfileData.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/General/LLSDHelpers.cs b/OpenSim/Framework/General/LLSDHelpers.cs
deleted file mode 100644
index 051520c..0000000
--- a/OpenSim/Framework/General/LLSDHelpers.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Xml;
-using libsecondlife;
-
-namespace OpenSim.Framework
-{
-    public class LLSDHelpers
-    {
-        public static string SerialiseLLSDReply(object obj)
-        {
-            StringWriter sw = new StringWriter();
-            XmlTextWriter writer = new XmlTextWriter(sw);
-            writer.Formatting = Formatting.None;
-            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
-            LLSDHelpers.SerializeLLSDType(writer, obj);
-            writer.WriteEndElement();
-            writer.Close();
-            return sw.ToString();
-        }
-
-        public static void SerializeLLSDType(XmlTextWriter writer, object obj)
-        {
-            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
-            if (llsdattributes.Length > 0)
-            {
-                switch (llsdattributes[0].ObjectType)
-                {
-                    case "MAP":
-                        writer.WriteStartElement(String.Empty, "map", String.Empty);
-                        System.Reflection.FieldInfo[] fields = myType.GetFields();
-                        for (int i = 0; i < fields.Length; i++)
-                        {
-                            object fieldValue = fields[i].GetValue(obj);
-                            LLSDType[] fieldAttributes = (LLSDType[])fieldValue.GetType().GetCustomAttributes(typeof(LLSDType), false);
-                            if (fieldAttributes.Length > 0)
-                            {
-                                writer.WriteStartElement(String.Empty, "key", String.Empty);
-                                writer.WriteString(fields[i].Name);
-                                writer.WriteEndElement();
-                                SerializeLLSDType(writer, fieldValue);
-                            }
-                            else
-                            {
-                                //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
-                                writer.WriteStartElement(String.Empty, "key", String.Empty);
-                                writer.WriteString(fields[i].Name);
-                                writer.WriteEndElement();
-                                LLSD.LLSDWriteOne(writer, fieldValue);
-                            }
-                        }
-                        writer.WriteEndElement();
-                        break;
-                    case "ARRAY":
-                        // LLSDArray arrayObject = obj as LLSDArray;
-                        // ArrayList a = arrayObject.Array;
-                        ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
-                        writer.WriteStartElement(String.Empty, "array", String.Empty);
-                        foreach (object item in a)
-                        {
-                            SerializeLLSDType(writer, item);
-                        }
-                        writer.WriteEndElement();
-                        break;
-                }
-            }
-            else
-            {
-                LLSD.LLSDWriteOne(writer, obj);
-            }
-        }
-
-        public static object DeserialiseLLSDMap(Hashtable llsd, object obj)
-        {
-            Type myType = obj.GetType();
-            LLSDType[] llsdattributes = (LLSDType[])myType.GetCustomAttributes(typeof(LLSDType), false);
-            if (llsdattributes.Length > 0)
-            {
-                switch (llsdattributes[0].ObjectType)
-                {
-                    case "MAP":
-                        IDictionaryEnumerator enumerator = llsd.GetEnumerator();
-                        while (enumerator.MoveNext())
-                        {
-                            System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
-                            if (field != null)
-                            {
-                                if (enumerator.Value is Hashtable)
-                                {
-                                    object fieldValue = field.GetValue(obj);
-                                    DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
-                                }
-                                else if (enumerator.Value is ArrayList)
-                                {
-                                    object fieldValue = field.GetValue(obj);
-                                    fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
-                                    //TODO
-                                    // the LLSD map/array types in the array need to be deserialised
-                                    // but first we need to know the right class to deserialise them into. 
-                                }
-                                else
-                                {
-                                    field.SetValue(obj, enumerator.Value);
-                                }
-                            }
-                        }
-                        break;
-                }
-            }
-            return obj;
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDMapLayerResponse
-    {
-        public LLSDMapRequest AgentData = new LLSDMapRequest();
-        public LLSDArray LayerData = new LLSDArray();
-
-        public LLSDMapLayerResponse()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDCapsDetails
-    {
-        public string MapLayer = "";
-        public string NewFileAgentInventory = "";
-        //public string EventQueueGet = "";
-
-        public LLSDCapsDetails()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDMapLayer
-    {
-        public int Left = 0;
-        public int Right = 0;
-        public int Top = 0;
-        public int Bottom = 0;
-        public LLUUID ImageID = LLUUID.Zero;
-
-        public LLSDMapLayer()
-        {
-           
-        }
-    }
-
-    [LLSDType("ARRAY")]
-    public class LLSDArray
-    {
-        public ArrayList Array = new ArrayList();
-
-        public LLSDArray()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDMapRequest
-    {
-        public int Flags = 0;
-
-        public LLSDMapRequest()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDUploadReply
-    {
-        public string new_asset = "";
-        public LLUUID new_inventory_item = LLUUID.Zero;
-        public string state = "";
-
-        public LLSDUploadReply()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDCapEvent
-    {
-        public int id = 0;
-        public LLSDArray events = new LLSDArray();
-
-        public LLSDCapEvent()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDEmpty
-    {
-        public LLSDEmpty()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDTest
-    {
-        public int Test1 = 20;
-        public int Test2 = 10;
-
-        public LLSDTest()
-        {
-
-        }
-    }
-
-
-    [AttributeUsage(AttributeTargets.Class)]
-    public class LLSDType : Attribute
-    {
-        private string myType;
-
-        public LLSDType(string type)
-        {
-            myType = type;
-
-        }
-
-        public string ObjectType
-        {
-            get
-            {
-                return myType;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 3e77f1e..d18e583 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -91,115 +91,112 @@
     <Compile Include="AgentInventory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
+    <Compile Include="AuthenticateSessionBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AuthenticateSessionBase.cs">
+    <Compile Include="BlockingQueue.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Logger.cs">
+    <Compile Include="IRegionCommsListener.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDHelpers.cs">
+    <Compile Include="Logger.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Remoting.cs">
+    <Compile Include="LoginService.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionCommsListener.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LoginService.cs">
+    <Compile Include="Remoting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BlockingQueue.cs">
+    <Compile Include="SimProfile.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UserProfile.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IRegionCommsListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SimProfile.cs">
+    <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\AuthenticateResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Interfaces\IAssetServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Interfaces\IClientAPI.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
+    <Compile Include="Interfaces\IUserServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
+    <Compile Include="Interfaces\IWorld.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\Config\IGenericConfig.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\Config\IGridConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Interfaces\Config\IUserConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
+    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NeighbourInfo.cs">
+    <Compile Include="Types\AgentCiruitData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NetworkServersInfo.cs">
+    <Compile Include="Types\AgentWearable.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionHandle.cs">
+    <Compile Include="Types\AssetBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionInfo.cs">
+    <Compile Include="Types\AssetLandmark.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ParcelData.cs">
+    <Compile Include="Types\AssetStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentWearable.cs">
+    <Compile Include="Types\EstateSettings.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\PrimData.cs">
+    <Compile Include="Types\Login.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Types\MapBlockData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetStorage.cs">
+    <Compile Include="Types\NeighbourInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\EstateSettings.cs">
+    <Compile Include="Types\NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
+    <Compile Include="Types\ParcelData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\Login.cs">
+    <Compile Include="Types\PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
+    <Compile Include="Types\RegionHandle.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetBase.cs">
+    <Compile Include="Types\RegionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
new file mode 100644
index 0000000..04e3382
--- /dev/null
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -0,0 +1,80 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AgentInventory.cs" />
+                <include name="AuthenticateSessionBase.cs" />
+                <include name="BlockingQueue.cs" />
+                <include name="IRegionCommsListener.cs" />
+                <include name="Logger.cs" />
+                <include name="LoginService.cs" />
+                <include name="RegionCommsListener.cs" />
+                <include name="Remoting.cs" />
+                <include name="SimProfile.cs" />
+                <include name="UserProfile.cs" />
+                <include name="Util.cs" />
+                <include name="Interfaces/AuthenticateResponse.cs" />
+                <include name="Interfaces/IAssetServer.cs" />
+                <include name="Interfaces/IClientAPI.cs" />
+                <include name="Interfaces/ILocalStorage.cs" />
+                <include name="Interfaces/IUserServer.cs" />
+                <include name="Interfaces/IWorld.cs" />
+                <include name="Interfaces/Config/IGenericConfig.cs" />
+                <include name="Interfaces/Config/IGridConfig.cs" />
+                <include name="Interfaces/Config/IUserConfig.cs" />
+                <include name="Interfaces/Scripting/IScriptAPI.cs" />
+                <include name="Interfaces/Scripting/IScriptEngine.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Types/AgentCiruitData.cs" />
+                <include name="Types/AgentWearable.cs" />
+                <include name="Types/AssetBase.cs" />
+                <include name="Types/AssetLandmark.cs" />
+                <include name="Types/AssetStorage.cs" />
+                <include name="Types/EstateSettings.cs" />
+                <include name="Types/Login.cs" />
+                <include name="Types/MapBlockData.cs" />
+                <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/NetworkServersInfo.cs" />
+                <include name="Types/ParcelData.cs" />
+                <include name="Types/PrimData.cs" />
+                <include name="Types/RegionHandle.cs" />
+                <include name="Types/RegionInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build
new file mode 100644
index 0000000..a4617cc
--- /dev/null
+++ b/OpenSim/Framework/GenericConfig/Xml/OpenSim.Framework.GenericConfig.Xml.dll.build
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.GenericConfig.Xml" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.GenericConfig.Xml" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="XmlConfig.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
index 5262224..399f456 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -93,16 +93,16 @@
     <Compile Include="BaseHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IRestHandler.cs">
+    <Compile Include="CheckSumServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcMethod.cs">
+    <Compile Include="IRestHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CheckSumServer.cs">
+    <Compile Include="UDPServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServerBase.cs">
+    <Compile Include="XmlRpcMethod.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
new file mode 100644
index 0000000..7401b07
--- /dev/null
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -0,0 +1,48 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.Servers" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="BaseHttpServer.cs" />
+                <include name="CheckSumServer.cs" />
+                <include name="IRestHandler.cs" />
+                <include name="UDPServerBase.cs" />
+                <include name="XmlRpcMethod.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
index 60c4b2f..02aa3f3 100644
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
@@ -108,10 +108,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="UserManagerBase.cs">
+    <Compile Include="LoginResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LoginResponse.cs">
+    <Compile Include="UserManagerBase.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
new file mode 100644
index 0000000..3ea339b
--- /dev/null
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
@@ -0,0 +1,50 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework.UserManagement" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="LoginResponse.cs" />
+                <include name="UserManagerBase.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index 945b7a5..caebca3 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -98,10 +98,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs">
+    <Compile Include="AssetHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AssetHttpServer.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
new file mode 100644
index 0000000..88724f6
--- /dev/null
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Grid.AssetServer" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+            <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssetHttpServer.cs" />
+                <include name="Main.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
new file mode 100644
index 0000000..8e9f026
--- /dev/null
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Grid.Framework.Manager" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Grid.Framework.Manager" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="GridManagementAgent.cs" />
+                <include name="GridServerManager.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="System.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
new file mode 100644
index 0000000..cdf09e1
--- /dev/null
+++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Grid.GridServer.Config" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Grid.GridServer.Config" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="DbGridConfig.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
new file mode 100644
index 0000000..4cadf1d
--- /dev/null
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
@@ -0,0 +1,52 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Grid.GridServer" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+            <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="GridManager.cs" />
+                <include name="Main.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../bin/OpenSim.Grid.Framework.Manager.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
new file mode 100644
index 0000000..a427765
--- /dev/null
+++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Grid.UserServer.Config" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Grid.UserServer.Config" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="DbUserConfig.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
new file mode 100644
index 0000000..50c9788
--- /dev/null
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
@@ -0,0 +1,52 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Grid.UserServer" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+            <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="Main.cs" />
+                <include name="UserManager.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 3801067..5cefa96 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -167,10 +167,10 @@
     <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="VersionInfo.cs">
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="VersionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
new file mode 100644
index 0000000..74eee5b
--- /dev/null
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<project name="OpenSim" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+            <resources prefix="OpenSim" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="Application.cs" />
+                <include name="OpenSimMain.cs" />
+                <include name="VersionInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Communications.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
+                <include name="../../../bin/OpenSim.Region.Caches.dll" />
+                <include name="../../../bin/OpenSim.Region.ClientStack.dll" />
+                <include name="../../../bin/OpenSim.Region.Communications.Local.dll" />
+                <include name="../../../bin/OpenSim.Region.Communications.OGS1.dll" />
+                <include name="../../../bin/OpenSim.Region.Environment.dll" />
+                <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" />
+                <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
new file mode 100644
index 0000000..3ca89e8
--- /dev/null
+++ b/OpenSim/Region/Caches/OpenSim.Region.Caches.dll.build
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Caches" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Caches" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssetCache.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 0d8fac5..4667d52 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -62,14 +62,6 @@
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OpenSim.Framework.Types" >
-      <HintPath>OpenSim.Framework.Types.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.Framework.Utilities" >
-      <HintPath>OpenSim.Framework.Utilities.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
@@ -104,15 +96,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="LLSDCapsDetails.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDMapRequest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LLSDMapLayerResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Caps.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -122,6 +105,9 @@
     <Compile Include="LLSDCapEvent.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="LLSDCapsDetails.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="LLSDEmpty.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -131,6 +117,12 @@
     <Compile Include="LLSDMapLayer.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="LLSDMapLayerResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="LLSDTest.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
new file mode 100644
index 0000000..a091b5c
--- /dev/null
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -0,0 +1,56 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Capabilities" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="Caps.cs" />
+                <include name="LLSDArray.cs" />
+                <include name="LLSDCapEvent.cs" />
+                <include name="LLSDCapsDetails.cs" />
+                <include name="LLSDEmpty.cs" />
+                <include name="LLSDHelpers.cs" />
+                <include name="LLSDMapLayer.cs" />
+                <include name="LLSDMapLayerResponse.cs" />
+                <include name="LLSDMapRequest.cs" />
+                <include name="LLSDTest.cs" />
+                <include name="LLSDType.cs" />
+                <include name="LLSDUploadReply.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../bin/OpenSim.Region.Caches.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 40cd4f0..3093eb0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,19 +122,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClientView.AgentAssetUpload.cs">
+    <Compile Include="ClientStackNetworkHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientStackNetworkHandler.cs">
+    <Compile Include="ClientView.AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="PacketServer.cs">
+    <Compile Include="ClientView.API.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.PacketHandlers.cs">
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ClientView.ProcessPackets.cs">
@@ -143,7 +143,7 @@
     <Compile Include="ClientViewBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionApplicationBase.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
new file mode 100644
index 0000000..f76a4c8
--- /dev/null
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -0,0 +1,60 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.ClientStack" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="ClientStackNetworkHandler.cs" />
+                <include name="ClientView.AgentAssetUpload.cs" />
+                <include name="ClientView.API.cs" />
+                <include name="ClientView.cs" />
+                <include name="ClientView.PacketHandlers.cs" />
+                <include name="ClientView.ProcessPackets.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="PacketServer.cs" />
+                <include name="RegionApplicationBase.cs" />
+                <include name="UDPServer.cs" />
+                <include name="Assets/InventoryCache.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../bin/OpenSim.Region.Caches.dll" />
+                <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" />
+                <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 8837bdb..f5aa8ae 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Communications;
 
-
 namespace OpenSim.Region.Communications.Local
 {
     public class CommunicationsLocal : CommunicationsManager
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index f9f6b7d..0a15a49 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="LocalUserServices.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="CommunicationsLocal.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="LocalUserServices.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
new file mode 100644
index 0000000..3cac9d3
--- /dev/null
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -0,0 +1,48 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Communications.Local" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="CommunicationsLocal.cs" />
+                <include name="LocalBackEndServices.cs" />
+                <include name="LocalUserServices.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 1aa7019..8cc5641 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,16 +116,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="OGSUserServices.cs">
+    <Compile Include="GridCommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="GridCommsManager.cs">
+    <Compile Include="OGS1GridServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGSInterSimComms.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGS1GridServices.cs">
+    <Compile Include="OGSUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
new file mode 100644
index 0000000..21bb15c
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Communications.OGS1" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="GridCommsManager.cs" />
+                <include name="OGS1GridServices.cs" />
+                <include name="OGSInterSimComms.cs" />
+                <include name="OGSUserServices.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Data.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Runtime.Remoting.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 6f07969..efde96c 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -70,6 +70,10 @@
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Microsoft.JScript" >
+      <HintPath>Microsoft.JScript.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
@@ -78,6 +82,10 @@
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="VJSharpCodeProvider" >
+      <HintPath>VJSharpCodeProvider.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="XMLRPC.dll" >
       <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
@@ -152,55 +160,55 @@
     <Compile Include="Scenes\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.Scripting.cs">
+    <Compile Include="Scenes\IScenePresenceBody.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
+    <Compile Include="Scenes\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneEvents.cs">
+    <Compile Include="Scenes\Scene.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Animations.cs">
+    <Compile Include="Scenes\Scene.Scripting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.PacketHandlers.cs">
+    <Compile Include="Scenes\SceneBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneObject.cs">
+    <Compile Include="Scenes\SceneEvents.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Primitive.cs">
+    <Compile Include="Scenes\SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
+    <Compile Include="Scenes\ScenePresence.Animations.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\ScenePresence.Body.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.cs">
+    <Compile Include="Scenes\ScenePresence.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\IScriptHandler.cs">
+    <Compile Include="Scenes\scripting\Script.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\ScriptFactory.cs">
+    <Compile Include="Scenes\scripting\ScriptInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\IScriptContext.cs">
+    <Compile Include="Scenes\scripting\ScriptManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Script.cs">
+    <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\IScriptEntity.cs">
+    <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs">
+    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
new file mode 100644
index 0000000..da73c8c
--- /dev/null
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -0,0 +1,75 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Environment" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="EstateManager.cs" />
+                <include name="ParcelManager.cs" />
+                <include name="RegionManager.cs" />
+                <include name="Scenes/Entity.cs" />
+                <include name="Scenes/IScenePresenceBody.cs" />
+                <include name="Scenes/Primitive.cs" />
+                <include name="Scenes/Scene.cs" />
+                <include name="Scenes/Scene.PacketHandlers.cs" />
+                <include name="Scenes/Scene.Scripting.cs" />
+                <include name="Scenes/SceneBase.cs" />
+                <include name="Scenes/SceneEvents.cs" />
+                <include name="Scenes/SceneObject.cs" />
+                <include name="Scenes/ScenePresence.Animations.cs" />
+                <include name="Scenes/ScenePresence.Body.cs" />
+                <include name="Scenes/ScenePresence.cs" />
+                <include name="Scenes/scripting/Script.cs" />
+                <include name="Scenes/scripting/ScriptInfo.cs" />
+                <include name="Scenes/scripting/ScriptManager.cs" />
+                <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
+                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
+                <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
+                <include name="Microsoft.JScript.dll" />
+                <include name="../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../bin/OpenSim.Framework.Communications.dll" />
+                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../bin/OpenSim.Region.Caches.dll" />
+                <include name="../../../bin/OpenSim.Region.Capabilities.dll" />
+                <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" />
+                <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="VJSharpCodeProvider.dll" />
+                <include name="../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
index bbba34d..db5070d 100644
--- a/OpenSim/Region/Environment/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -31,11 +31,10 @@ using System.Text;
 using Axiom.MathLib;
 using OpenSim.Physics.Manager;
 using libsecondlife;
-using OpenSim.Region.Environment.Scripting;
 
 namespace OpenSim.Region.Environment.Scenes
 {
-    public abstract class Entity : IScriptReadonlyEntity
+    public abstract class Entity
     {
         public libsecondlife.LLUUID uuid;
         public Quaternion rotation;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ff54efa..b345c0c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -39,12 +39,14 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scripting;
 using OpenSim.Region.Terrain;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Caches;
 using OpenSim.Region.Environment;
 using OpenSim.Framework.Servers;
+using OpenSim.Scripting;
+using OpenSim.Region.Capabilities;
+using Caps = OpenSim.Region.Capabilities.Caps;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -60,20 +62,19 @@ namespace OpenSim.Region.Environment.Scenes
         private Random Rand = new Random();
         private uint _primCount = 702000;
         private int storageCount;
-        private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers;
-        private Dictionary<string, ScriptFactory> m_scripts;
         private Mutex updateLock;
         
         protected AuthenticateSessionsBase authenticateHandler;
         protected RegionCommsListener regionCommsHost;
         protected CommunicationsManager commsManager;
 
-        protected Dictionary<LLUUID, Capabilities.Caps> capsHandlers = new Dictionary<LLUUID, Capabilities.Caps>();
+        protected Dictionary<LLUUID,Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
         protected BaseHttpServer httpListener;
 
         public ParcelManager parcelManager;
         public EstateManager estateManager;
         public EventManager eventManager;
+        public ScriptManager scriptManager;
 
         #region Properties
         /// <summary>
@@ -117,12 +118,9 @@ namespace OpenSim.Region.Environment.Scenes
 
                 parcelManager = new ParcelManager(this, this.m_regInfo);
                 estateManager = new EstateManager(this, this.m_regInfo);
-
+                scriptManager = new ScriptManager(this);
                 eventManager = new EventManager();
 
-                m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
-                m_scripts = new Dictionary<string, ScriptFactory>();
-
                 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
                 Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
                 Avatars = new Dictionary<LLUUID, ScenePresence>();
@@ -195,19 +193,9 @@ namespace OpenSim.Region.Environment.Scenes
                     Entities[UUID].update();
                 }
 
-                // New
+                // General purpose event manager
                 eventManager.TriggerOnFrame();
 
-                // TODO: Obsolete - Phase out
-                foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
-                {
-                    scriptHandler.OnFrame();
-                }
-                foreach (IScriptEngine scripteng in this.scriptEngines.Values)
-                {
-                    scripteng.OnFrame();
-                }
-
                 //backup world data
                 this.storageCount++;
                 if (storageCount > 1200) //set to how often you want to backup 
@@ -256,7 +244,7 @@ namespace OpenSim.Region.Environment.Scenes
                 //Parcel backup routines
                 ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
                 int i = 0;
-                foreach (OpenSim.Region.Environment.Parcel parcel in parcelManager.parcelList.Values)
+                foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
                 {
                     parcels[i] = parcel.parcelData;
                     i++;
@@ -672,7 +660,7 @@ namespace OpenSim.Region.Environment.Scenes
                 if (agent.CapsPath != "")
                 {
                     //Console.WriteLine("new user, so creating caps handler for it");
-                    Capabilities.Caps cap = new Capabilities.Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
+                    Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
                     cap.RegisterHandlers();
                     this.capsHandlers.Add(agent.AgentID, cap);
                 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 3d8f522..50d3b82 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -37,7 +37,6 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
-using OpenSim.Region.Environment.Scripting;
 using OpenSim.Region.Terrain;
 using OpenSim.Region.Caches;
 
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
new file mode 100644
index 0000000..870303f
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
@@ -0,0 +1,104 @@
+/*
+* 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;
+
+// Compilation stuff
+using System.CodeDom;
+using System.CodeDom.Compiler;
+using Microsoft.CSharp;
+
+namespace OpenSim.Scripting
+{
+    public class CSharpScriptEngine : IScriptCompiler
+    {
+        public string FileExt()
+        {
+            return ".cs";
+        }
+
+        private Dictionary<string,IScript> LoadDotNetScript(ICodeCompiler compiler, string filename)
+        {
+            CompilerParameters compilerParams = new CompilerParameters();
+            CompilerResults compilerResults;
+            compilerParams.GenerateExecutable = false;
+            compilerParams.GenerateInMemory = true;
+            compilerParams.IncludeDebugInformation = false;
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll");
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll");
+            compilerParams.ReferencedAssemblies.Add("libsecondlife.dll");
+            compilerParams.ReferencedAssemblies.Add("System.dll");
+
+            compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
+
+            if (compilerResults.Errors.Count > 0)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");
+                foreach (CompilerError error in compilerResults.Errors)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
+                }
+            }
+            else
+            {
+                Dictionary<string,IScript> scripts = new Dictionary<string,IScript>();
+                
+                foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
+                {
+                    Type testInterface = pluginType.GetInterface("IScript", true);
+
+                    if (testInterface != null)
+                    {
+                        IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
+
+                        string scriptName = "C#/" + script.getName();
+                        Console.WriteLine("Script: " + scriptName + " loaded.");
+
+                        if (!scripts.ContainsKey(scriptName))
+                        {
+                            scripts.Add(scriptName, script);
+                        }
+                        else
+                        {
+                            scripts[scriptName] = script;
+                        }
+                    }
+                }
+                return scripts;
+            }
+            return null;
+        }
+
+        public Dictionary<string,IScript> compile(string filename)
+        {
+            CSharpCodeProvider csharpProvider = new CSharpCodeProvider();
+            return LoadDotNetScript(csharpProvider.CreateCompiler(), filename);
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
new file mode 100644
index 0000000..ffae1d7
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
@@ -0,0 +1,104 @@
+/*
+* 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;
+
+// Compilation stuff
+using System.CodeDom;
+using System.CodeDom.Compiler;
+using Microsoft.JScript;
+
+namespace OpenSim.Scripting
+{
+    public class JScriptEngine : IScriptCompiler
+    {
+        public string FileExt()
+        {
+            return ".js";
+        }
+
+        private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename)
+        {
+            CompilerParameters compilerParams = new CompilerParameters();
+            CompilerResults compilerResults;
+            compilerParams.GenerateExecutable = false;
+            compilerParams.GenerateInMemory = true;
+            compilerParams.IncludeDebugInformation = false;
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll");
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll");
+            compilerParams.ReferencedAssemblies.Add("libsecondlife.dll");
+            compilerParams.ReferencedAssemblies.Add("System.dll");
+
+            compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
+
+            if (compilerResults.Errors.Count > 0)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");
+                foreach (CompilerError error in compilerResults.Errors)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
+                }
+            }
+            else
+            {
+                Dictionary<string, IScript> scripts = new Dictionary<string, IScript>();
+
+                foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
+                {
+                    Type testInterface = pluginType.GetInterface("IScript", true);
+
+                    if (testInterface != null)
+                    {
+                        IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
+
+                        string scriptName = "JS.NET/" + script.getName();
+                        Console.WriteLine("Script: " + scriptName + " loaded.");
+
+                        if (!scripts.ContainsKey(scriptName))
+                        {
+                            scripts.Add(scriptName, script);
+                        }
+                        else
+                        {
+                            scripts[scriptName] = script;
+                        }
+                    }
+                }
+                return scripts;
+            }
+            return null;
+        }
+
+        public Dictionary<string, IScript> compile(string filename)
+        {
+            JScriptCodeProvider jscriptProvider = new JScriptCodeProvider();
+            return LoadDotNetScript(jscriptProvider.CreateCompiler(), filename);
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
new file mode 100644
index 0000000..b33b55d
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
@@ -0,0 +1,104 @@
+/*
+* 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;
+
+// Compilation stuff
+using System.CodeDom;
+using System.CodeDom.Compiler;
+using Microsoft.VJSharp;
+
+namespace OpenSim.Scripting
+{
+    public class JSharpScriptEngine : IScriptCompiler
+    {
+        public string FileExt()
+        {
+            return ".jsl";
+        }
+
+        private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename)
+        {
+            CompilerParameters compilerParams = new CompilerParameters();
+            CompilerResults compilerResults;
+            compilerParams.GenerateExecutable = false;
+            compilerParams.GenerateInMemory = true;
+            compilerParams.IncludeDebugInformation = false;
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll");
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll");
+            compilerParams.ReferencedAssemblies.Add("libsecondlife.dll");
+            compilerParams.ReferencedAssemblies.Add("System.dll");
+
+            compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
+
+            if (compilerResults.Errors.Count > 0)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");
+                foreach (CompilerError error in compilerResults.Errors)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
+                }
+            }
+            else
+            {
+                Dictionary<string, IScript> scripts = new Dictionary<string, IScript>();
+
+                foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
+                {
+                    Type testInterface = pluginType.GetInterface("IScript", true);
+
+                    if (testInterface != null)
+                    {
+                        IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
+
+                        string scriptName = "J#/" + script.getName();
+                        Console.WriteLine("Script: " + scriptName + " loaded.");
+
+                        if (!scripts.ContainsKey(scriptName))
+                        {
+                            scripts.Add(scriptName, script);
+                        }
+                        else
+                        {
+                            scripts[scriptName] = script;
+                        }
+                    }
+                }
+                return scripts;
+            }
+            return null;
+        }
+
+        public Dictionary<string, IScript> compile(string filename)
+        {
+            VJSharpCodeProvider jsharpProvider = new VJSharpCodeProvider();
+            return LoadDotNetScript(jsharpProvider.CreateCompiler(), filename);
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
deleted file mode 100644
index eb8a117..0000000
--- a/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public interface IScriptContext
-    {
-        IScriptEntity Entity { get; }
-        bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
-    }
-}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
deleted file mode 100644
index e813626..0000000
--- a/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public interface IScriptReadonlyEntity
-    {
-        LLVector3 Pos { get; }
-        string Name { get; }
-    }
-    
-    public interface IScriptEntity
-    {
-        LLVector3 Pos { get; set; }
-        string Name { get; }
-    }
-}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
deleted file mode 100644
index 115b4f4..0000000
--- a/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Physics.Manager;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
-using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
-using Primitive = OpenSim.Region.Environment.Scenes.Primitive;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public delegate void ScriptEventHandler(IScriptContext context);
-
-    public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
-    {
-        private Scene m_world;
-        private Script m_script;
-        private Entity m_entity;
-
-        public LLUUID ScriptId
-        {
-            get
-            {
-                return m_script.ScriptId;
-            }
-        }
-
-        public void OnFrame()
-        {
-            m_script.OnFrame(this);
-        }
-
-        public ScriptHandler(Script script, Entity entity, Scene world)
-        {
-            m_script = script;
-            m_entity = entity;
-            m_world = world;
-        }
-
-        #region IScriptContext Members
-
-        IScriptEntity IScriptContext.Entity
-        {
-            get
-            {
-                return this;
-            }
-        }
-
-        bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
-        {
-            foreach (Entity entity in m_world.Entities.Values )
-            {
-                if( entity is Avatar )
-                {
-                    avatar = entity;
-                    return true;
-                }
-            }
-            
-            avatar = null;
-            return false;
-        }
-
-        #endregion
-
-        #region IScriptEntity and IScriptReadonlyEntity Members
-
-        public string Name
-        {
-            get
-            {
-                return m_entity.Name;
-            }
-        }
-
-        public LLVector3 Pos
-        {
-            get
-            {
-                return m_entity.Pos;
-            }
-
-            set
-            {
-                if (m_entity is Primitive)
-                {
-                    Primitive prim = m_entity as Primitive;
-                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
-                   // prim.UpdatePosition( value );
-                }
-            }
-        }
-
-        #endregion
-    }
-
-}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
deleted file mode 100644
index 5d398b0..0000000
--- a/OpenSim/Region/Environment/Scenes/scripting/Script.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public class Script
-    {
-        private LLUUID m_scriptId;        
-        public virtual LLUUID ScriptId
-        {
-            get
-            {
-                return m_scriptId;
-            }
-        }
-
-        public Script( LLUUID scriptId )
-        {
-            m_scriptId = scriptId;
-        }
-        
-        public ScriptEventHandler OnFrame;
-    }
-}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
deleted file mode 100644
index 0ce65ea..0000000
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public delegate Script ScriptFactory();
-}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
new file mode 100644
index 0000000..57df4c4
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -0,0 +1,58 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Region.Environment.Scenes;
+using OpenSim.Framework.Console;
+
+namespace OpenSim.Scripting
+{
+    /// <summary>
+    /// Class which provides access to the world
+    /// </summary>
+    public class ScriptInfo
+    {
+        // Reference to world.eventsManager provided for convenience
+        public EventManager events;
+
+        // The main world
+        public Scene world;
+
+        // The console
+        public LogBase logger;
+
+        public ScriptInfo(Scene scene)
+        {
+            world = scene;
+            events = world.eventManager;
+            logger = OpenSim.Framework.Console.MainLog.Instance;
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
new file mode 100644
index 0000000..5d1d188
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -0,0 +1,99 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Scripting
+{
+    public class ScriptManager
+    {
+        List<IScript> scripts = new List<IScript>();
+        OpenSim.Region.Environment.Scenes.Scene scene;
+        Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();
+
+        private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)
+        {
+            foreach (KeyValuePair<string, IScript> script in compiledscripts)
+            {
+                ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
+                OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading " + script.Key);
+                script.Value.Initialise(scriptInfo);
+                scripts.Add(script.Value);
+            }
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");
+        }
+
+        public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world)
+        {
+            scene = world;
+
+            // Default Engines
+            CSharpScriptEngine csharpCompiler = new CSharpScriptEngine();
+            compilers.Add(csharpCompiler.FileExt(),csharpCompiler);
+
+            JScriptEngine jscriptCompiler = new JScriptEngine();
+            compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);
+
+            JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine();
+            compilers.Add(jsharpCompiler.FileExt(), jsharpCompiler);
+        }
+
+        public void Compile(string filename)
+        {
+            foreach (KeyValuePair<string, IScriptCompiler> compiler in compilers)
+            {
+                if (filename.EndsWith(compiler.Key))
+                {
+                    LoadFromCompiler(compiler.Value.compile(filename));
+                    break;
+                }
+            }
+        }
+
+        public void RunScriptCmd(string[] args)
+        {
+            switch (args[0])
+            {
+                case "load":
+                    Compile(args[1]);
+                    break;
+
+                default:
+                    OpenSim.Framework.Console.MainLog.Instance.Error("Unknown script command");
+                    break;
+            }
+        }
+    }
+
+    interface IScriptCompiler
+    {
+        Dictionary<string,IScript> compile(string filename);
+        string FileExt();
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
deleted file mode 100644
index 90c79e3..0000000
--- a/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scripting
-{
-    public class FollowRandomAvatar : Script
-    {
-        public FollowRandomAvatar()
-            : base(LLUUID.Random())
-        {
-            OnFrame += MyOnFrame;
-        }
-
-        private void MyOnFrame(IScriptContext context)
-        {
-            LLVector3 pos = context.Entity.Pos;
-
-            IScriptReadonlyEntity avatar;
-
-            if (context.TryGetRandomAvatar(out avatar))
-            {
-                LLVector3 avatarPos = avatar.Pos;
-
-                float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
-                float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
-
-                LLVector3 newPos = new LLVector3(x, y, pos.Z);
-
-                context.Entity.Pos = newPos;
-            }
-        }
-    }
-
-
-}
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
new file mode 100644
index 0000000..f8896fa
--- /dev/null
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+<project name="SimpleApp" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+            <resources prefix="SimpleApp" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="MyWorld.cs" />
+                <include name="Program.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="../../../../bin/OpenSim.Region.Caches.dll" />
+                <include name="../../../../bin/OpenSim.Region.ClientStack.dll" />
+                <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />
+                <include name="../../../../bin/OpenSim.Region.Environment.dll" />
+                <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build
new file mode 100644
index 0000000..4770e6d
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Local/OpenSim.Region.GridInterfaces.Local.dll.build
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.GridInterfaces.Local" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.GridInterfaces.Local" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="LocalAssetServer.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build
new file mode 100644
index 0000000..0bf1b86
--- /dev/null
+++ b/OpenSim/Region/GridInterfaces/Remote/OpenSim.Region.GridInterfaces.Remote.dll.build
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.GridInterfaces.Remote" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.GridInterfaces.Remote" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="RemoteAssetServer.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../../../bin/XMLRPC.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
new file mode 100644
index 0000000..6cf26ca
--- /dev/null
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll.build
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Physics.BasicPhysicsPlugin" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="BasicPhysicsPlugin.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
+                <include name="System.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/Physics/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
new file mode 100644
index 0000000..4b7ce81
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/OpenSim.Region.Physics.Manager.dll.build
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Physics.Manager" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Physics.Manager" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="PhysicsActor.cs" />
+                <include name="PhysicsManager.cs" />
+                <include name="PhysicsScene.cs" />
+                <include name="PhysicsVector.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
new file mode 100644
index 0000000..07b9386
--- /dev/null
+++ b/OpenSim/Region/Physics/OdePlugin/OpenSim.Region.Physics.OdePlugin.dll.build
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Physics.OdePlugin" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Physics.OdePlugin" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="OdePlugin.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/Ode.NET.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
+                <include name="System.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/Physics/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
new file mode 100644
index 0000000..c1a9608
--- /dev/null
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Physics.PhysXPlugin" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Physics.PhysXPlugin" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="PhysXPlugin.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/Axiom.MathLib.dll" />
+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
+                <include name="../../../../bin/PhysX_Wrapper_Dotnet.dll" />
+                <include name="System.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/Physics/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/Physics/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/Physics/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build
new file mode 100644
index 0000000..20f5171
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Storage.LocalStorageBerkeleyDB" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="BDBLocalStorage.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/Kds.Serialization.dll" />
+                <include name="../../../../bin/libdb_dotNET43.dll" />
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 716fd57..147158c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,6 +93,9 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Db4LocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -102,9 +105,6 @@
     <Compile Include="UUIDPrimQuery.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
new file mode 100644
index 0000000..fc9f055
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -0,0 +1,48 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Storage.LocalStorageDb4o" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Storage.LocalStorageDb4o" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AssemblyInfo.cs" />
+                <include name="Db4LocalStorage.cs" />
+                <include name="MapStorage.cs" />
+                <include name="UUIDParcelQuery.cs" />
+                <include name="UUIDPrimQuery.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/Db4objects.Db4o.dll" />
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
new file mode 100644
index 0000000..9d12c33
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Storage.LocalStorageSQLite" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Storage.LocalStorageSQLite" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="SQLiteLocalStorage.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../../bin/libsecondlife.dll" />
+                <include name="../../../../bin/OpenSim.Framework.dll" />
+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="../../../../bin/System.Data.SQLite.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
index 60a2d2b..24667e5 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj
@@ -90,10 +90,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TerrainFilter.cs">
+    <Compile Include="TerrainEngine.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="TerrainEngine.cs">
+    <Compile Include="TerrainFilter.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build
new file mode 100644
index 0000000..dc7203a
--- /dev/null
+++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.dll.build
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.Region.Terrain.BasicTerrain" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Region.Terrain.BasicTerrain" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="TerrainEngine.cs" />
+                <include name="TerrainFilter.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="../../../bin/libTerrain-BSD.dll" />
+                <include name="Microsoft.JScript.dll" />
+                <include name="../../../bin/openjpegnet.dll" />
+                <include name="System.dll" />
+                <include name="System.Data.dll" />
+                <include name="System.Drawing.dll" />
+                <include name="System.Xml.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
index f04ac56..e0ae586 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
@@ -1,3 +1,30 @@
+/*
+* 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;
@@ -48,7 +75,7 @@ namespace OpenSim.Region.Terrain
             compilerParams.GenerateInMemory = true;
             compilerParams.IncludeDebugInformation = false;
             compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll");
-            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.Terrain.BasicTerrain.dll");
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll");
             compilerParams.ReferencedAssemblies.Add("System.dll");
 
             compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index f332827..c8b859c 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,6 +83,9 @@
     <Compile Include="Prebuild.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\FatalException.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Core\Kernel.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -92,25 +95,19 @@
     <Compile Include="Core\WarningException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\FatalException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\IDataNode.cs">
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+    <Compile Include="Core\Attributes\TargetAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\TargetAttribute.cs">
+    <Compile Include="Core\Interfaces\IDataNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ProjectNode.cs">
+    <Compile Include="Core\Interfaces\ITarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -122,73 +119,76 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\OptionsNode.cs">
+    <Compile Include="Core\Nodes\FileNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ReferencePathNode.cs">
+    <Compile Include="Core\Nodes\FilesNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\MatchNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\SolutionNode.cs">
+    <Compile Include="Core\Nodes\OptionsNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ProcessNode.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\Nodes\ProjectNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Core\Nodes\ReferenceNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FileNode.cs">
+    <Compile Include="Core\Nodes\ReferencePathNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
+    <Compile Include="Core\Nodes\SolutionNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\DebugTarget.cs">
+    <Compile Include="Core\Parse\IfContext.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
+    <Compile Include="Core\Parse\Preprocessor.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\AutotoolsTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
+    <Compile Include="Core\Targets\DebugTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2002Target.cs">
+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2003Target.cs">
+    <Compile Include="Core\Targets\NAntTarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\SharpDevelop2Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2005Target.cs">
+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\NAntTarget.cs">
+    <Compile Include="Core\Targets\VS2002Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\IfContext.cs">
+    <Compile Include="Core\Targets\VS2003Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\Preprocessor.cs">
+    <Compile Include="Core\Targets\VS2005Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\Helper.cs">
+    <Compile Include="Core\Utilities\CommandLineCollection.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\Log.cs">
+    <Compile Include="Core\Utilities\CurrentDirectory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+    <Compile Include="Core\Utilities\Helper.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+    <Compile Include="Core\Utilities\Log.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 52dd1a7..2851125 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
             </resources>
             <sources failonempty="true">
                 <include name="Prebuild.cs" />
+                <include name="Core/FatalException.cs" />
                 <include name="Core/Kernel.cs" />
                 <include name="Core/UnknownLanguageException.cs" />
                 <include name="Core/WarningException.cs" />
-                <include name="Core/FatalException.cs" />
-                <include name="Core/Interfaces/ITarget.cs" />
-                <include name="Core/Interfaces/IDataNode.cs" />
-                <include name="Core/Attributes/OptionNodeAttribute.cs" />
                 <include name="Core/Attributes/DataNodeAttribute.cs" />
+                <include name="Core/Attributes/OptionNodeAttribute.cs" />
                 <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/Interfaces/ITarget.cs" />
                 <include name="Core/Nodes/ConfigurationNode.cs" />
                 <include name="Core/Nodes/DataNode.cs" />
                 <include name="Core/Nodes/ExcludeNode.cs" />
-                <include name="Core/Nodes/OptionsNode.cs" />
-                <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/FileNode.cs" />
+                <include name="Core/Nodes/FilesNode.cs" />
                 <include name="Core/Nodes/MatchNode.cs" />
-                <include name="Core/Nodes/SolutionNode.cs" />
+                <include name="Core/Nodes/OptionsNode.cs" />
                 <include name="Core/Nodes/ProcessNode.cs" />
+                <include name="Core/Nodes/ProjectNode.cs" />
                 <include name="Core/Nodes/ReferenceNode.cs" />
-                <include name="Core/Nodes/FileNode.cs" />
-                <include name="Core/Nodes/FilesNode.cs" />
+                <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/SolutionNode.cs" />
+                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Parse/Preprocessor.cs" />
+                <include name="Core/Targets/AutotoolsTarget.cs" />
                 <include name="Core/Targets/DebugTarget.cs" />
                 <include name="Core/Targets/MonoDevelopTarget.cs" />
-                <include name="Core/Targets/AutotoolsTarget.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.cs" />
                 <include name="Core/Targets/SharpDevelopTarget.cs" />
                 <include name="Core/Targets/VS2002Target.cs" />
                 <include name="Core/Targets/VS2003Target.cs" />
-                <include name="Core/Targets/SharpDevelop2Target.cs" />
                 <include name="Core/Targets/VS2005Target.cs" />
-                <include name="Core/Targets/NAntTarget.cs" />
-                <include name="Core/Parse/IfContext.cs" />
-                <include name="Core/Parse/Preprocessor.cs" />
-                <include name="Core/Utilities/Helper.cs" />
-                <include name="Core/Utilities/Log.cs" />
                 <include name="Core/Utilities/CommandLineCollection.cs" />
                 <include name="Core/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Utilities/Helper.cs" />
+                <include name="Core/Utilities/Log.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/prebuild.xml b/prebuild.xml
index b4cfc63..1e51bd4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -143,9 +143,7 @@
      <Reference name="libsecondlife.dll"/>
       <Reference name="OpenSim.Framework"/>	
       <Reference name="OpenSim.Framework.Servers"/>
-<Reference name="OpenSim.Framework.Utilities"/>
-<Reference name="OpenSim.Framework.Types"/>
-<Reference name="OpenSim.Region.Caches"/>
+      <Reference name="OpenSim.Region.Caches"/>
      <Reference name="XMLRPC.dll"/>
 
       <Files>
@@ -636,6 +634,10 @@
       <Reference name="OpenSim.Framework.Servers"/>
 	<Reference name="OpenSim.Region.Caches"/>
 	<Reference name="OpenSim.Region.Capabilities"/>
+      <!-- For scripting in funny languages by default -->
+      <Reference name="Microsoft.JScript"/>
+      <!-- This needs checking with the Mono folks -->
+      <Reference name="VJSharpCodeProvider"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
 
-- 
cgit v1.1


From 561db23e5fbfcd110423c6a408ac0a11bebbedac Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 28 Jun 2007 14:10:05 +0000
Subject: Finished removing the old scripting code, Scene.Scripting.cs and
 OpenSim.Framework.Interfaces.Scripting.

---
 .../General/Interfaces/Scripting/IScriptAPI.cs     |  42 -----
 .../General/Interfaces/Scripting/IScriptEngine.cs  |  41 -----
 OpenSim/Framework/General/OpenSim.Framework.csproj |   6 -
 .../Framework/General/OpenSim.Framework.dll.build  |   2 -
 .../Environment/OpenSim.Region.Environment.csproj  |   3 -
 .../OpenSim.Region.Environment.dll.build           |   1 -
 .../Region/Environment/Scenes/Scene.Scripting.cs   | 184 ---------------------
 OpenSim/Region/Environment/Scenes/Scene.cs         |   4 +-
 .../Scenes/scripting/Engines/CSharpScriptEngine.cs |   2 +-
 .../Scenes/scripting/Engines/JScriptEngine.cs      |   2 +-
 .../Scenes/scripting/Engines/JSharpScriptEngine.cs |   2 +-
 .../Region/Environment/Scenes/scripting/Script.cs  |  71 ++++++++
 .../Environment/Scenes/scripting/ScriptInfo.cs     |   2 +-
 .../Environment/Scenes/scripting/ScriptManager.cs  |   2 +-
 14 files changed, 78 insertions(+), 286 deletions(-)
 delete mode 100644 OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs
 delete mode 100644 OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs
 delete mode 100644 OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
 create mode 100644 OpenSim/Region/Environment/Scenes/scripting/Script.cs

diff --git a/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs b/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs
deleted file mode 100644
index 0c1627b..0000000
--- a/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-
-using libsecondlife;
-namespace OpenSim.Framework.Interfaces
-{
-    public interface IScriptAPI
-    {
-        LLVector3 GetEntityPosition(uint localID);
-        void SetEntityPosition(uint localID, float x, float y, float z);
-        uint GetRandomAvatarID();
-    }
-}
diff --git a/OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs b/OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs
deleted file mode 100644
index ca50be0..0000000
--- a/OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework.Interfaces
-{
-    public interface IScriptEngine
-    {
-        bool Init(IScriptAPI api);
-        string GetName();
-        void LoadScript(string script, string scriptName, uint entityID);
-        void OnFrame();
-    }
-}
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index d18e583..48db634 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -148,12 +148,6 @@
     <Compile Include="Interfaces\Config\IUserConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index 04e3382..a18838b 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -31,8 +31,6 @@
                 <include name="Interfaces/Config/IGenericConfig.cs" />
                 <include name="Interfaces/Config/IGridConfig.cs" />
                 <include name="Interfaces/Config/IUserConfig.cs" />
-                <include name="Interfaces/Scripting/IScriptAPI.cs" />
-                <include name="Interfaces/Scripting/IScriptEngine.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
                 <include name="Types/AgentCiruitData.cs" />
                 <include name="Types/AgentWearable.cs" />
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index efde96c..4069454 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -172,9 +172,6 @@
     <Compile Include="Scenes\Scene.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.Scripting.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scenes\SceneBase.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index da73c8c..51924d5 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -19,7 +19,6 @@
                 <include name="Scenes/Primitive.cs" />
                 <include name="Scenes/Scene.cs" />
                 <include name="Scenes/Scene.PacketHandlers.cs" />
-                <include name="Scenes/Scene.Scripting.cs" />
                 <include name="Scenes/SceneBase.cs" />
                 <include name="Scenes/SceneEvents.cs" />
                 <include name="Scenes/SceneObject.cs" />
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs b/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
deleted file mode 100644
index 2249c3d..0000000
--- a/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Reflection;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public partial class Scene
-    {
-        private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();
-
-        /// <summary>
-        /// 
-        /// </summary>
-        private void LoadScriptEngines()
-        {
-            this.LoadScriptPlugins();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        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]);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="FileName"></param>
-        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;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="scriptType"></param>
-        /// <param name="scriptName"></param>
-        /// <param name="script"></param>
-        /// <param name="ent"></param>
-        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
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <returns></returns>
-        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;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <param name="z"></param>
-        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");
-                }
-            }
-           
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public uint GetRandomAvatarID()
-        {
-            //Console.WriteLine("script- getting random avatar id");
-            uint res = 0;
-            foreach (Entity entity in this.Entities.Values)
-            {
-                if (entity is ScenePresence)
-                {
-                    res = entity.LocalId;
-                }
-            }
-            return res;
-        }
-
-        #endregion
-
-
-    }
-}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index b345c0c..f1de803 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -44,7 +44,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Caches;
 using OpenSim.Region.Environment;
 using OpenSim.Framework.Servers;
-using OpenSim.Scripting;
+using OpenSim.Region.Enviorment.Scripting;
 using OpenSim.Region.Capabilities;
 using Caps = OpenSim.Region.Capabilities.Caps;
 
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Environment.Scenes
 {
     public delegate bool FilterAvatarList(ScenePresence avatar);
 
-    public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
+    public partial class Scene : SceneBase, ILocalStorageReceiver
     {
         protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
         protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars;
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
index 870303f..a232b65 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;
 using Microsoft.CSharp;
 
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
     public class CSharpScriptEngine : IScriptCompiler
     {
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
index ffae1d7..2d44223 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;
 using Microsoft.JScript;
 
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
     public class JScriptEngine : IScriptCompiler
     {
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
index b33b55d..51b1512 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;
 using Microsoft.VJSharp;
 
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
     public class JSharpScriptEngine : IScriptCompiler
     {
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
new file mode 100644
index 0000000..1e64675
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -0,0 +1,71 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Framework.Console;
+using OpenSim.Framework;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
+
+namespace OpenSim.Region.Enviorment.Scripting
+{
+    public interface IScript
+    {
+        void Initialise(ScriptInfo scriptInfo);
+        string getName();
+    }
+
+    public class TestScript : IScript
+    {
+        ScriptInfo script;
+
+        public string getName()
+        {
+            return "TestScript 0.1";
+        }
+
+        public void Initialise(ScriptInfo scriptInfo)
+        {
+            script = scriptInfo;
+            script.events.OnFrame += new OpenSim.Region.Environment.Scenes.EventManager.OnFrameDelegate(events_OnFrame);
+            script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);
+        }
+
+        void events_OnNewPresence(ScenePresence presence)
+        {
+            script.logger.Verbose("Hello " + presence.firstname.ToString() + "!");
+        }
+
+        void events_OnFrame()
+        {
+            //script.logger.Verbose("Hello World!");
+        }
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index 57df4c4..522a572 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -32,7 +32,7 @@ using System.Text;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
     /// <summary>
     /// Class which provides access to the world
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index 5d1d188..576b7a5 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Scripting
+namespace OpenSim.Region.Enviorment.Scripting
 {
     public class ScriptManager
     {
-- 
cgit v1.1


From bee543300fc812277e9a9478dc05b986e00ed44e Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 14:45:46 +0000
Subject: *User Profile requests on OGS UserServer now uses XMLRPC instead of
 REST *Added base support for setting up a master user

---
 OpenGridServices.sln                               | 127 ++++++++++-----------
 OpenSim/Framework/Communications/IUserServices.cs  |   5 +-
 OpenSim/Framework/UserManager/UserManagerBase.cs   | 126 ++++++++++----------
 OpenSim/Grid/UserServer/Main.cs                    |   4 +-
 .../Communications/Local/LocalUserServices.cs      |  25 ++++
 .../Region/Communications/OGS1/OGSUserServices.cs  |  17 ++-
 6 files changed, 165 insertions(+), 139 deletions(-)

diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 2343bc0..5f47b6b 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C# Express 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,72 +25,61 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(ProjectDependencies) = postSolution
-    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
-    ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
-  EndGlobalSection
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {08F87229-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(ProjectConfigurationPlatforms) = postSolution
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Framework/Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
index 6790651..37f4942 100644
--- a/OpenSim/Framework/Communications/IUserServices.cs
+++ b/OpenSim/Framework/Communications/IUserServices.cs
@@ -39,6 +39,9 @@ namespace OpenSim.Framework.Communications
         UserProfileData GetUserProfile(string firstName, string lastName);
         UserProfileData GetUserProfile(string name);
         UserProfileData GetUserProfile(LLUUID avatarID);
-        
+
+        UserProfileData SetupMasterUser(string firstName, string lastName);
+        UserProfileData SetupMasterUser(string firstName, string lastName, string password);
+
     }
 }
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index eb46c14..bc35164 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -537,27 +537,15 @@ namespace OpenSim.Framework.UserManagement
         /// Returns an error message that the user could not be found in the database
         /// </summary>
         /// <returns>XML string consisting of a error element containing individual error(s)</returns>
-        public string CreateUnknownUserErrorResponse()
+        public XmlRpcResponse CreateUnknownUserErrorResponse()
         {
-            System.IO.StringWriter sw = new System.IO.StringWriter();
-            XmlTextWriter xw = new XmlTextWriter(sw);
-
-            // Header
-            xw.Formatting = Formatting.Indented;
-            xw.WriteStartDocument();
-            xw.WriteDocType("error", null, null, null);
-            xw.WriteComment("An error occured");
-            xw.WriteStartElement("error");
-
-            // User
-            xw.WriteElementString("unknownuser", "Unable to find a user with that name");
-
-            // Footer
-            xw.WriteEndElement();
-            xw.Flush();
-            xw.Close();
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable responseData = new Hashtable();
+            responseData["error_type"] = "unknown_user";
+            responseData["error_desc"] = "The user requested is not in the database";
 
-            return sw.ToString();
+            response.Value = responseData;
+            return response;
         }
 
         /// <summary>
@@ -565,75 +553,81 @@ namespace OpenSim.Framework.UserManagement
         /// </summary>
         /// <param name="profile">The user profile</param>
         /// <returns>A string containing an XML Document of the user profile</returns>
-        public string ProfileToXml(UserProfileData profile)
+        public XmlRpcResponse ProfileToXmlRPCResponse(UserProfileData profile)
         {
-            System.IO.StringWriter sw = new System.IO.StringWriter();
-            XmlTextWriter xw = new XmlTextWriter(sw);
-
-            // Header
-            xw.Formatting = Formatting.Indented;
-            xw.WriteStartDocument();
-            xw.WriteDocType("userprofile", null, null, null);
-            xw.WriteComment("Found user profiles matching the request");
-            xw.WriteStartElement("users");
-
-            // User
-            xw.WriteStartElement("user");
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable responseData = new Hashtable();
+
             // Account information
-            xw.WriteAttributeString("firstname", profile.username);
-            xw.WriteAttributeString("lastname", profile.surname);
-            xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());
+            responseData["firstname"] = profile.username;
+            responseData["lastname"]  = profile.surname;
+            responseData["uuid"]  = profile.UUID.ToStringHyphenated();
             // Server Information
-            xw.WriteAttributeString("server_inventory", profile.userInventoryURI);
-            xw.WriteAttributeString("server_asset", profile.userAssetURI);
+            responseData["server_inventory"]  = profile.userInventoryURI;
+            responseData["server_asset"]  = profile.userAssetURI;
             // Profile Information
-            xw.WriteAttributeString("profile_about", profile.profileAboutText);
-            xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);
-            xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());
-            xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());
-            xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());
-            xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());
-            xw.WriteAttributeString("profile_created",profile.created.ToString());
-            xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());
+            responseData["profile_about"]  = profile.profileAboutText;
+            responseData["profile_firstlife_about"]  = profile.profileFirstText;
+            responseData["profile_firstlife_image"]  = profile.profileFirstImage.ToStringHyphenated();
+            responseData["profile_can_do"]  = profile.profileCanDoMask.ToString();
+            responseData["profile_want_do"]  = profile.profileWantDoMask.ToString();
+            responseData["profile_image"]  = profile.profileImage.ToStringHyphenated();
+            responseData["profile_created"] = profile.created.ToString();
+            responseData["profile_lastlogin"] = profile.lastLogin.ToString();
             // Home region information
-            xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());
-            xw.WriteAttributeString("home_region", profile.homeRegion.ToString());
-            xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());
+            responseData["home_coordinates"]  = profile.homeLocation.ToString();
+            responseData["home_region"]  = profile.homeRegion.ToString();
+            responseData["home_look"]  = profile.homeLookAt.ToString();
 
-            xw.WriteEndElement();
-
-            // Footer
-            xw.WriteEndElement();
-            xw.Flush();
-            xw.Close();
-
-            return sw.ToString();
+            response.Value = responseData;
+            return response;
         }
 
-        #region REST Methods 
+        #region XMLRPC User Methods 
         //should most likely move out of here and into the grid's userserver sub class
-        public string RestGetUserMethodName(string request, string path, string param)
+        public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request)
         {
-            UserProfileData userProfile = getUserProfile(param.Trim());
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable requestData = (Hashtable)request.Params[0];
+            UserProfileData userProfile;
 
-            if (userProfile == null)
+            if (requestData.Contains("avatar_name"))
+            {
+                userProfile = getUserProfile((string)requestData["avatar_name"]);
+                if (userProfile == null)
+                {
+                    return CreateUnknownUserErrorResponse();
+                }
+            }
+            else
             {
                 return CreateUnknownUserErrorResponse();
             }
+            
 
-            return ProfileToXml(userProfile);
+            return ProfileToXmlRPCResponse(userProfile);
         }
 
-        public string RestGetUserMethodUUID(string request, string path, string param)
+        public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request)
         {
-            UserProfileData userProfile = getUserProfile(new LLUUID(param));
-
-            if (userProfile == null)
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable requestData = (Hashtable)request.Params[0];
+            UserProfileData userProfile;
+            if (requestData.Contains("avatar_uuid"))
+            {
+                userProfile = getUserProfile((LLUUID)requestData["avatar_uuid"]);
+                if (userProfile == null)
+                {
+                    return CreateUnknownUserErrorResponse();
+                }
+            }
+            else
             {
                 return CreateUnknownUserErrorResponse();
             }
 
-            return ProfileToXml(userProfile);
+
+            return ProfileToXmlRPCResponse(userProfile);
         }
         #endregion
 
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 8ae4dbf..640f91a 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -107,8 +107,8 @@ namespace OpenSim.Grid.UserServer
 
             httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
 
-            httpServer.AddRestHandler("GET", "/user/name/", m_userManager.RestGetUserMethodName);
-            httpServer.AddRestHandler("GET", "/user/uuid/", m_userManager.RestGetUserMethodUUID);
+            httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
+            httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID);
 
             httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod);
 
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 1eb574c..2097870 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -114,5 +114,30 @@ namespace OpenSim.Region.Communications.Local
 
         }
 
+        public UserProfileData SetupMasterUser(string firstName, string lastName)
+        {
+            return SetupMasterUser(firstName, lastName, "");
+        }
+        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+        {
+            UserProfileData profile = getUserProfile(firstName, lastName);
+            if (profile != null)
+            {
+
+                return profile;
+            }
+
+            Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account");
+            this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY);
+
+            profile = getUserProfile(firstName, lastName);
+
+            if (profile == null)
+            {
+                Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");
+            }
+
+            return profile;
+        }
     }
 }
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
index 012774d..48d3018 100644
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
@@ -11,7 +11,7 @@ namespace OpenSim.Region.Communications.OGS1
     {
         public UserProfileData GetUserProfile(string firstName, string lastName)
         {
-            return null;
+            return GetUserProfile(firstName + " " + lastName);
         }
         public UserProfileData GetUserProfile(string name)
         {
@@ -21,5 +21,20 @@ namespace OpenSim.Region.Communications.OGS1
         {
             return null;
         }
+
+        public UserProfileData SetupMasterUser(string firstName, string lastName)
+        {
+            return SetupMasterUser(firstName, lastName, "");
+        }
+
+        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+        {
+            UserProfileData profile = GetUserProfile(firstName, lastName);
+            if (profile == null)
+            {
+                Console.WriteLine("Unknown Master User. Grid Mode: No clue what I should do. Probably would choose the grid owner UUID when that is implemented");
+            }
+            return null;
+        }
     }
 }
-- 
cgit v1.1


From e1ebfaef637acd6916b519e053c1eb808c98b3c5 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 28 Jun 2007 15:56:24 +0000
Subject: Applied ScenePresence movement patch from Darok.

---
 OpenSim.sln                                        | 307 ++++++++-------------
 OpenSim/Region/Capabilities/LLSDHelpers.cs         |  12 +-
 OpenSim/Region/Environment/Scenes/ScenePresence.cs |  81 ++++--
 3 files changed, 174 insertions(+), 226 deletions(-)

diff --git a/OpenSim.sln b/OpenSim.sln
index 68465d8..66e79d2 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C# Express 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
@@ -53,196 +53,117 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(ProjectDependencies) = postSolution
-    ({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).6 = ({C74E4A30-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).7 = ({2CC71860-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).8 = ({586E2916-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).10 = ({DC3698B2-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).11 = ({BFB5D807-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).12 = ({4806E378-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).13 = ({DCBA491C-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).14 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({438A9556-0000-0000-0000-000000000000}).15 = ({C9E0F891-0000-0000-0000-000000000000})
-    ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000})
-    ({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000})
-    ({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({39038E85-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({39038E85-0000-0000-0000-000000000000}).2 = ({2CC71860-0000-0000-0000-000000000000})
-    ({39038E85-0000-0000-0000-000000000000}).3 = ({61FCCDB3-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).6 = ({61FCCDB3-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).7 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({DC3698B2-0000-0000-0000-000000000000}).8 = ({C9E0F891-0000-0000-0000-000000000000})
-    ({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
-    ({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).5 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).10 = ({39038E85-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).11 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({DCBA491C-0000-0000-0000-000000000000}).12 = ({C9E0F891-0000-0000-0000-000000000000})
-    ({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
-    ({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000})
-    ({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000})
-  EndGlobalSection
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    {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
-    {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
-    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {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
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {24B12448-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(ProjectConfigurationPlatforms) = postSolution
+		{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
+		{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
+		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{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
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Region/Capabilities/LLSDHelpers.cs b/OpenSim/Region/Capabilities/LLSDHelpers.cs
index 80916b4..76d9345 100644
--- a/OpenSim/Region/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Region/Capabilities/LLSDHelpers.cs
@@ -73,7 +73,6 @@ namespace OpenSim.Region.Capabilities
                             }
                             else
                             {
-                                //Console.WriteLine("LLSD field name" + fields[i].Name + " , " + fields[i].GetValue(obj).GetType());
                                 writer.WriteStartElement(String.Empty, "key", String.Empty);
                                 writer.WriteString(fields[i].Name);
                                 writer.WriteEndElement();
@@ -86,12 +85,15 @@ namespace OpenSim.Region.Capabilities
                         // LLSDArray arrayObject = obj as LLSDArray;
                         // ArrayList a = arrayObject.Array;
                         ArrayList a = (ArrayList)obj.GetType().GetField("Array").GetValue(obj);
-                        writer.WriteStartElement(String.Empty, "array", String.Empty);
-                        foreach (object item in a)
+                        if (a != null)
                         {
-                            SerializeLLSDType(writer, item);
+                            writer.WriteStartElement(String.Empty, "array", String.Empty);
+                            foreach (object item in a)
+                            {
+                                SerializeLLSDType(writer, item);
+                            }
+                            writer.WriteEndElement();
                         }
-                        writer.WriteEndElement();
                         break;
                 }
             }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 96e5c94..23434a0 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -66,6 +66,17 @@ namespace OpenSim.Region.Environment.Scenes
 
         protected RegionInfo m_regionInfo;
 
+        private Vector3[] Dir_Vectors = new Vector3[6];
+        private enum Dir_ControlFlags
+        {
+            DIR_CONTROL_FLAG_FOWARD = MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS,
+            DIR_CONTROL_FLAG_BACK = MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG,
+            DIR_CONTROL_FLAG_LEFT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_POS,
+            DIR_CONTROL_FLAG_RIGHT = MainAvatar.ControlFlags.AGENT_CONTROL_LEFT_NEG,
+            DIR_CONTROL_FLAG_UP = MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS,
+            DIR_CONTROL_FLAG_DOWN = MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG
+        }
+
         #region Properties
         /// <summary>
         /// 
@@ -125,6 +136,13 @@ namespace OpenSim.Region.Environment.Scenes
             // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
             //ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
 
+            Dir_Vectors[0] = new Vector3(1, 0, 0);  //FOWARD
+            Dir_Vectors[1] = new Vector3(-1, 0, 0); //BACK
+            Dir_Vectors[2] = new Vector3(0, 1, 0);  //LEFT
+            Dir_Vectors[3] = new Vector3(0, -1, 0); //RIGHT
+            Dir_Vectors[4] = new Vector3(0, 0, 1);  //UP
+            Dir_Vectors[5] = new Vector3(0, 0, -1); //DOWN
+
         }
         #endregion
 
@@ -216,40 +234,47 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="pack"></param>
         public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
-        {  
-            if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
+        {
+            int i = 0;
+            bool update_movementflag = false;
+            bool update_rotation = false;
+            bool DCFlagKeyPressed = false;
+            Vector3 agent_control_v3 = new Vector3(0, 0, 0);
+            Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+
+
+            // this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
+
+            if (q != this.bodyRot)
             {
-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
-                if (((movementflag & 1) == 0) || (q != this.bodyRot))
-                {
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
-                    this.AddNewMovement(v3, q);
-                    movementflag = 1;
-                    this.bodyRot = q;
-                }
+                this.bodyRot = q;
+                update_rotation = true;
             }
-            else if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
+            foreach (Dir_ControlFlags DCF in Enum.GetValues(typeof(Dir_ControlFlags)))
             {
-                Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
-                if (((movementflag & 2) == 0) || (q != this.bodyRot))
-                {  
-                    Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
-                    this.AddNewMovement(v3, q);
-                    movementflag = 2;
-                    this.bodyRot = q;
+                if ((flags & (uint)DCF) != 0)
+                {
+                    DCFlagKeyPressed = true;
+                    agent_control_v3 += Dir_Vectors[i];
+                    if ((movementflag & (uint)DCF) == 0)
+                    {
+                        movementflag += (byte)(uint)DCF;
+                        update_movementflag = true;
+                    }
                 }
-            }
-            else
-            {
-                if ((movementflag) != 0)
+                else
                 {
-                    NewForce newVelocity = new NewForce();
-                    newVelocity.X = 0;
-                    newVelocity.Y = 0;
-                    newVelocity.Z = 0;
-                    this.forcesList.Add(newVelocity);
-                    movementflag = 0;
+                    if ((movementflag & (uint)DCF) != 0)
+                    {
+                        movementflag -= (byte)(uint)DCF;
+                        update_movementflag = true;
+                    }
                 }
+                i++;
+            }
+            if ((update_movementflag) || (update_rotation && DCFlagKeyPressed))
+            {
+                this.AddNewMovement(agent_control_v3, q);
             }
 
         }
-- 
cgit v1.1


From 108d89f89436556c8f4662197903c374db943f7d Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 16:17:20 +0000
Subject: *Master User is now set up *Added support for getting user profile
 information from remote grid server (untested) *Updated prebuild.xml

---
 .../Communications/CommunicationsManager.cs        |  3 +-
 .../OpenSim.Framework.Communications.csproj        |  6 +--
 .../OpenSim.Framework.Communications.dll.build     |  2 +-
 .../Console/OpenSim.Framework.Console.csproj       |  4 +-
 .../Console/OpenSim.Framework.Console.dll.build    |  2 +-
 .../Data.DB4o/OpenSim.Framework.Data.DB4o.csproj   |  4 +-
 .../OpenSim.Framework.Data.DB4o.dll.build          |  4 +-
 .../Data.MySQL/OpenSim.Framework.Data.MySQL.csproj | 10 ++--
 .../OpenSim.Framework.Data.MySQL.dll.build         |  6 +--
 .../OpenSim.Framework.Data.SQLite.csproj           |  4 +-
 .../OpenSim.Framework.Data.SQLite.dll.build        |  2 +-
 .../Framework/Data/OpenSim.Framework.Data.csproj   | 12 ++---
 .../Data/OpenSim.Framework.Data.dll.build          |  4 +-
 OpenSim/Framework/General/OpenSim.Framework.csproj | 60 ++++++++++-----------
 .../Framework/General/OpenSim.Framework.dll.build  | 36 ++++++-------
 .../Framework/General/Types/NetworkServersInfo.cs  | 39 ++++++++++++++
 .../Servers/OpenSim.Framework.Servers.csproj       |  8 +--
 .../Servers/OpenSim.Framework.Servers.dll.build    |  6 +--
 .../AssetServer/OpenSim.Grid.AssetServer.csproj    |  4 +-
 .../AssetServer/OpenSim.Grid.AssetServer.exe.build |  2 +-
 .../Grid/UserServer/OpenSim.Grid.UserServer.csproj |  4 +-
 .../UserServer/OpenSim.Grid.UserServer.exe.build   |  2 +-
 OpenSim/Region/Application/OpenSim.csproj          | 12 +++--
 OpenSim/Region/Application/OpenSim.exe.build       |  3 +-
 OpenSim/Region/Application/OpenSimMain.cs          | 11 +++-
 .../OpenSim.Region.Capabilities.csproj             | 20 +++----
 .../OpenSim.Region.Capabilities.dll.build          | 16 +++---
 .../ClientStack/OpenSim.Region.ClientStack.csproj  | 18 +++----
 .../OpenSim.Region.ClientStack.dll.build           | 12 ++---
 .../Communications/Local/CommunicationsLocal.cs    |  2 +-
 .../OpenSim.Region.Communications.Local.csproj     |  6 +--
 .../OpenSim.Region.Communications.Local.dll.build  |  2 +-
 .../Region/Communications/OGS1/GridCommsManager.cs |  2 +-
 .../Region/Communications/OGS1/OGSUserServices.cs  | 63 ++++++++++++++++++++++
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj |  4 +-
 .../OpenSim.Region.Communications.OGS1.dll.build   |  4 +-
 .../Environment/OpenSim.Region.Environment.csproj  | 34 ++++++------
 .../OpenSim.Region.Environment.dll.build           | 26 ++++-----
 .../OpenSim.Region.Storage.LocalStorageDb4o.csproj |  6 +--
 ...enSim.Region.Storage.LocalStorageDb4o.dll.build |  2 +-
 Prebuild/src/Prebuild.csproj                       | 56 +++++++++----------
 Prebuild/src/Prebuild.exe.build                    | 34 ++++++------
 prebuild.xml                                       |  1 +
 43 files changed, 339 insertions(+), 219 deletions(-)

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 74d12d2..69b5da6 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -43,9 +43,10 @@ namespace OpenSim.Framework.Communications
         public IGridServices GridServer;
         public IInterRegionCommunications InterRegion;
 
+        public NetworkServersInfo ServersInfo;
         public CommunicationsManager(NetworkServersInfo serversInfo)
         {
-            
+            ServersInfo = serversInfo;
         }
     }
 }
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 31ab172..66507a8 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,9 +86,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommunicationsManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="IGridServices.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -98,6 +95,9 @@
     <Compile Include="IUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="CommunicationsManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 52d29f6..1c55d8c 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="CommunicationsManager.cs" />
                 <include name="IGridServices.cs" />
                 <include name="IInterRegionCommunications.cs" />
                 <include name="IUserServices.cs" />
+                <include name="CommunicationsManager.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index f3dcec5..c02a506 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -69,10 +69,10 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ConsoleCallbacksBase.cs">
+    <Compile Include="LogBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LogBase.cs">
+    <Compile Include="ConsoleCallbacksBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MainLog.cs">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index eb40c0d..10e72a1 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -12,8 +12,8 @@
             </resources>
             <sources failonempty="true">
                 <include name="AssemblyInfo.cs" />
-                <include name="ConsoleCallbacksBase.cs" />
                 <include name="LogBase.cs" />
+                <include name="ConsoleCallbacksBase.cs" />
                 <include name="MainLog.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index b09cecf..f6e8311 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DB4oGridData.cs">
+    <Compile Include="DB4oUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="DB4oManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DB4oUserData.cs">
+    <Compile Include="DB4oGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index f124eb5..2c5e31b 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="DB4oGridData.cs" />
-                <include name="DB4oManager.cs" />
                 <include name="DB4oUserData.cs" />
+                <include name="DB4oManager.cs" />
+                <include name="DB4oGridData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 62e3887..09a32b5 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MySQLGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MySQLInventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLLogData.cs">
+    <Compile Include="MySQLUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MySQLManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLUserData.cs">
+    <Compile Include="MySQLLogData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MySQLGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index 594ec52..3aeebbc 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="MySQLGridData.cs" />
                 <include name="MySQLInventoryData.cs" />
-                <include name="MySQLLogData.cs" />
-                <include name="MySQLManager.cs" />
                 <include name="MySQLUserData.cs" />
+                <include name="MySQLManager.cs" />
+                <include name="MySQLLogData.cs" />
+                <include name="MySQLGridData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index 4ba24f1..dab22ea 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index e28d0a6..719fbc6 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="SQLiteGridData.cs" />
                 <include name="SQLiteManager.cs" />
+                <include name="SQLiteGridData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index dcafbcd..47b9ba3 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -78,22 +78,22 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GridData.cs">
+    <Compile Include="ReservationData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ILogData.cs">
+    <Compile Include="GridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IniConfig.cs">
+    <Compile Include="SimProfileData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="InventoryData.cs">
+    <Compile Include="ILogData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ReservationData.cs">
+    <Compile Include="IniConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfileData.cs">
+    <Compile Include="InventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UserData.cs">
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index aefb02b..881bb3a 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -11,12 +11,12 @@
             <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="ReservationData.cs" />
                 <include name="GridData.cs" />
+                <include name="SimProfileData.cs" />
                 <include name="ILogData.cs" />
                 <include name="IniConfig.cs" />
                 <include name="InventoryData.cs" />
-                <include name="ReservationData.cs" />
-                <include name="SimProfileData.cs" />
                 <include name="UserData.cs" />
                 <include name="UserProfileData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 48db634..261b96b 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -91,106 +91,106 @@
     <Compile Include="AgentInventory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AuthenticateSessionBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="BlockingQueue.cs">
+    <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IRegionCommsListener.cs">
+    <Compile Include="AuthenticateSessionBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Logger.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LoginService.cs">
+    <Compile Include="Remoting.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionCommsListener.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Remoting.cs">
+    <Compile Include="LoginService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfile.cs">
+    <Compile Include="BlockingQueue.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UserProfile.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
+    <Compile Include="IRegionCommsListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimProfile.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\AuthenticateResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IAssetServer.cs">
+    <Compile Include="Interfaces\IUserServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IClientAPI.cs">
+    <Compile Include="Interfaces\IAssetServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\ILocalStorage.cs">
+    <Compile Include="Interfaces\IWorld.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
+    <Compile Include="Interfaces\IClientAPI.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
+    <Compile Include="Interfaces\ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\Config\IGenericConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
+    <Compile Include="Interfaces\Config\IUserConfig.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IUserConfig.cs">
+    <Compile Include="Interfaces\Config\IGridConfig.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
+    <Compile Include="Types\NeighbourInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentWearable.cs">
+    <Compile Include="Types\RegionHandle.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetBase.cs">
+    <Compile Include="Types\RegionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
+    <Compile Include="Types\ParcelData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetStorage.cs">
+    <Compile Include="Types\AgentWearable.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\EstateSettings.cs">
+    <Compile Include="Types\PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\Login.cs">
+    <Compile Include="Types\MapBlockData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\MapBlockData.cs">
+    <Compile Include="Types\AssetStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NeighbourInfo.cs">
+    <Compile Include="Types\EstateSettings.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NetworkServersInfo.cs">
+    <Compile Include="Types\AgentCiruitData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ParcelData.cs">
+    <Compile Include="Types\Login.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\PrimData.cs">
+    <Compile Include="Types\AssetLandmark.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionHandle.cs">
+    <Compile Include="Types\AssetBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionInfo.cs">
+    <Compile Include="Types\NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index a18838b..f05217f 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -12,40 +12,40 @@
             </resources>
             <sources failonempty="true">
                 <include name="AgentInventory.cs" />
+                <include name="Util.cs" />
                 <include name="AuthenticateSessionBase.cs" />
-                <include name="BlockingQueue.cs" />
-                <include name="IRegionCommsListener.cs" />
                 <include name="Logger.cs" />
-                <include name="LoginService.cs" />
-                <include name="RegionCommsListener.cs" />
                 <include name="Remoting.cs" />
-                <include name="SimProfile.cs" />
+                <include name="RegionCommsListener.cs" />
+                <include name="LoginService.cs" />
+                <include name="BlockingQueue.cs" />
                 <include name="UserProfile.cs" />
-                <include name="Util.cs" />
+                <include name="IRegionCommsListener.cs" />
+                <include name="SimProfile.cs" />
                 <include name="Interfaces/AuthenticateResponse.cs" />
+                <include name="Interfaces/IUserServer.cs" />
                 <include name="Interfaces/IAssetServer.cs" />
+                <include name="Interfaces/IWorld.cs" />
                 <include name="Interfaces/IClientAPI.cs" />
                 <include name="Interfaces/ILocalStorage.cs" />
-                <include name="Interfaces/IUserServer.cs" />
-                <include name="Interfaces/IWorld.cs" />
                 <include name="Interfaces/Config/IGenericConfig.cs" />
-                <include name="Interfaces/Config/IGridConfig.cs" />
                 <include name="Interfaces/Config/IUserConfig.cs" />
+                <include name="Interfaces/Config/IGridConfig.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/AgentCiruitData.cs" />
+                <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/RegionHandle.cs" />
+                <include name="Types/RegionInfo.cs" />
+                <include name="Types/ParcelData.cs" />
                 <include name="Types/AgentWearable.cs" />
-                <include name="Types/AssetBase.cs" />
-                <include name="Types/AssetLandmark.cs" />
+                <include name="Types/PrimData.cs" />
+                <include name="Types/MapBlockData.cs" />
                 <include name="Types/AssetStorage.cs" />
                 <include name="Types/EstateSettings.cs" />
+                <include name="Types/AgentCiruitData.cs" />
                 <include name="Types/Login.cs" />
-                <include name="Types/MapBlockData.cs" />
-                <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/AssetLandmark.cs" />
+                <include name="Types/AssetBase.cs" />
                 <include name="Types/NetworkServersInfo.cs" />
-                <include name="Types/ParcelData.cs" />
-                <include name="Types/PrimData.cs" />
-                <include name="Types/RegionHandle.cs" />
-                <include name="Types/RegionInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 73d7811..c6b81a7 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types
                         this.GridRecvKey = attri;
                     }
 
+                    //Grid Server 
+                    attri = "";
+                    attri = configData.GetAttribute("UserServerURL");
+                    if (attri == "")
+                    {
+                        this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
+                        configData.SetAttribute("UserServerURL", this.UserURL);
+                    }
+                    else
+                    {
+                        this.UserURL = attri;
+                    }
+
+                    //Grid Send Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserSendKey");
+                    if (attri == "")
+                    {
+                        this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");
+                        configData.SetAttribute("UserSendKey", this.UserSendKey);
+                    }
+                    else
+                    {
+                        this.UserSendKey = attri;
+                    }
+
+                    //Grid Receive Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserRecvKey");
+                    if (attri == "")
+                    {
+                        this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
+                        configData.SetAttribute("GridRecvKey", this.UserRecvKey);
+                    }
+                    else
+                    {
+                        this.UserRecvKey = attri;
+                    }
+
                     attri = "";
                     attri = configData.GetAttribute("AssetServerURL");
                     if (attri == "")
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
index 399f456..2301fa6 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -90,19 +90,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BaseHttpServer.cs">
+    <Compile Include="IRestHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CheckSumServer.cs">
+    <Compile Include="XmlRpcMethod.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IRestHandler.cs">
+    <Compile Include="CheckSumServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UDPServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcMethod.cs">
+    <Compile Include="BaseHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
index 7401b07..bb20780 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="BaseHttpServer.cs" />
-                <include name="CheckSumServer.cs" />
                 <include name="IRestHandler.cs" />
-                <include name="UDPServerBase.cs" />
                 <include name="XmlRpcMethod.cs" />
+                <include name="CheckSumServer.cs" />
+                <include name="UDPServerBase.cs" />
+                <include name="BaseHttpServer.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index caebca3..945b7a5 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -98,10 +98,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssetHttpServer.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Main.cs">
+    <Compile Include="AssetHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 88724f6..0a1b533 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="AssetHttpServer.cs" />
                 <include name="Main.cs" />
+                <include name="AssetHttpServer.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index 1146b17..e822c18 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -114,10 +114,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs">
+    <Compile Include="UserManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserManager.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
index 50c9788..b0333f1 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Main.cs" />
                 <include name="UserManager.cs" />
+                <include name="Main.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 5cefa96..f5da23d 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -102,6 +102,12 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
+      <Name>OpenSim.Framework.Data</Name>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
       <Name>OpenSim.Framework.GenericConfig.Xml</Name>
       <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
@@ -164,13 +170,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Application.cs">
+    <Compile Include="VersionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="VersionInfo.cs">
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 74eee5b..9890cfa 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="VersionInfo.cs" />
                 <include name="Application.cs" />
                 <include name="OpenSimMain.cs" />
-                <include name="VersionInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
@@ -26,6 +26,7 @@
                 <include name="../../../bin/OpenSim.Framework.dll" />
                 <include name="../../../bin/OpenSim.Framework.Communications.dll" />
                 <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../../bin/OpenSim.Framework.Data.dll" />
                 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
                 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
                 <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7bf6b8d..6e600b8 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -42,6 +42,8 @@ using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Terrain;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Data;
+
 using OpenSim.Framework.Types;
 using OpenSim.Framework;
 using OpenSim.Assets;
@@ -250,7 +252,14 @@ namespace OpenSim
                 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
                 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
                 LocalWorld.LoadPrimsFromStorage();
-                LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+
+                //Master Avatar Setup
+                UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
+                if (masterAvatar != null)
+                {
+                    LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
+                    LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
+                }
 
 
                 LocalWorld.StartTimer();
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 4667d52..1ed28d2 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -96,40 +96,40 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Caps.cs">
+    <Compile Include="LLSDCapsDetails.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LLSDArray.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDCapEvent.cs">
+    <Compile Include="LLSDEmpty.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDCapsDetails.cs">
+    <Compile Include="LLSDTest.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDEmpty.cs">
+    <Compile Include="LLSDUploadReply.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDHelpers.cs">
+    <Compile Include="LLSDType.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDMapLayer.cs">
+    <Compile Include="LLSDHelpers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDMapLayerResponse.cs">
+    <Compile Include="LLSDCapEvent.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LLSDMapRequest.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDTest.cs">
+    <Compile Include="Caps.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDType.cs">
+    <Compile Include="LLSDMapLayerResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDUploadReply.cs">
+    <Compile Include="LLSDMapLayer.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index a091b5c..dd853e7 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -11,18 +11,18 @@
             <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Caps.cs" />
-                <include name="LLSDArray.cs" />
-                <include name="LLSDCapEvent.cs" />
                 <include name="LLSDCapsDetails.cs" />
+                <include name="LLSDArray.cs" />
                 <include name="LLSDEmpty.cs" />
-                <include name="LLSDHelpers.cs" />
-                <include name="LLSDMapLayer.cs" />
-                <include name="LLSDMapLayerResponse.cs" />
-                <include name="LLSDMapRequest.cs" />
                 <include name="LLSDTest.cs" />
-                <include name="LLSDType.cs" />
                 <include name="LLSDUploadReply.cs" />
+                <include name="LLSDType.cs" />
+                <include name="LLSDHelpers.cs" />
+                <include name="LLSDCapEvent.cs" />
+                <include name="LLSDMapRequest.cs" />
+                <include name="Caps.cs" />
+                <include name="LLSDMapLayerResponse.cs" />
+                <include name="LLSDMapLayer.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 3093eb0..2e1d8e2 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClientStackNetworkHandler.cs">
+    <Compile Include="ClientView.AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.AgentAssetUpload.cs">
+    <Compile Include="ClientStackNetworkHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
+    <Compile Include="ClientView.API.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="PacketServer.cs">
+    <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionApplicationBase.cs">
+    <Compile Include="ClientViewBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index f76a4c8..1c791d3 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
             <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="ClientStackNetworkHandler.cs" />
                 <include name="ClientView.AgentAssetUpload.cs" />
-                <include name="ClientView.API.cs" />
-                <include name="ClientView.cs" />
+                <include name="ClientStackNetworkHandler.cs" />
+                <include name="PacketServer.cs" />
+                <include name="UDPServer.cs" />
                 <include name="ClientView.PacketHandlers.cs" />
+                <include name="ClientView.API.cs" />
                 <include name="ClientView.ProcessPackets.cs" />
-                <include name="ClientViewBase.cs" />
-                <include name="PacketServer.cs" />
                 <include name="RegionApplicationBase.cs" />
-                <include name="UDPServer.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="ClientView.cs" />
                 <include name="Assets/InventoryCache.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index f5aa8ae..bacaa3e 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Communications.Local
         public CommunicationsLocal(NetworkServersInfo serversInfo)
             : base(serversInfo)
         {
-            UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
+            UserServices = new LocalUserServices(this,this.ServersInfo.DefaultHomeLocX,this.ServersInfo.DefaultHomeLocY);
             UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
             UserServer = UserServices;
             GridServer = SandBoxServices;
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 0a15a49..200fa3a 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommunicationsLocal.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LocalUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="CommunicationsLocal.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index 3cac9d3..60a90bd 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="CommunicationsLocal.cs" />
                 <include name="LocalBackEndServices.cs" />
                 <include name="LocalUserServices.cs" />
+                <include name="CommunicationsLocal.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
index 77848fa..2bf9536 100644
--- a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
+++ b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Region.Communications.OGS1
         {
             GridServer = gridInterComms;
             InterRegion = gridInterComms;
-            UserServer = new OGSUserServices();
+            UserServer = new OGSUserServices(this);
         }
     }
 }
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
index 48d3018..d41bdaf 100644
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
@@ -1,24 +1,87 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Data;
 using libsecondlife;
 
+using Nwc.XmlRpc;
+
 namespace OpenSim.Region.Communications.OGS1
 {
     public class OGSUserServices :IUserServices
     {
+        GridCommsManager m_parent;
+        public OGSUserServices(GridCommsManager parent)
+        {
+            m_parent = parent;
+        }
+
+        public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
+        {
+            UserProfileData userData = new UserProfileData();
+            userData.username = (string)data["firstname"];
+            userData.surname = (string)data["lastname"];
+            userData.UUID = new LLUUID((string)data["uuid"]);
+            userData.userInventoryURI = (string)data["server_inventory"];
+            userData.userAssetURI = (string)data["server_asset"];
+            userData.profileFirstText = (string)data["profile_firstlife_about"];
+            userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
+            userData.profileCanDoMask = (uint)data["profile_can_do"];
+            userData.profileWantDoMask = (uint)data["profile_want_do"];
+            userData.profileImage = new LLUUID((string)data["profile_image"]);
+            userData.lastLogin = (int)data["profile_lastlogin"];
+            userData.homeLocation = new LLVector3();
+            userData.homeLookAt = new LLVector3();
+
+            return userData;
+        }
         public UserProfileData GetUserProfile(string firstName, string lastName)
         {
             return GetUserProfile(firstName + " " + lastName);
         }
         public UserProfileData GetUserProfile(string name)
         {
+
+            try
+            {
+                Hashtable param = new Hashtable();
+                param["avatar_name"] = name;
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
+            }
             return null;
         }
         public UserProfileData GetUserProfile(LLUUID avatarID)
         {
+            try
+            {
+
+                Hashtable param = new Hashtable();
+                param["avatar_uuid"] = avatarID.ToString();
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " + e.Message);
+            }
             return null;
         }
 
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 8cc5641..2124bd9 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,13 +116,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GridCommsManager.cs">
+    <Compile Include="OGSInterSimComms.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGS1GridServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGSInterSimComms.cs">
+    <Compile Include="GridCommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGSUserServices.cs">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 21bb15c..1a7cf69 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="GridCommsManager.cs" />
-                <include name="OGS1GridServices.cs" />
                 <include name="OGSInterSimComms.cs" />
+                <include name="OGS1GridServices.cs" />
+                <include name="GridCommsManager.cs" />
                 <include name="OGSUserServices.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 4069454..9f8d2c3 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -148,64 +148,64 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="EstateManager.cs">
+    <Compile Include="RegionManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ParcelManager.cs">
+    <Compile Include="EstateManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionManager.cs">
+    <Compile Include="ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Entity.cs">
+    <Compile Include="Scenes\ScenePresence.Body.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
+    <Compile Include="Scenes\SceneEvents.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Primitive.cs">
+    <Compile Include="Scenes\ScenePresence.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.cs">
+    <Compile Include="Scenes\ScenePresence.Animations.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\Scene.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneEvents.cs">
+    <Compile Include="Scenes\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneObject.cs">
+    <Compile Include="Scenes\IScenePresenceBody.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Animations.cs">
+    <Compile Include="Scenes\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
+    <Compile Include="Scenes\SceneBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
+    <Compile Include="Scenes\Scene.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Script.cs">
+    <Compile Include="Scenes\scripting\ScriptManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\ScriptInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\ScriptManager.cs">
+    <Compile Include="Scenes\scripting\Script.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
+    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
+    <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 51924d5..667f1d7 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="RegionManager.cs" />
                 <include name="EstateManager.cs" />
                 <include name="ParcelManager.cs" />
-                <include name="RegionManager.cs" />
-                <include name="Scenes/Entity.cs" />
-                <include name="Scenes/IScenePresenceBody.cs" />
-                <include name="Scenes/Primitive.cs" />
-                <include name="Scenes/Scene.cs" />
-                <include name="Scenes/Scene.PacketHandlers.cs" />
-                <include name="Scenes/SceneBase.cs" />
-                <include name="Scenes/SceneEvents.cs" />
-                <include name="Scenes/SceneObject.cs" />
-                <include name="Scenes/ScenePresence.Animations.cs" />
                 <include name="Scenes/ScenePresence.Body.cs" />
+                <include name="Scenes/SceneEvents.cs" />
                 <include name="Scenes/ScenePresence.cs" />
-                <include name="Scenes/scripting/Script.cs" />
-                <include name="Scenes/scripting/ScriptInfo.cs" />
+                <include name="Scenes/ScenePresence.Animations.cs" />
+                <include name="Scenes/Scene.PacketHandlers.cs" />
+                <include name="Scenes/SceneObject.cs" />
+                <include name="Scenes/Primitive.cs" />
+                <include name="Scenes/IScenePresenceBody.cs" />
+                <include name="Scenes/Entity.cs" />
+                <include name="Scenes/SceneBase.cs" />
+                <include name="Scenes/Scene.cs" />
                 <include name="Scenes/scripting/ScriptManager.cs" />
+                <include name="Scenes/scripting/ScriptInfo.cs" />
+                <include name="Scenes/scripting/Script.cs" />
                 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
-                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
                 <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />
+                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 147158c..716fd57 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,9 +93,6 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -105,6 +102,9 @@
     <Compile Include="UUIDPrimQuery.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Db4LocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index fc9f055..112ff1c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
             </resources>
             <sources failonempty="true">
                 <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
                 <include name="MapStorage.cs" />
                 <include name="UUIDParcelQuery.cs" />
                 <include name="UUIDPrimQuery.cs" />
+                <include name="Db4LocalStorage.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index c8b859c..f332827 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,9 +83,6 @@
     <Compile Include="Prebuild.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\FatalException.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Core\Kernel.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -95,19 +92,25 @@
     <Compile Include="Core\WarningException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+    <Compile Include="Core\FatalException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Interfaces\ITarget.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Interfaces\IDataNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\TargetAttribute.cs">
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Interfaces\IDataNode.cs">
+    <Compile Include="Core\Attributes\TargetAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
+    <Compile Include="Core\Nodes\ProjectNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -119,76 +122,73 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FileNode.cs">
+    <Compile Include="Core\Nodes\OptionsNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
+    <Compile Include="Core\Nodes\ReferencePathNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\MatchNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\OptionsNode.cs">
+    <Compile Include="Core\Nodes\SolutionNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ProcessNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ProjectNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Core\Nodes\ReferenceNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ReferencePathNode.cs">
+    <Compile Include="Core\Nodes\FileNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\SolutionNode.cs">
+    <Compile Include="Core\Nodes\FilesNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\IfContext.cs">
+    <Compile Include="Core\Targets\DebugTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\Preprocessor.cs">
+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\AutotoolsTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\DebugTarget.cs">
+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
+    <Compile Include="Core\Targets\VS2002Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\NAntTarget.cs">
+    <Compile Include="Core\Targets\VS2003Target.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\SharpDevelop2Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
+    <Compile Include="Core\Targets\VS2005Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2002Target.cs">
+    <Compile Include="Core\Targets\NAntTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2003Target.cs">
+    <Compile Include="Core\Parse\IfContext.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2005Target.cs">
+    <Compile Include="Core\Parse\Preprocessor.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+    <Compile Include="Core\Utilities\Helper.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+    <Compile Include="Core\Utilities\Log.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\Helper.cs">
+    <Compile Include="Core\Utilities\CommandLineCollection.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\Log.cs">
+    <Compile Include="Core\Utilities\CurrentDirectory.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 2851125..52dd1a7 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
             </resources>
             <sources failonempty="true">
                 <include name="Prebuild.cs" />
-                <include name="Core/FatalException.cs" />
                 <include name="Core/Kernel.cs" />
                 <include name="Core/UnknownLanguageException.cs" />
                 <include name="Core/WarningException.cs" />
-                <include name="Core/Attributes/DataNodeAttribute.cs" />
+                <include name="Core/FatalException.cs" />
+                <include name="Core/Interfaces/ITarget.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
                 <include name="Core/Attributes/OptionNodeAttribute.cs" />
+                <include name="Core/Attributes/DataNodeAttribute.cs" />
                 <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Interfaces/IDataNode.cs" />
-                <include name="Core/Interfaces/ITarget.cs" />
+                <include name="Core/Nodes/ProjectNode.cs" />
                 <include name="Core/Nodes/ConfigurationNode.cs" />
                 <include name="Core/Nodes/DataNode.cs" />
                 <include name="Core/Nodes/ExcludeNode.cs" />
-                <include name="Core/Nodes/FileNode.cs" />
-                <include name="Core/Nodes/FilesNode.cs" />
-                <include name="Core/Nodes/MatchNode.cs" />
                 <include name="Core/Nodes/OptionsNode.cs" />
-                <include name="Core/Nodes/ProcessNode.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
-                <include name="Core/Nodes/ReferenceNode.cs" />
                 <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/MatchNode.cs" />
                 <include name="Core/Nodes/SolutionNode.cs" />
-                <include name="Core/Parse/IfContext.cs" />
-                <include name="Core/Parse/Preprocessor.cs" />
-                <include name="Core/Targets/AutotoolsTarget.cs" />
+                <include name="Core/Nodes/ProcessNode.cs" />
+                <include name="Core/Nodes/ReferenceNode.cs" />
+                <include name="Core/Nodes/FileNode.cs" />
+                <include name="Core/Nodes/FilesNode.cs" />
                 <include name="Core/Targets/DebugTarget.cs" />
                 <include name="Core/Targets/MonoDevelopTarget.cs" />
-                <include name="Core/Targets/NAntTarget.cs" />
-                <include name="Core/Targets/SharpDevelop2Target.cs" />
+                <include name="Core/Targets/AutotoolsTarget.cs" />
                 <include name="Core/Targets/SharpDevelopTarget.cs" />
                 <include name="Core/Targets/VS2002Target.cs" />
                 <include name="Core/Targets/VS2003Target.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.cs" />
                 <include name="Core/Targets/VS2005Target.cs" />
-                <include name="Core/Utilities/CommandLineCollection.cs" />
-                <include name="Core/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Parse/Preprocessor.cs" />
                 <include name="Core/Utilities/Helper.cs" />
                 <include name="Core/Utilities/Log.cs" />
+                <include name="Core/Utilities/CommandLineCollection.cs" />
+                <include name="Core/Utilities/CurrentDirectory.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/prebuild.xml b/prebuild.xml
index 1e51bd4..f9e4361 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -667,6 +667,7 @@
       <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Data"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Framework.Servers"/>
-- 
cgit v1.1


From d3363bbc28442d70ea8c196e47e6c734f4c01a92 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 17:03:09 +0000
Subject: *Renamed GridCommsManager to CommunicationsOGS1 to match
 CommunicationsLocal -- its sandbox mode counterpart

---
 OpenSim/Region/Application/OpenSimMain.cs          |  2 +-
 .../Communications/OGS1/CommunicationsOGS1.cs      | 18 ++++++++
 .../Region/Communications/OGS1/GridCommsManager.cs | 18 --------
 .../Region/Communications/OGS1/OGSUserServices.cs  |  4 +-
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj | 49 ++++++++++++----------
 5 files changed, 49 insertions(+), 42 deletions(-)
 create mode 100644 OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
 delete mode 100644 OpenSim/Region/Communications/OGS1/GridCommsManager.cs

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6e600b8..a5150e6 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -118,7 +118,7 @@ namespace OpenSim
             else
             {
                 this.SetupRemoteGridServers();
-                this.commsManager = new GridCommsManager(this.serversData);
+                this.commsManager = new CommunicationsOGS1(this.serversData);
             }
 
             startuptime = DateTime.Now;
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
new file mode 100644
index 0000000..f2b3b92
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Region.Communications.OGS1
+{
+    public class CommunicationsOGS1 : CommunicationsManager
+    {
+        private OGS1GridServices gridInterComms = new OGS1GridServices();
+        public CommunicationsOGS1(NetworkServersInfo serversInfo) :base(serversInfo)
+        {
+            GridServer = gridInterComms;
+            InterRegion = gridInterComms;
+            UserServer = new OGSUserServices(this);
+        }
+    }
+}
diff --git a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
deleted file mode 100644
index 2bf9536..0000000
--- a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications;
-namespace OpenSim.Region.Communications.OGS1
-{
-    public class GridCommsManager : CommunicationsManager
-    {
-        private OGS1GridServices gridInterComms = new OGS1GridServices();
-        public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
-        {
-            GridServer = gridInterComms;
-            InterRegion = gridInterComms;
-            UserServer = new OGSUserServices(this);
-        }
-    }
-}
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
index d41bdaf..56a7837 100644
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
@@ -13,8 +13,8 @@ namespace OpenSim.Region.Communications.OGS1
 {
     public class OGSUserServices :IUserServices
     {
-        GridCommsManager m_parent;
-        public OGSUserServices(GridCommsManager parent)
+        CommunicationsOGS1 m_parent;
+        public OGSUserServices(CommunicationsOGS1 parent)
         {
             m_parent = parent;
         }
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 2124bd9..b03ac7e 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
     <ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>
@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
     <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>
-    <StartupObject></StartupObject>
+    <StartupObject>
+    </StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -55,30 +61,31 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libsecondlife.dll" >
+    <Reference Include="libsecondlife.dll">
       <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System" >
+    <Reference Include="System">
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data" >
+    <Reference Include="System.Data">
       <HintPath>System.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Runtime.Remoting" >
+    <Reference Include="System.Runtime.Remoting">
       <HintPath>System.Runtime.Remoting.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml" >
+    <Reference Include="System.Xml">
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC.dll" >
+    <Reference Include="XMLRPC.dll">
       <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -88,31 +95,31 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
       <Name>OpenSim.Framework.Data</Name>
       <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
       <Name>OpenSim.Framework.Servers</Name>
       <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -122,7 +129,7 @@
     <Compile Include="OGS1GridServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="GridCommsManager.cs">
+    <Compile Include="CommunicationsOGS1.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGSUserServices.cs">
@@ -139,4 +146,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
-- 
cgit v1.1


From 41f26668d93dd871056ba506a306cd23e8573503 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 28 Jun 2007 17:48:45 +0000
Subject: enabled physics plugin flying flags.

---
 OpenSim/Region/Communications/Local/LocalUserServices.cs | 2 ++
 OpenSim/Region/Environment/Scenes/ScenePresence.cs       | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 2097870..508a3f9 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -36,6 +36,7 @@ namespace OpenSim.Region.Communications.Local
         {
             return this.getUserProfile(name);
         }
+
         public UserProfileData GetUserProfile(LLUUID avatarID)
         {
             return this.getUserProfile(avatarID);
@@ -118,6 +119,7 @@ namespace OpenSim.Region.Communications.Local
         {
             return SetupMasterUser(firstName, lastName, "");
         }
+
         public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
         {
             UserProfileData profile = getUserProfile(firstName, lastName);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 23434a0..b90004e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -242,8 +242,7 @@ namespace OpenSim.Region.Environment.Scenes
             Vector3 agent_control_v3 = new Vector3(0, 0, 0);
             Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
 
-
-            // this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
+            this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
 
             if (q != this.bodyRot)
             {
-- 
cgit v1.1


From fe0528b98cfc13d26ac7f1bf6bc23655be1f52e5 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 19:09:50 +0000
Subject: *Added UUIDNameRequest packet support (untested, but should work --
 at least in sandbox mode) *Various small renamings

---
 OpenGridServices.sln                               | 127 +++++++++++----------
 .../Communications/CommunicationsManager.cs        |  18 +++
 OpenSim/Framework/General/Interfaces/IClientAPI.cs |   4 +
 OpenSim/Framework/General/OpenSim.Framework.csproj |   4 +-
 .../Framework/General/OpenSim.Framework.dll.build  |   2 +-
 OpenSim/Region/Application/OpenSimMain.cs          |   8 +-
 .../OpenSim.Region.Capabilities.csproj             |   6 +-
 .../OpenSim.Region.Capabilities.dll.build          |   2 +-
 OpenSim/Region/ClientStack/ClientView.API.cs       |   3 +-
 .../ClientStack/ClientView.PacketHandlers.cs       |   2 -
 .../ClientStack/ClientView.ProcessPackets.cs       |   8 +-
 .../ClientStack/OpenSim.Region.ClientStack.csproj  |  10 +-
 .../OpenSim.Region.ClientStack.dll.build           |   6 +-
 .../Communications/OGS1/CommunicationsOGS1.cs      |   2 +-
 .../Communications/OGS1/OGS1InterSimComms.cs       |  70 ++++++++++++
 .../Region/Communications/OGS1/OGS1UserServices.cs | 109 ++++++++++++++++++
 .../Region/Communications/OGS1/OGSInterSimComms.cs |  70 ------------
 .../Region/Communications/OGS1/OGSUserServices.cs  | 103 -----------------
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj |  51 ++++-----
 .../OpenSim.Region.Communications.OGS1.dll.build   |   6 +-
 .../Environment/OpenSim.Region.Environment.csproj  |   6 +-
 .../OpenSim.Region.Environment.dll.build           |   2 +-
 OpenSim/Region/Environment/Scenes/Scene.cs         |   3 +-
 23 files changed, 329 insertions(+), 293 deletions(-)
 create mode 100644 OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
 create mode 100644 OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
 delete mode 100644 OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs
 delete mode 100644 OpenSim/Region/Communications/OGS1/OGSUserServices.cs

diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 5f47b6b..2343bc0 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.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.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,61 +25,72 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-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
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08F87229-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
+    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
+    ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 69b5da6..b17b37b 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -30,9 +30,11 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using OpenSim.Framework;
+using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using libsecondlife;
+using libsecondlife.Packets;
 
 namespace OpenSim.Framework.Communications
 {
@@ -48,5 +50,21 @@ namespace OpenSim.Framework.Communications
         {
             ServersInfo = serversInfo;
         }
+
+        #region Packet Handlers
+        public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
+        {
+            UserProfileData profileData = this.UserServer.GetUserProfile(uuid);
+            if (profileData != null)
+            {
+                UUIDNameReplyPacket packet = new UUIDNameReplyPacket();
+                packet.UUIDNameBlock[0].ID = profileData.UUID;
+                packet.UUIDNameBlock[0].FirstName = libsecondlife.Helpers.StringToField(profileData.username);
+                packet.UUIDNameBlock[0].LastName = libsecondlife.Helpers.StringToField(profileData.surname);
+                remote_client.OutPacket((Packet)packet);
+            }
+            
+        }
+        #endregion
     }
 }
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 009648c..4e8ac1a 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -69,6 +69,8 @@ namespace OpenSim.Framework.Interfaces
 
     public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
 
+    public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);
+
     public interface IClientAPI
     {
         event ChatFromViewer OnChatFromViewer;
@@ -103,6 +105,8 @@ namespace OpenSim.Framework.Interfaces
         event NewAvatar OnNewAvatar;
         event GenericCall6 OnRemoveAvatar;
 
+        event UUIDNameRequest OnNameFromUUIDRequest;
+
         event ParcelPropertiesRequest OnParcelPropertiesRequest;
         event ParcelDivideRequest OnParcelDivideRequest;
         event ParcelJoinRequest OnParcelJoinRequest;
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 261b96b..fbbf568 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -133,10 +133,10 @@
     <Compile Include="Interfaces\IWorld.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IClientAPI.cs">
+    <Compile Include="Interfaces\ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\ILocalStorage.cs">
+    <Compile Include="Interfaces\IClientAPI.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\Config\IGenericConfig.cs">
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index f05217f..f81737d 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -26,8 +26,8 @@
                 <include name="Interfaces/IUserServer.cs" />
                 <include name="Interfaces/IAssetServer.cs" />
                 <include name="Interfaces/IWorld.cs" />
-                <include name="Interfaces/IClientAPI.cs" />
                 <include name="Interfaces/ILocalStorage.cs" />
+                <include name="Interfaces/IClientAPI.cs" />
                 <include name="Interfaces/Config/IGenericConfig.cs" />
                 <include name="Interfaces/Config/IUserConfig.cs" />
                 <include name="Interfaces/Config/IGridConfig.cs" />
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index a5150e6..fcb2493 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -64,8 +64,8 @@ namespace OpenSim
 
     public class OpenSimMain : RegionApplicationBase, conscmd_callback
     {
-      //  private CheckSumServer checkServer;
         protected CommunicationsManager commsManager;
+      //  private CheckSumServer checkServer;
 
         private bool m_silent;
         private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
@@ -106,14 +106,12 @@ namespace OpenSim
 
             ClientView.TerrainManager = new TerrainManager(new SecondLife());
 
-            CommunicationsLocal sandboxCommunications = null;
             if (m_sandbox)
             {
                 this.SetupLocalGridServers();
               //  this.checkServer = new CheckSumServer(12036);
               //  this.checkServer.ServerListener();
-                sandboxCommunications = new CommunicationsLocal(this.serversData);
-                this.commsManager = sandboxCommunications;
+                this.commsManager = new CommunicationsLocal(this.serversData);
             }
             else
             {
@@ -136,7 +134,7 @@ namespace OpenSim
 
             if (m_sandbox)
             {
-                httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);
+                httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
             }
 
             //Start http server
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 1ed28d2..bb21365 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -114,9 +114,6 @@
     <Compile Include="LLSDType.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDHelpers.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="LLSDCapEvent.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -132,6 +129,9 @@
     <Compile Include="LLSDMapLayer.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="LLSDHelpers.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index dd853e7..817e5b0 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -17,12 +17,12 @@
                 <include name="LLSDTest.cs" />
                 <include name="LLSDUploadReply.cs" />
                 <include name="LLSDType.cs" />
-                <include name="LLSDHelpers.cs" />
                 <include name="LLSDCapEvent.cs" />
                 <include name="LLSDMapRequest.cs" />
                 <include name="Caps.cs" />
                 <include name="LLSDMapLayerResponse.cs" />
                 <include name="LLSDMapLayer.cs" />
+                <include name="LLSDHelpers.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 5e346fb..9650b42 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -68,6 +68,8 @@ namespace OpenSim.Region.ClientStack
         public event GenericCall6 OnRemoveAvatar;
         public event RequestMapBlocks OnRequestMapBlocks;
         public event TeleportLocationRequest OnTeleportLocationRequest;
+        
+        public event UUIDNameRequest OnNameFromUUIDRequest;
 
         public event ParcelPropertiesRequest OnParcelPropertiesRequest;
         public event ParcelDivideRequest OnParcelDivideRequest;
@@ -75,7 +77,6 @@ namespace OpenSim.Region.ClientStack
         public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
 
         public event EstateOwnerMessageRequest OnEstateOwnerMessage;
-
         /// <summary>
         /// 
         /// </summary>
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index cbd10dc..0456e3c 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -192,7 +192,5 @@ namespace OpenSim.Region.ClientStack
             this.OutPacket(mbReply);
              */
         }
-
-       
     }
 }
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 51981b8..794ce79 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -492,7 +492,13 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.MoneyBalanceRequest:
                         this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
                         break;
-
+                    case PacketType.UUIDNameRequest:
+                        UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
+                        foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
+                        {
+                            OnNameFromUUIDRequest(UUIDBlock.ID, this);
+                        }
+                        break;
                     #region Parcel related packets
                     case PacketType.ParcelPropertiesRequest:
                         ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 2e1d8e2..e679174 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -134,22 +134,22 @@
     <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.PacketHandlers.cs">
+    <Compile Include="ClientViewBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
+    <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="ClientView.API.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 1c791d3..95422c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -15,12 +15,12 @@
                 <include name="ClientStackNetworkHandler.cs" />
                 <include name="PacketServer.cs" />
                 <include name="UDPServer.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="ClientView.cs" />
                 <include name="ClientView.PacketHandlers.cs" />
+                <include name="RegionApplicationBase.cs" />
                 <include name="ClientView.API.cs" />
                 <include name="ClientView.ProcessPackets.cs" />
-                <include name="RegionApplicationBase.cs" />
-                <include name="ClientViewBase.cs" />
-                <include name="ClientView.cs" />
                 <include name="Assets/InventoryCache.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index f2b3b92..870f577 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Region.Communications.OGS1
         {
             GridServer = gridInterComms;
             InterRegion = gridInterComms;
-            UserServer = new OGSUserServices(this);
+            UserServer = new OGS1UserServices(this);
         }
     }
 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
new file mode 100644
index 0000000..51b33e9
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Region.Communications.OGS1
+{
+    public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
+    public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
+
+    public sealed class InterRegionSingleton
+    {
+        static readonly InterRegionSingleton instance = new InterRegionSingleton();
+
+        public event InformRegionChild OnChildAgent;
+        public event ExpectArrival OnArrival;
+
+        static InterRegionSingleton()
+        {
+        }
+
+        InterRegionSingleton()
+        {
+        }
+
+        public static InterRegionSingleton Instance
+        {
+            get
+            {
+                return instance;
+            }
+        }
+
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            if (OnChildAgent != null)
+            {
+                return OnChildAgent(regionHandle, agentData);
+            }
+            return false;
+        }
+
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            if (OnArrival != null)
+            {
+                return OnArrival(regionHandle, agentID, position);
+            }
+            return false;
+        }
+    }
+
+    public class OGS1InterRegionRemoting : MarshalByRefObject
+    {
+
+        public OGS1InterRegionRemoting()
+        {
+        }
+
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
+        }
+
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
+        }
+    }
+}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
new file mode 100644
index 0000000..856c447
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Data;
+using libsecondlife;
+
+using Nwc.XmlRpc;
+
+namespace OpenSim.Region.Communications.OGS1
+{
+    public class OGS1UserServices :IUserServices
+    {
+        CommunicationsOGS1 m_parent;
+        public OGS1UserServices(CommunicationsOGS1 parent)
+        {
+            m_parent = parent;
+        }
+
+        public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
+        {
+            if (data.Contains("error_type"))
+            {
+                Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] + "): " + data["error_desc"]);
+                return null;
+            }
+
+            UserProfileData userData = new UserProfileData();
+            userData.username = (string)data["firstname"];
+            userData.surname = (string)data["lastname"];
+            userData.UUID = new LLUUID((string)data["uuid"]);
+            userData.userInventoryURI = (string)data["server_inventory"];
+            userData.userAssetURI = (string)data["server_asset"];
+            userData.profileFirstText = (string)data["profile_firstlife_about"];
+            userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
+            userData.profileCanDoMask = (uint)data["profile_can_do"];
+            userData.profileWantDoMask = (uint)data["profile_want_do"];
+            userData.profileImage = new LLUUID((string)data["profile_image"]);
+            userData.lastLogin = (int)data["profile_lastlogin"];
+            userData.homeLocation = new LLVector3();
+            userData.homeLookAt = new LLVector3();
+
+            return userData;
+        }
+        public UserProfileData GetUserProfile(string firstName, string lastName)
+        {
+            return GetUserProfile(firstName + " " + lastName);
+        }
+        public UserProfileData GetUserProfile(string name)
+        {
+
+            try
+            {
+                Hashtable param = new Hashtable();
+                param["avatar_name"] = name;
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
+            }
+            return null;
+        }
+        public UserProfileData GetUserProfile(LLUUID avatarID)
+        {
+            try
+            {
+
+                Hashtable param = new Hashtable();
+                param["avatar_uuid"] = avatarID.ToString();
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " + e.Message);
+            }
+            return null;
+        }
+
+        public UserProfileData SetupMasterUser(string firstName, string lastName)
+        {
+            return SetupMasterUser(firstName, lastName, "");
+        }
+
+        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+        {
+            UserProfileData profile = GetUserProfile(firstName, lastName);
+            if (profile == null)
+            {
+                Console.WriteLine("Unknown Master User. Grid Mode: No clue what I should do. Probably would choose the grid owner UUID when that is implemented");
+            }
+            return null;
+        }
+    }
+}
diff --git a/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs
deleted file mode 100644
index 51b33e9..0000000
--- a/OpenSim/Region/Communications/OGS1/OGSInterSimComms.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications;
-namespace OpenSim.Region.Communications.OGS1
-{
-    public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
-    public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
-
-    public sealed class InterRegionSingleton
-    {
-        static readonly InterRegionSingleton instance = new InterRegionSingleton();
-
-        public event InformRegionChild OnChildAgent;
-        public event ExpectArrival OnArrival;
-
-        static InterRegionSingleton()
-        {
-        }
-
-        InterRegionSingleton()
-        {
-        }
-
-        public static InterRegionSingleton Instance
-        {
-            get
-            {
-                return instance;
-            }
-        }
-
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            if (OnChildAgent != null)
-            {
-                return OnChildAgent(regionHandle, agentData);
-            }
-            return false;
-        }
-
-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            if (OnArrival != null)
-            {
-                return OnArrival(regionHandle, agentID, position);
-            }
-            return false;
-        }
-    }
-
-    public class OGS1InterRegionRemoting : MarshalByRefObject
-    {
-
-        public OGS1InterRegionRemoting()
-        {
-        }
-
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
-        {
-            return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
-        }
-
-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
-        {
-            return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
-        }
-    }
-}
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
deleted file mode 100644
index 56a7837..0000000
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Data;
-using libsecondlife;
-
-using Nwc.XmlRpc;
-
-namespace OpenSim.Region.Communications.OGS1
-{
-    public class OGSUserServices :IUserServices
-    {
-        CommunicationsOGS1 m_parent;
-        public OGSUserServices(CommunicationsOGS1 parent)
-        {
-            m_parent = parent;
-        }
-
-        public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
-        {
-            UserProfileData userData = new UserProfileData();
-            userData.username = (string)data["firstname"];
-            userData.surname = (string)data["lastname"];
-            userData.UUID = new LLUUID((string)data["uuid"]);
-            userData.userInventoryURI = (string)data["server_inventory"];
-            userData.userAssetURI = (string)data["server_asset"];
-            userData.profileFirstText = (string)data["profile_firstlife_about"];
-            userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
-            userData.profileCanDoMask = (uint)data["profile_can_do"];
-            userData.profileWantDoMask = (uint)data["profile_want_do"];
-            userData.profileImage = new LLUUID((string)data["profile_image"]);
-            userData.lastLogin = (int)data["profile_lastlogin"];
-            userData.homeLocation = new LLVector3();
-            userData.homeLookAt = new LLVector3();
-
-            return userData;
-        }
-        public UserProfileData GetUserProfile(string firstName, string lastName)
-        {
-            return GetUserProfile(firstName + " " + lastName);
-        }
-        public UserProfileData GetUserProfile(string name)
-        {
-
-            try
-            {
-                Hashtable param = new Hashtable();
-                param["avatar_name"] = name;
-                IList parameters = new ArrayList();
-                parameters.Add(param);
-                XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
-                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
-                Hashtable respData = (Hashtable)resp.Value;
-
-                return ConvertXMLRPCDataToUserProfile(respData);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
-            }
-            return null;
-        }
-        public UserProfileData GetUserProfile(LLUUID avatarID)
-        {
-            try
-            {
-
-                Hashtable param = new Hashtable();
-                param["avatar_uuid"] = avatarID.ToString();
-                IList parameters = new ArrayList();
-                parameters.Add(param);
-                XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
-                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
-                Hashtable respData = (Hashtable)resp.Value;
-
-                return ConvertXMLRPCDataToUserProfile(respData);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " + e.Message);
-            }
-            return null;
-        }
-
-        public UserProfileData SetupMasterUser(string firstName, string lastName)
-        {
-            return SetupMasterUser(firstName, lastName, "");
-        }
-
-        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
-        {
-            UserProfileData profile = GetUserProfile(firstName, lastName);
-            if (profile == null)
-            {
-                Console.WriteLine("Unknown Master User. Grid Mode: No clue what I should do. Probably would choose the grid owner UUID when that is implemented");
-            }
-            return null;
-        }
-    }
-}
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index b03ac7e..0a9e5fb 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
     <ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,31 +55,30 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
       <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System">
+    <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data">
+    <Reference Include="System.Data" >
       <HintPath>System.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Runtime.Remoting">
+    <Reference Include="System.Runtime.Remoting" >
       <HintPath>System.Runtime.Remoting.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml">
+    <Reference Include="System.Xml" >
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="XMLRPC.dll">
+    <Reference Include="XMLRPC.dll" >
       <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -95,35 +88,35 @@
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
       <Name>OpenSim.Framework.Communications</Name>
       <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
       <Name>OpenSim.Framework.Data</Name>
       <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
       <Name>OpenSim.Framework.Servers</Name>
       <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+			<Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="OGSInterSimComms.cs">
+    <Compile Include="OGS1InterSimComms.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGS1GridServices.cs">
@@ -132,7 +125,7 @@
     <Compile Include="CommunicationsOGS1.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGSUserServices.cs">
+    <Compile Include="OGS1UserServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -146,4 +139,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 1a7cf69..2176b14 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="OGSInterSimComms.cs" />
+                <include name="OGS1InterSimComms.cs" />
                 <include name="OGS1GridServices.cs" />
-                <include name="GridCommsManager.cs" />
-                <include name="OGSUserServices.cs" />
+                <include name="CommunicationsOGS1.cs" />
+                <include name="OGS1UserServices.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 9f8d2c3..0cfeda9 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -163,9 +163,6 @@
     <Compile Include="Scenes\SceneEvents.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Scenes\ScenePresence.Animations.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -187,6 +184,9 @@
     <Compile Include="Scenes\SceneBase.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Scenes\ScenePresence.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Scenes\Scene.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 667f1d7..fcfc623 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -16,7 +16,6 @@
                 <include name="ParcelManager.cs" />
                 <include name="Scenes/ScenePresence.Body.cs" />
                 <include name="Scenes/SceneEvents.cs" />
-                <include name="Scenes/ScenePresence.cs" />
                 <include name="Scenes/ScenePresence.Animations.cs" />
                 <include name="Scenes/Scene.PacketHandlers.cs" />
                 <include name="Scenes/SceneObject.cs" />
@@ -24,6 +23,7 @@
                 <include name="Scenes/IScenePresenceBody.cs" />
                 <include name="Scenes/Entity.cs" />
                 <include name="Scenes/SceneBase.cs" />
+                <include name="Scenes/ScenePresence.cs" />
                 <include name="Scenes/Scene.cs" />
                 <include name="Scenes/scripting/ScriptManager.cs" />
                 <include name="Scenes/scripting/ScriptInfo.cs" />
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f1de803..8c912d0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -505,6 +505,7 @@ namespace OpenSim.Region.Environment.Scenes
             remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;
            //remoteClient.OnObjectSelect += this.SelectPrim;
             remoteClient.OnGrapUpdate += this.MoveObject;
+            remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
 
             /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
             remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@@ -512,7 +513,7 @@ namespace OpenSim.Region.Environment.Scenes
             remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
             remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
             */
-
+            
             ScenePresence newAvatar = null;
             try
             {
-- 
cgit v1.1


From 135e9b1f538ae77dfd8bf68139c960fb8e016c16 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 28 Jun 2007 19:35:20 +0000
Subject: * Removed J# language support because it has issues with Mono.

---
 OpenSim.sln                                        | 308 +++++++++++++--------
 .../OpenSim.Framework.Communications.csproj        |   6 +-
 .../OpenSim.Framework.Communications.dll.build     |   2 +-
 .../Console/OpenSim.Framework.Console.csproj       |   4 +-
 .../Console/OpenSim.Framework.Console.dll.build    |   2 +-
 .../Data.DB4o/OpenSim.Framework.Data.DB4o.csproj   |   4 +-
 .../OpenSim.Framework.Data.DB4o.dll.build          |   4 +-
 .../Data.MySQL/OpenSim.Framework.Data.MySQL.csproj |  10 +-
 .../OpenSim.Framework.Data.MySQL.dll.build         |   6 +-
 .../OpenSim.Framework.Data.SQLite.csproj           |   4 +-
 .../OpenSim.Framework.Data.SQLite.dll.build        |   2 +-
 .../Framework/Data/OpenSim.Framework.Data.csproj   |  12 +-
 .../Data/OpenSim.Framework.Data.dll.build          |   4 +-
 OpenSim/Framework/General/OpenSim.Framework.csproj |  60 ++--
 .../Framework/General/OpenSim.Framework.dll.build  |  38 +--
 .../Servers/OpenSim.Framework.Servers.csproj       |   8 +-
 .../Servers/OpenSim.Framework.Servers.dll.build    |   6 +-
 .../OpenSim.Framework.UserManagement.dll.build     |   8 +-
 .../AssetServer/OpenSim.Grid.AssetServer.csproj    |   4 +-
 .../AssetServer/OpenSim.Grid.AssetServer.exe.build |   8 +-
 .../OpenSim.Grid.Framework.Manager.dll.build       |   4 +-
 .../OpenSim.Grid.GridServer.Config.dll.build       |   4 +-
 .../GridServer/OpenSim.Grid.GridServer.exe.build   |   8 +-
 .../OpenSim.Grid.UserServer.Config.dll.build       |   4 +-
 .../Grid/UserServer/OpenSim.Grid.UserServer.csproj |   4 +-
 .../UserServer/OpenSim.Grid.UserServer.exe.build   |  10 +-
 OpenSim/Region/Application/OpenSim.csproj          |   6 +-
 OpenSim/Region/Application/OpenSim.exe.build       |   2 +-
 .../OpenSim.Region.Capabilities.csproj             |  22 +-
 .../OpenSim.Region.Capabilities.dll.build          |  16 +-
 .../ClientStack/OpenSim.Region.ClientStack.csproj  |  20 +-
 .../OpenSim.Region.ClientStack.dll.build           |  12 +-
 .../OpenSim.Region.Communications.Local.csproj     |   6 +-
 .../OpenSim.Region.Communications.Local.dll.build  |   2 +-
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj |   4 +-
 .../OpenSim.Region.Communications.OGS1.dll.build   |   4 +-
 .../Environment/OpenSim.Region.Environment.csproj  |  39 ++-
 .../OpenSim.Region.Environment.dll.build           |  24 +-
 .../Scenes/scripting/Engines/JSharpScriptEngine.cs | 104 -------
 .../Environment/Scenes/scripting/ScriptManager.cs  |   3 -
 .../OpenSim.Region.Storage.LocalStorageDb4o.csproj |   6 +-
 ...enSim.Region.Storage.LocalStorageDb4o.dll.build |   2 +-
 Prebuild/src/Prebuild.csproj                       |  56 ++--
 Prebuild/src/Prebuild.exe.build                    |  34 +--
 prebuild.xml                                       |   2 -
 45 files changed, 430 insertions(+), 468 deletions(-)
 delete mode 100644 OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs

diff --git a/OpenSim.sln b/OpenSim.sln
index 66e79d2..93a022d 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", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
@@ -53,117 +53,197 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-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
-		{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
-		{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
-		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{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
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24B12448-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
+    ({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).6 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).9 = ({586E2916-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).10 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).11 = ({DC3698B2-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).12 = ({BFB5D807-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).13 = ({4806E378-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).14 = ({DCBA491C-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).15 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).16 = ({C9E0F891-0000-0000-0000-000000000000})
+    ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000})
+    ({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000})
+    ({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({39038E85-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({39038E85-0000-0000-0000-000000000000}).2 = ({2CC71860-0000-0000-0000-000000000000})
+    ({39038E85-0000-0000-0000-000000000000}).3 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).6 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).7 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({DC3698B2-0000-0000-0000-000000000000}).8 = ({C9E0F891-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+    ({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).5 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).10 = ({39038E85-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).11 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({DCBA491C-0000-0000-0000-000000000000}).12 = ({C9E0F891-0000-0000-0000-000000000000})
+    ({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
+    ({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000})
+    ({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000})
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {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
+    {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
+    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {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
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 66507a8..31ab172 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,6 +86,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CommunicationsManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="IGridServices.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -95,9 +98,6 @@
     <Compile Include="IUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CommunicationsManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 1c55d8c..52d29f6 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="CommunicationsManager.cs" />
                 <include name="IGridServices.cs" />
                 <include name="IInterRegionCommunications.cs" />
                 <include name="IUserServices.cs" />
-                <include name="CommunicationsManager.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index c02a506..f3dcec5 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -69,10 +69,10 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LogBase.cs">
+    <Compile Include="ConsoleCallbacksBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ConsoleCallbacksBase.cs">
+    <Compile Include="LogBase.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MainLog.cs">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index 10e72a1..eb40c0d 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -12,8 +12,8 @@
             </resources>
             <sources failonempty="true">
                 <include name="AssemblyInfo.cs" />
-                <include name="LogBase.cs" />
                 <include name="ConsoleCallbacksBase.cs" />
+                <include name="LogBase.cs" />
                 <include name="MainLog.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index f6e8311..b09cecf 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DB4oUserData.cs">
+    <Compile Include="DB4oGridData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="DB4oManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DB4oGridData.cs">
+    <Compile Include="DB4oUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index 2c5e31b..f124eb5 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="DB4oUserData.cs" />
-                <include name="DB4oManager.cs" />
                 <include name="DB4oGridData.cs" />
+                <include name="DB4oManager.cs" />
+                <include name="DB4oUserData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 09a32b5..62e3887 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MySQLInventoryData.cs">
+    <Compile Include="MySQLGridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLUserData.cs">
+    <Compile Include="MySQLInventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLManager.cs">
+    <Compile Include="MySQLLogData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLLogData.cs">
+    <Compile Include="MySQLManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MySQLGridData.cs">
+    <Compile Include="MySQLUserData.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index 3aeebbc..594ec52 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="MySQLGridData.cs" />
                 <include name="MySQLInventoryData.cs" />
-                <include name="MySQLUserData.cs" />
-                <include name="MySQLManager.cs" />
                 <include name="MySQLLogData.cs" />
-                <include name="MySQLGridData.cs" />
+                <include name="MySQLManager.cs" />
+                <include name="MySQLUserData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index dab22ea..4ba24f1 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SQLiteManager.cs">
+    <Compile Include="SQLiteGridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SQLiteGridData.cs">
+    <Compile Include="SQLiteManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index 719fbc6..e28d0a6 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="SQLiteManager.cs" />
                 <include name="SQLiteGridData.cs" />
+                <include name="SQLiteManager.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index 47b9ba3..dcafbcd 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -78,15 +78,9 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ReservationData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="GridData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfileData.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="ILogData.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -96,6 +90,12 @@
     <Compile Include="InventoryData.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="ReservationData.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimProfileData.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="UserData.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index 881bb3a..aefb02b 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -11,12 +11,12 @@
             <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="ReservationData.cs" />
                 <include name="GridData.cs" />
-                <include name="SimProfileData.cs" />
                 <include name="ILogData.cs" />
                 <include name="IniConfig.cs" />
                 <include name="InventoryData.cs" />
+                <include name="ReservationData.cs" />
+                <include name="SimProfileData.cs" />
                 <include name="UserData.cs" />
                 <include name="UserProfileData.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index fbbf568..48db634 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -91,106 +91,106 @@
     <Compile Include="AgentInventory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Util.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="AuthenticateSessionBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Logger.cs">
+    <Compile Include="BlockingQueue.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Remoting.cs">
+    <Compile Include="IRegionCommsListener.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionCommsListener.cs">
+    <Compile Include="Logger.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LoginService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BlockingQueue.cs">
+    <Compile Include="RegionCommsListener.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserProfile.cs">
+    <Compile Include="Remoting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IRegionCommsListener.cs">
+    <Compile Include="SimProfile.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SimProfile.cs">
+    <Compile Include="UserProfile.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\AuthenticateResponse.cs">
+    <Compile Include="Util.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
+    <Compile Include="Interfaces\AuthenticateResponse.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\IAssetServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
+    <Compile Include="Interfaces\IClientAPI.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\IClientAPI.cs">
+    <Compile Include="Interfaces\IUserServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IGenericConfig.cs">
+    <Compile Include="Interfaces\IWorld.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Interfaces\Config\IUserConfig.cs">
+    <Compile Include="Interfaces\Config\IGenericConfig.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Interfaces\Config\IGridConfig.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Interfaces\Config\IUserConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NeighbourInfo.cs">
+    <Compile Include="Types\AgentCiruitData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionHandle.cs">
+    <Compile Include="Types\AgentWearable.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionInfo.cs">
+    <Compile Include="Types\AssetBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\ParcelData.cs">
+    <Compile Include="Types\AssetLandmark.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentWearable.cs">
+    <Compile Include="Types\AssetStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\PrimData.cs">
+    <Compile Include="Types\EstateSettings.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\MapBlockData.cs">
+    <Compile Include="Types\Login.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetStorage.cs">
+    <Compile Include="Types\MapBlockData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\EstateSettings.cs">
+    <Compile Include="Types\NeighbourInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
+    <Compile Include="Types\NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\Login.cs">
+    <Compile Include="Types\ParcelData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
+    <Compile Include="Types\PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\AssetBase.cs">
+    <Compile Include="Types\RegionHandle.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\NetworkServersInfo.cs">
+    <Compile Include="Types\RegionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index f81737d..a18838b 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -12,40 +12,40 @@
             </resources>
             <sources failonempty="true">
                 <include name="AgentInventory.cs" />
-                <include name="Util.cs" />
                 <include name="AuthenticateSessionBase.cs" />
-                <include name="Logger.cs" />
-                <include name="Remoting.cs" />
-                <include name="RegionCommsListener.cs" />
-                <include name="LoginService.cs" />
                 <include name="BlockingQueue.cs" />
-                <include name="UserProfile.cs" />
                 <include name="IRegionCommsListener.cs" />
+                <include name="Logger.cs" />
+                <include name="LoginService.cs" />
+                <include name="RegionCommsListener.cs" />
+                <include name="Remoting.cs" />
                 <include name="SimProfile.cs" />
+                <include name="UserProfile.cs" />
+                <include name="Util.cs" />
                 <include name="Interfaces/AuthenticateResponse.cs" />
-                <include name="Interfaces/IUserServer.cs" />
                 <include name="Interfaces/IAssetServer.cs" />
-                <include name="Interfaces/IWorld.cs" />
-                <include name="Interfaces/ILocalStorage.cs" />
                 <include name="Interfaces/IClientAPI.cs" />
+                <include name="Interfaces/ILocalStorage.cs" />
+                <include name="Interfaces/IUserServer.cs" />
+                <include name="Interfaces/IWorld.cs" />
                 <include name="Interfaces/Config/IGenericConfig.cs" />
-                <include name="Interfaces/Config/IUserConfig.cs" />
                 <include name="Interfaces/Config/IGridConfig.cs" />
+                <include name="Interfaces/Config/IUserConfig.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/NeighbourInfo.cs" />
-                <include name="Types/RegionHandle.cs" />
-                <include name="Types/RegionInfo.cs" />
-                <include name="Types/ParcelData.cs" />
+                <include name="Types/AgentCiruitData.cs" />
                 <include name="Types/AgentWearable.cs" />
-                <include name="Types/PrimData.cs" />
-                <include name="Types/MapBlockData.cs" />
+                <include name="Types/AssetBase.cs" />
+                <include name="Types/AssetLandmark.cs" />
                 <include name="Types/AssetStorage.cs" />
                 <include name="Types/EstateSettings.cs" />
-                <include name="Types/AgentCiruitData.cs" />
                 <include name="Types/Login.cs" />
-                <include name="Types/AssetLandmark.cs" />
-                <include name="Types/AssetBase.cs" />
+                <include name="Types/MapBlockData.cs" />
+                <include name="Types/NeighbourInfo.cs" />
                 <include name="Types/NetworkServersInfo.cs" />
+                <include name="Types/ParcelData.cs" />
+                <include name="Types/PrimData.cs" />
+                <include name="Types/RegionHandle.cs" />
+                <include name="Types/RegionInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
index 2301fa6..399f456 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -90,19 +90,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IRestHandler.cs">
+    <Compile Include="BaseHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="XmlRpcMethod.cs">
+    <Compile Include="CheckSumServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CheckSumServer.cs">
+    <Compile Include="IRestHandler.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="UDPServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BaseHttpServer.cs">
+    <Compile Include="XmlRpcMethod.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
index bb20780..7401b07 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="IRestHandler.cs" />
-                <include name="XmlRpcMethod.cs" />
+                <include name="BaseHttpServer.cs" />
                 <include name="CheckSumServer.cs" />
+                <include name="IRestHandler.cs" />
                 <include name="UDPServerBase.cs" />
-                <include name="BaseHttpServer.cs" />
+                <include name="XmlRpcMethod.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
index 3ea339b..d2f4345 100644
--- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
+++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
@@ -21,11 +21,11 @@
                 </lib>
                 <include name="../../../bin/Db4objects.Db4o.dll" />
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
                 <include name="../../../bin/OpenSim.Framework.Data.dll" />
-                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
-                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll" />
                 <include name="System.Xml.dll" />
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index 945b7a5..caebca3 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -98,10 +98,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs">
+    <Compile Include="AssetHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AssetHttpServer.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 0a1b533..0f9540e 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Main.cs" />
                 <include name="AssetHttpServer.cs" />
+                <include name="Main.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
@@ -22,9 +22,9 @@
                 </lib>
                 <include name="../../../bin/Db4objects.Db4o.dll" />
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
-                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll" />
                 <include name="System.Xml.dll" />
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
index 8e9f026..119967d 100644
--- a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build
@@ -20,8 +20,8 @@
                     <include name="${project::get-base-directory()}/${build.dir}" />
                 </lib>
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
                 <include name="System.dll" />
                 <include name="../../../bin/XMLRPC.dll" />
             </references>
diff --git a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
index cdf09e1..ff57dac 100644
--- a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
+++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build
@@ -21,8 +21,8 @@
                 </lib>
                 <include name="../../../bin/Db4objects.Db4o.dll" />
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll.dll" />
                 <include name="System.Xml.dll" />
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
index 4cadf1d..3573e89 100644
--- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
@@ -22,11 +22,11 @@
                 </lib>
                 <include name="../../../bin/Db4objects.Db4o.dll" />
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
                 <include name="../../../bin/OpenSim.Framework.Data.dll" />
-                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
-                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
                 <include name="../../../bin/OpenSim.Grid.Framework.Manager.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll" />
diff --git a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
index a427765..fc7e00b 100644
--- a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
+++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build
@@ -21,8 +21,8 @@
                 </lib>
                 <include name="../../../bin/Db4objects.Db4o.dll" />
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll.dll" />
                 <include name="System.Xml.dll" />
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index e822c18..1146b17 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -114,10 +114,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="UserManager.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Main.cs">
+    <Compile Include="UserManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
index b0333f1..8bc1fc1 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="UserManager.cs" />
                 <include name="Main.cs" />
+                <include name="UserManager.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
@@ -22,11 +22,11 @@
                 </lib>
                 <include name="../../../bin/Db4objects.Db4o.dll" />
                 <include name="../../../bin/libsecondlife.dll" />
-                <include name="../../../bin/OpenSim.Framework.dll" />
-                <include name="../../../bin/OpenSim.Framework.Console.dll" />
+                <include name="OpenSim.Framework.dll" />
+                <include name="OpenSim.Framework.Console.dll" />
                 <include name="../../../bin/OpenSim.Framework.Data.dll" />
-                <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
-                <include name="../../../bin/OpenSim.Framework.Servers.dll" />
+                <include name="OpenSim.Framework.GenericConfig.Xml.dll" />
+                <include name="OpenSim.Framework.Servers.dll" />
                 <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
                 <include name="System.dll" />
                 <include name="System.Data.dll" />
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index f5da23d..bec85cc 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -170,15 +170,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="VersionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="VersionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 9890cfa..6c7d7ac 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="VersionInfo.cs" />
                 <include name="Application.cs" />
                 <include name="OpenSimMain.cs" />
+                <include name="VersionInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index bb21365..4667d52 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -96,40 +96,40 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="LLSDCapsDetails.cs">
+    <Compile Include="Caps.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="LLSDArray.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDEmpty.cs">
+    <Compile Include="LLSDCapEvent.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDTest.cs">
+    <Compile Include="LLSDCapsDetails.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDUploadReply.cs">
+    <Compile Include="LLSDEmpty.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDType.cs">
+    <Compile Include="LLSDHelpers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDCapEvent.cs">
+    <Compile Include="LLSDMapLayer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDMapRequest.cs">
+    <Compile Include="LLSDMapLayerResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Caps.cs">
+    <Compile Include="LLSDMapRequest.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDMapLayerResponse.cs">
+    <Compile Include="LLSDTest.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDMapLayer.cs">
+    <Compile Include="LLSDType.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LLSDHelpers.cs">
+    <Compile Include="LLSDUploadReply.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index 817e5b0..a091b5c 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -11,18 +11,18 @@
             <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="LLSDCapsDetails.cs" />
+                <include name="Caps.cs" />
                 <include name="LLSDArray.cs" />
+                <include name="LLSDCapEvent.cs" />
+                <include name="LLSDCapsDetails.cs" />
                 <include name="LLSDEmpty.cs" />
+                <include name="LLSDHelpers.cs" />
+                <include name="LLSDMapLayer.cs" />
+                <include name="LLSDMapLayerResponse.cs" />
+                <include name="LLSDMapRequest.cs" />
                 <include name="LLSDTest.cs" />
-                <include name="LLSDUploadReply.cs" />
                 <include name="LLSDType.cs" />
-                <include name="LLSDCapEvent.cs" />
-                <include name="LLSDMapRequest.cs" />
-                <include name="Caps.cs" />
-                <include name="LLSDMapLayerResponse.cs" />
-                <include name="LLSDMapLayer.cs" />
-                <include name="LLSDHelpers.cs" />
+                <include name="LLSDUploadReply.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index e679174..3093eb0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClientView.AgentAssetUpload.cs">
+    <Compile Include="ClientStackNetworkHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientStackNetworkHandler.cs">
+    <Compile Include="ClientView.AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="PacketServer.cs">
+    <Compile Include="ClientView.API.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.PacketHandlers.cs">
+    <Compile Include="ClientViewBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionApplicationBase.cs">
+    <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
+    <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 95422c8..f76a4c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
             <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="ClientView.AgentAssetUpload.cs" />
                 <include name="ClientStackNetworkHandler.cs" />
-                <include name="PacketServer.cs" />
-                <include name="UDPServer.cs" />
-                <include name="ClientViewBase.cs" />
+                <include name="ClientView.AgentAssetUpload.cs" />
+                <include name="ClientView.API.cs" />
                 <include name="ClientView.cs" />
                 <include name="ClientView.PacketHandlers.cs" />
-                <include name="RegionApplicationBase.cs" />
-                <include name="ClientView.API.cs" />
                 <include name="ClientView.ProcessPackets.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="PacketServer.cs" />
+                <include name="RegionApplicationBase.cs" />
+                <include name="UDPServer.cs" />
                 <include name="Assets/InventoryCache.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 200fa3a..0a15a49 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,13 +98,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="LocalBackEndServices.cs">
+    <Compile Include="CommunicationsLocal.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LocalUserServices.cs">
+    <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CommunicationsLocal.cs">
+    <Compile Include="LocalUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index 60a90bd..3cac9d3 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="CommunicationsLocal.cs" />
                 <include name="LocalBackEndServices.cs" />
                 <include name="LocalUserServices.cs" />
-                <include name="CommunicationsLocal.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 0a9e5fb..d6abd13 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,13 +116,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="OGS1InterSimComms.cs">
+    <Compile Include="CommunicationsOGS1.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGS1GridServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="CommunicationsOGS1.cs">
+    <Compile Include="OGS1InterSimComms.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGS1UserServices.cs">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 2176b14..04d61b9 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="OGS1InterSimComms.cs" />
-                <include name="OGS1GridServices.cs" />
                 <include name="CommunicationsOGS1.cs" />
+                <include name="OGS1GridServices.cs" />
+                <include name="OGS1InterSimComms.cs" />
                 <include name="OGS1UserServices.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 0cfeda9..428f381 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -82,10 +82,6 @@
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="VJSharpCodeProvider" >
-      <HintPath>VJSharpCodeProvider.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="XMLRPC.dll" >
       <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
       <Private>False</Private>
@@ -148,61 +144,58 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RegionManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="EstateManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Body.cs">
+    <Compile Include="RegionManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneEvents.cs">
+    <Compile Include="Scenes\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.Animations.cs">
+    <Compile Include="Scenes\IScenePresenceBody.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.PacketHandlers.cs">
+    <Compile Include="Scenes\Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneObject.cs">
+    <Compile Include="Scenes\Scene.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Primitive.cs">
+    <Compile Include="Scenes\Scene.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\IScenePresenceBody.cs">
+    <Compile Include="Scenes\SceneBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Entity.cs">
+    <Compile Include="Scenes\SceneEvents.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\ScenePresence.cs">
+    <Compile Include="Scenes\ScenePresence.Animations.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.cs">
+    <Compile Include="Scenes\ScenePresence.Body.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\ScriptManager.cs">
+    <Compile Include="Scenes\ScenePresence.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\ScriptInfo.cs">
+    <Compile Include="Scenes\scripting\Script.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Script.cs">
+    <Compile Include="Scenes\scripting\ScriptInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
+    <Compile Include="Scenes\scripting\ScriptManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
+    <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index fcfc623..2fa5e76 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -11,25 +11,24 @@
             <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="RegionManager.cs" />
                 <include name="EstateManager.cs" />
                 <include name="ParcelManager.cs" />
-                <include name="Scenes/ScenePresence.Body.cs" />
-                <include name="Scenes/SceneEvents.cs" />
-                <include name="Scenes/ScenePresence.Animations.cs" />
-                <include name="Scenes/Scene.PacketHandlers.cs" />
-                <include name="Scenes/SceneObject.cs" />
-                <include name="Scenes/Primitive.cs" />
-                <include name="Scenes/IScenePresenceBody.cs" />
+                <include name="RegionManager.cs" />
                 <include name="Scenes/Entity.cs" />
+                <include name="Scenes/IScenePresenceBody.cs" />
+                <include name="Scenes/Primitive.cs" />
+                <include name="Scenes/Scene.cs" />
+                <include name="Scenes/Scene.PacketHandlers.cs" />
                 <include name="Scenes/SceneBase.cs" />
+                <include name="Scenes/SceneEvents.cs" />
+                <include name="Scenes/SceneObject.cs" />
+                <include name="Scenes/ScenePresence.Animations.cs" />
+                <include name="Scenes/ScenePresence.Body.cs" />
                 <include name="Scenes/ScenePresence.cs" />
-                <include name="Scenes/Scene.cs" />
-                <include name="Scenes/scripting/ScriptManager.cs" />
-                <include name="Scenes/scripting/ScriptInfo.cs" />
                 <include name="Scenes/scripting/Script.cs" />
+                <include name="Scenes/scripting/ScriptInfo.cs" />
+                <include name="Scenes/scripting/ScriptManager.cs" />
                 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
-                <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />
                 <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
@@ -52,7 +51,6 @@
                 <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" />
                 <include name="System.dll" />
                 <include name="System.Xml.dll" />
-                <include name="VJSharpCodeProvider.dll" />
                 <include name="../../../bin/XMLRPC.dll" />
             </references>
         </csc>
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
deleted file mode 100644
index 51b1512..0000000
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-// Compilation stuff
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using Microsoft.VJSharp;
-
-namespace OpenSim.Region.Enviorment.Scripting
-{
-    public class JSharpScriptEngine : IScriptCompiler
-    {
-        public string FileExt()
-        {
-            return ".jsl";
-        }
-
-        private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename)
-        {
-            CompilerParameters compilerParams = new CompilerParameters();
-            CompilerResults compilerResults;
-            compilerParams.GenerateExecutable = false;
-            compilerParams.GenerateInMemory = true;
-            compilerParams.IncludeDebugInformation = false;
-            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll");
-            compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll");
-            compilerParams.ReferencedAssemblies.Add("libsecondlife.dll");
-            compilerParams.ReferencedAssemblies.Add("System.dll");
-
-            compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
-
-            if (compilerResults.Errors.Count > 0)
-            {
-                OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");
-                foreach (CompilerError error in compilerResults.Errors)
-                {
-                    OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
-                }
-            }
-            else
-            {
-                Dictionary<string, IScript> scripts = new Dictionary<string, IScript>();
-
-                foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
-                {
-                    Type testInterface = pluginType.GetInterface("IScript", true);
-
-                    if (testInterface != null)
-                    {
-                        IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
-
-                        string scriptName = "J#/" + script.getName();
-                        Console.WriteLine("Script: " + scriptName + " loaded.");
-
-                        if (!scripts.ContainsKey(scriptName))
-                        {
-                            scripts.Add(scriptName, script);
-                        }
-                        else
-                        {
-                            scripts[scriptName] = script;
-                        }
-                    }
-                }
-                return scripts;
-            }
-            return null;
-        }
-
-        public Dictionary<string, IScript> compile(string filename)
-        {
-            VJSharpCodeProvider jsharpProvider = new VJSharpCodeProvider();
-            return LoadDotNetScript(jsharpProvider.CreateCompiler(), filename);
-        }
-    }
-}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index 576b7a5..eb1c1d9 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -59,9 +59,6 @@ namespace OpenSim.Region.Enviorment.Scripting
 
             JScriptEngine jscriptCompiler = new JScriptEngine();
             compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);
-
-            JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine();
-            compilers.Add(jsharpCompiler.FileExt(), jsharpCompiler);
         }
 
         public void Compile(string filename)
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 716fd57..147158c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,6 +93,9 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Db4LocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -102,9 +105,6 @@
     <Compile Include="UUIDPrimQuery.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index 112ff1c..fc9f055 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
             </resources>
             <sources failonempty="true">
                 <include name="AssemblyInfo.cs" />
+                <include name="Db4LocalStorage.cs" />
                 <include name="MapStorage.cs" />
                 <include name="UUIDParcelQuery.cs" />
                 <include name="UUIDPrimQuery.cs" />
-                <include name="Db4LocalStorage.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index f332827..c8b859c 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,6 +83,9 @@
     <Compile Include="Prebuild.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\FatalException.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Core\Kernel.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -92,25 +95,19 @@
     <Compile Include="Core\WarningException.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\FatalException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\IDataNode.cs">
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+    <Compile Include="Core\Attributes\TargetAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Attributes\TargetAttribute.cs">
+    <Compile Include="Core\Interfaces\IDataNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ProjectNode.cs">
+    <Compile Include="Core\Interfaces\ITarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -122,73 +119,76 @@
     <Compile Include="Core\Nodes\ExcludeNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\OptionsNode.cs">
+    <Compile Include="Core\Nodes\FileNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\ReferencePathNode.cs">
+    <Compile Include="Core\Nodes\FilesNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\MatchNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\SolutionNode.cs">
+    <Compile Include="Core\Nodes\OptionsNode.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Nodes\ProcessNode.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Core\Nodes\ProjectNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Core\Nodes\ReferenceNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FileNode.cs">
+    <Compile Include="Core\Nodes\ReferencePathNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
+    <Compile Include="Core\Nodes\SolutionNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\DebugTarget.cs">
+    <Compile Include="Core\Parse\IfContext.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
+    <Compile Include="Core\Parse\Preprocessor.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\AutotoolsTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
+    <Compile Include="Core\Targets\DebugTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2002Target.cs">
+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2003Target.cs">
+    <Compile Include="Core\Targets\NAntTarget.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Targets\SharpDevelop2Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\VS2005Target.cs">
+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Targets\NAntTarget.cs">
+    <Compile Include="Core\Targets\VS2002Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\IfContext.cs">
+    <Compile Include="Core\Targets\VS2003Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Parse\Preprocessor.cs">
+    <Compile Include="Core\Targets\VS2005Target.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\Helper.cs">
+    <Compile Include="Core\Utilities\CommandLineCollection.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\Log.cs">
+    <Compile Include="Core\Utilities\CurrentDirectory.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+    <Compile Include="Core\Utilities\Helper.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+    <Compile Include="Core\Utilities\Log.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 52dd1a7..2851125 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
             </resources>
             <sources failonempty="true">
                 <include name="Prebuild.cs" />
+                <include name="Core/FatalException.cs" />
                 <include name="Core/Kernel.cs" />
                 <include name="Core/UnknownLanguageException.cs" />
                 <include name="Core/WarningException.cs" />
-                <include name="Core/FatalException.cs" />
-                <include name="Core/Interfaces/ITarget.cs" />
-                <include name="Core/Interfaces/IDataNode.cs" />
-                <include name="Core/Attributes/OptionNodeAttribute.cs" />
                 <include name="Core/Attributes/DataNodeAttribute.cs" />
+                <include name="Core/Attributes/OptionNodeAttribute.cs" />
                 <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/Interfaces/ITarget.cs" />
                 <include name="Core/Nodes/ConfigurationNode.cs" />
                 <include name="Core/Nodes/DataNode.cs" />
                 <include name="Core/Nodes/ExcludeNode.cs" />
-                <include name="Core/Nodes/OptionsNode.cs" />
-                <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/FileNode.cs" />
+                <include name="Core/Nodes/FilesNode.cs" />
                 <include name="Core/Nodes/MatchNode.cs" />
-                <include name="Core/Nodes/SolutionNode.cs" />
+                <include name="Core/Nodes/OptionsNode.cs" />
                 <include name="Core/Nodes/ProcessNode.cs" />
+                <include name="Core/Nodes/ProjectNode.cs" />
                 <include name="Core/Nodes/ReferenceNode.cs" />
-                <include name="Core/Nodes/FileNode.cs" />
-                <include name="Core/Nodes/FilesNode.cs" />
+                <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/SolutionNode.cs" />
+                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Parse/Preprocessor.cs" />
+                <include name="Core/Targets/AutotoolsTarget.cs" />
                 <include name="Core/Targets/DebugTarget.cs" />
                 <include name="Core/Targets/MonoDevelopTarget.cs" />
-                <include name="Core/Targets/AutotoolsTarget.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.cs" />
                 <include name="Core/Targets/SharpDevelopTarget.cs" />
                 <include name="Core/Targets/VS2002Target.cs" />
                 <include name="Core/Targets/VS2003Target.cs" />
-                <include name="Core/Targets/SharpDevelop2Target.cs" />
                 <include name="Core/Targets/VS2005Target.cs" />
-                <include name="Core/Targets/NAntTarget.cs" />
-                <include name="Core/Parse/IfContext.cs" />
-                <include name="Core/Parse/Preprocessor.cs" />
-                <include name="Core/Utilities/Helper.cs" />
-                <include name="Core/Utilities/Log.cs" />
                 <include name="Core/Utilities/CommandLineCollection.cs" />
                 <include name="Core/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Utilities/Helper.cs" />
+                <include name="Core/Utilities/Log.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/prebuild.xml b/prebuild.xml
index f9e4361..6cf8bd8 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -636,8 +636,6 @@
 	<Reference name="OpenSim.Region.Capabilities"/>
       <!-- For scripting in funny languages by default -->
       <Reference name="Microsoft.JScript"/>
-      <!-- This needs checking with the Mono folks -->
-      <Reference name="VJSharpCodeProvider"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
 
-- 
cgit v1.1


From 90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c Mon Sep 17 00:00:00 2001
From: mingchen
Date: Fri, 29 Jun 2007 01:58:16 +0000
Subject: *Hopefully fixed the empty dialog box error on client when logging in
 on sandbox mode

---
 OpenSim/Framework/General/RegionCommsListener.cs            | 1 +
 OpenSim/Framework/General/Types/RegionInfo.cs               | 4 ++--
 OpenSim/Framework/General/UserProfile.cs                    | 2 +-
 OpenSim/Framework/UserManager/LoginResponse.cs              | 3 ++-
 OpenSim/Framework/UserManager/UserManagerBase.cs            | 1 -
 OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 1 -
 OpenSim/Region/Communications/Local/LocalUserServices.cs    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index bba928f..5fa2f58 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework
         {
             if(OnExpectUser != null)
             {
+                
                 OnExpectUser(regionHandle, agent);
                 return true;
             }
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 48e6922..0fba6ca 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationX");
                 if (attri == "")
                 {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");
                     configData.SetAttribute("SimLocationX", location);
                     this.RegionLocX = (uint)Convert.ToUInt32(location);
                 }
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationY");
                 if (attri == "")
                 {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
                     configData.SetAttribute("SimLocationY", location);
                     this.RegionLocY = (uint)Convert.ToUInt32(location);
                 }
diff --git a/OpenSim/Framework/General/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
index 04ff20b..263dba2 100644
--- a/OpenSim/Framework/General/UserProfile.cs
+++ b/OpenSim/Framework/General/UserProfile.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.User
         {
             Circuits = new Dictionary<LLUUID, uint>();
             Inventory = new AgentInventory();
-            homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
+            homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256));
             homepos = new LLVector3();
 	    homelookat = new LLVector3();
         }
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index 5ca223f..d1cd8cf 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.UserManagement
                 this.ErrorReason = "key";
                 this.welcomeMessage = "Welcome to OpenSim!";
                 this.seedCapability = "";
-                this.home = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
+                this.home = "{'region_handle':[r" + (1000 * 256).ToString() + ",r" + (1000 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
                 this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
                 this.RegionX = (uint)255232;
                 this.RegionY = (uint)254976;
@@ -227,6 +227,7 @@ namespace OpenSim.Framework.UserManagement
 
                 responseData["sim_port"] =(Int32) this.SimPort;
                 responseData["sim_ip"] = this.SimAddress;
+                Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
                 responseData["agent_id"] = this.AgentID.ToStringHyphenated();
                 responseData["session_id"] = this.SessionID.ToStringHyphenated();
                 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index bc35164..d06059e 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -472,7 +472,6 @@ namespace OpenSim.Framework.UserManagement
                         return logResponse.CreateDeadRegionResponse();
                     }
                     CommitAgent(ref TheUser);
-
                     return logResponse.ToXmlRpcResponse();
 
                 }
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index ae47890..26834be 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -182,7 +182,6 @@ namespace OpenSim.Region.Communications.Local
         /// <returns></returns>
         public bool AddNewSession(ulong regionHandle, Login loginData)
         {
-            //Console.WriteLine(" comms manager been told to expect new user");
             AgentCircuitData agent = new AgentCircuitData();
             agent.AgentID = loginData.Agent;
             agent.firstname = loginData.First;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 508a3f9..6cf254b 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
                  "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
                  "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
                 string capsPath = Util.GetRandomCapsPath();
-                response.SimAddress = reg.CommsIPListenAddr;
+                response.SimAddress = reg.CommsExternalAddress;
                 response.SimPort = (Int32)reg.CommsIPListenPort;
                 response.RegionX = reg.RegionLocX ;
                 response.RegionY = reg.RegionLocY ;
-- 
cgit v1.1