From 2239ecba188b0435d9a6d58b1c66f2b6eb591116 Mon Sep 17 00:00:00 2001 From: mingchen Date: Fri, 8 Jun 2007 19:10:55 +0000 Subject: [PATCH] *Merged EstateManager, EstateSettings, ParcelManager,Parcel, and ParcelData classes *Incorporated EstateSettings into the RegionInfo class *Next step is to load from db, save to db the parcel and estate settings --- .../OpenSim.Framework.Console.csproj.user | 2 +- .../Interfaces/IClientAPI.cs | 6 +- .../Interfaces/ILocalStorage.cs | 14 + .../OpenSim.Framework.csproj | 16 +- .../OpenSim.Framework.csproj.user | 2 +- .../OpenSim.Framework.dll.build | 8 +- Common/OpenSim.Framework/Types/RegionInfo.cs | 51 +- .../Xml/OpenSim.GenericConfig.Xml.csproj.user | 2 +- Common/OpenSim.Servers/OpenSim.Servers.csproj | 14 +- .../OpenSim.Servers.csproj.user | 2 +- .../OpenSim.Servers/OpenSim.Servers.dll.build | 8 +- Common/XmlRpcCS/XMLRPC.csproj | 62 +- Common/XmlRpcCS/XMLRPC.csproj.user | 2 +- Common/XmlRpcCS/XMLRPC.dll.build | 26 +- ...OpenGrid.Config.GridConfigDb4o.csproj.user | 2 +- .../OpenGrid.Framework.Data.DB4o.csproj | 114 --- .../OpenGrid.Framework.Data.DB4o.csproj.user | 2 +- .../OpenGrid.Framework.Data.MSSQL.csproj.user | 2 +- .../OpenGrid.Framework.Data.MySQL.csproj | 120 --- .../OpenGrid.Framework.Data.MySQL.csproj.user | 2 +- .../OpenGrid.Framework.Data.SQLite.csproj | 111 --- ...OpenGrid.Framework.Data.SQLite.csproj.user | 2 +- .../OpenGrid.Framework.Data.csproj | 116 --- .../OpenGrid.Framework.Data.csproj.user | 2 +- .../OpenGrid.Framework.Manager.csproj | 8 +- .../OpenGrid.Framework.Manager.csproj.user | 2 +- .../OpenGridServices.AssetServer.csproj | 129 --- .../OpenGridServices.AssetServer.csproj.user | 2 +- .../OpenGridServices.AssetServer.exe.build | 1 - .../OpenGridServices.GridServer.csproj.user | 2 +- .../OpenGridServices.UserServer.csproj.user | 2 +- ...OpenUser.Config.UserConfigDb4o.csproj.user | 2 +- .../ServiceManager/ServiceManager.csproj | 117 --- .../ServiceManager/ServiceManager.csproj.user | 2 +- .../ServiceManager/ServiceManager.exe.build | 3 - OpenSim.build | 10 +- OpenSim.sln | 231 +++-- OpenSim.suo | Bin 378368 -> 374784 bytes .../OpenSim.GridInterfaces.Local.csproj.user | 2 +- .../OpenSim.GridInterfaces.Remote.csproj.user | 2 +- ...Sim.Physics.BasicPhysicsPlugin.csproj.user | 2 +- .../OpenSim.Physics.Manager.csproj.user | 2 +- .../OpenSim.Physics.OdePlugin.csproj.user | 2 +- .../OpenSim.Physics.PhysXPlugin.csproj.user | 2 +- .../OpenSim.RegionServer/ClientView.API.cs | 43 - .../OpenSim.RegionServer.csproj | 40 +- .../OpenSim.RegionServer.csproj.user | 2 +- .../OpenSim.RegionServer.dll.build | 47 +- .../OpenSim.Scripting.EmbeddedJVM.csproj | 36 +- .../OpenSim.Scripting.EmbeddedJVM.csproj.user | 2 +- .../OpenSim.Scripting.EmbeddedJVM.dll.build | 26 +- .../LocalStorageBerkeleyDB/BDBLocalStorage.cs | 31 +- ...Storage.LocalStorageBerkeleyDB.csproj.user | 2 +- .../LocalStorageDb4o/Db4LocalStorage.cs | 309 ++++--- .../OpenSim.Storage.LocalStorageDb4o.csproj | 11 +- ...enSim.Storage.LocalStorageDb4o.csproj.user | 2 +- ...OpenSim.Storage.LocalStorageDb4o.dll.build | 5 +- .../LocalStorageDb4o/UUIDParcelQuery.cs | 52 ++ .../LocalStorageDb4o/UUIDPrimQuery.cs | 52 ++ .../LocalStorageDb4o/UUIDQuery.cs | 25 - ...Sim.Storage.LocalStorageSQLite.csproj.user | 2 +- .../LocalStorageSQLite/SQLiteLocalStorage.cs | 44 +- .../OpenSim.Terrain.BasicTerrain.csproj.user | 2 +- OpenSim/OpenSim.World/Avatar.Update.cs | 2 +- OpenSim/OpenSim.World/Avatar.cs | 16 +- OpenSim/OpenSim.World/Estate/EstateManager.cs | 296 +++++++ OpenSim/OpenSim.World/OpenSim.World.csproj | 36 +- .../OpenSim.World/OpenSim.World.csproj.user | 2 +- OpenSim/OpenSim.World/ParcelManager.cs | 832 ++++++++++++++++++ OpenSim/OpenSim.World/World.cs | 9 +- OpenSim/OpenSim.World/WorldBase.cs | 2 +- OpenSim/OpenSim/OpenSim.csproj.user | 2 +- OpenSim/OpenSim/OpenSim.exe.build | 2 + OpenSim/OpenSim/OpenSimMain.cs | 1 - Prebuild/src/Prebuild.csproj | 72 +- Prebuild/src/Prebuild.csproj.user | 2 +- Prebuild/src/Prebuild.exe.build | 38 +- 77 files changed, 1941 insertions(+), 1315 deletions(-) create mode 100644 OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs create mode 100644 OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs delete mode 100644 OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs create mode 100644 OpenSim/OpenSim.World/Estate/EstateManager.cs create mode 100644 OpenSim/OpenSim.World/ParcelManager.cs diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user +++ b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs index 810345f31f..3eed2b8fd8 100644 --- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs +++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs @@ -29,6 +29,11 @@ namespace OpenSim.Framework.Interfaces public delegate void StatusChange(bool status); public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status); + 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 interface IClientAPI { event ChatFromViewer OnChatFromViewer; @@ -81,7 +86,6 @@ namespace OpenSim.Framework.Interfaces void SendWearables(AvatarWearable[] wearables); void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); void SendLayerData(float[] map); - void SendRegionHandshake(RegionInfo regionInfo); void MoveAgentIntoRegion(RegionInfo regInfo); void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos); void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort); diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs index 4dd8868c61..7307966a4d 100644 --- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs +++ b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs @@ -37,11 +37,20 @@ namespace OpenSim.Framework.Interfaces 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(); } @@ -50,5 +59,10 @@ namespace OpenSim.Framework.Interfaces void PrimFromStorage(PrimData prim); } + public interface ILocalStorageParcelReceiver + { + void ParcelFromStorage(ParcelData data); + void NoParcelDataFromStorage(); + } } diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index 39ce0ff519..ab29d04d47 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj +++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj @@ -144,15 +144,15 @@ Code - - Code - Code Code + + Code + Code @@ -195,7 +195,7 @@ Code - + Code @@ -207,6 +207,9 @@ Code + + Code + Code @@ -222,10 +225,7 @@ Code - - Code - - + Code diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user +++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build index a75388f42b..a45a1216f8 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build @@ -29,9 +29,9 @@ - + @@ -46,17 +46,17 @@ - + + - - + diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/Common/OpenSim.Framework/Types/RegionInfo.cs index fd3b24f574..7fa7fe284d 100644 --- a/Common/OpenSim.Framework/Types/RegionInfo.cs +++ b/Common/OpenSim.Framework/Types/RegionInfo.cs @@ -10,47 +10,24 @@ namespace OpenSim.Framework.Types { public class RegionInfo { - public LLUUID SimUUID; - public string RegionName; - public uint RegionLocX; - public uint RegionLocY; - public ulong RegionHandle; - public ushort RegionWaterHeight = 20; - public bool RegionTerraform = true; + public LLUUID SimUUID = new LLUUID(); + public string RegionName = ""; + public uint RegionLocX = 0; + public uint RegionLocY = 0; + public ulong RegionHandle = 0; - public int IPListenPort; - public string IPListenAddr; + public string DataStore = ""; + public bool isSandbox = false; - private bool isSandbox; - public string DataStore; + public LLUUID MasterAvatarAssignedUUID = new LLUUID(); + public string MasterAvatarFirstName = ""; + public string MasterAvatarLastName = ""; - // 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 TerrainStartHeight00 = 10.0f; // NW Corner ( I think ) - public float TerrainStartHeight01 = 10.0f; // NE Corner ( I think ) - public float TerrainStartHeight10 = 10.0f; // SW Corner ( I think ) - public float TerrainStartHeight11 = 10.0f; // SE Corner ( I think ) - // 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 TerrainHeightRange00 = 60.0f; - public float TerrainHeightRange01 = 60.0f; - public float TerrainHeightRange10 = 60.0f; - public float TerrainHeightRange11 = 60.0f; + public int IPListenPort = 0; + public string IPListenAddr = ""; - // Terrain Default (Must be in F32 Format!) - public string TerrainFile = "default.r32"; - public double TerrainMultiplier = 60.0; + + public EstateSettings estateSettings; public RegionInfo() { diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user +++ b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj index e89a62c41b..6768ce45ae 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.csproj +++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj @@ -92,33 +92,33 @@ + + Code + Code Code - - Code - Code Code + + Code + Code - + Code Code - - Code - diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user +++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build index 41c1350bea..a2af584834 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build +++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build @@ -11,15 +11,15 @@ + - - - - + + + diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj index 61f8be0162..1ab494ed27 100644 --- a/Common/XmlRpcCS/XMLRPC.csproj +++ b/Common/XmlRpcCS/XMLRPC.csproj @@ -70,60 +70,60 @@ - - Code - - - Code - Code - - Code - - - Code - - - Code - - - Code - - - Code - Code + + Code + + + Code + Code - - Code - - + Code Code + + Code + + + Code + Code - - Code - - - Code - Code + + Code + + + Code + Code + + Code + + + Code + + + Code + + + Code + Code diff --git a/Common/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/Common/XmlRpcCS/XMLRPC.csproj.user +++ b/Common/XmlRpcCS/XMLRPC.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build index 2eabfcd0c4..e7936c3195 100644 --- a/Common/XmlRpcCS/XMLRPC.dll.build +++ b/Common/XmlRpcCS/XMLRPC.dll.build @@ -11,24 +11,24 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user +++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj index 6ced216340..3b783ca607 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj @@ -1,116 +1,3 @@ -<<<<<<< .mine - - - Local - 8.0.50727 - 2.0 - {39BD9497-0000-0000-0000-000000000000} - Debug - AnyCPU - - - - OpenGrid.Framework.Data.DB4o - JScript - Grid - IE50 - false - Library - - OpenGrid.Framework.Data.DB4o - - - - - - False - 285212672 - False - - - TRACE;DEBUG - - True - 4096 - False - ..\..\bin\ - False - False - False - 4 - - - - False - 285212672 - False - - - TRACE - - False - 4096 - True - ..\..\bin\ - False - False - False - 4 - - - - - System.dll - False - - - System.Xml.dll - False - - - System.Data.dll - False - - - ..\..\bin\libsecondlife.dll - False - - - ..\..\bin\Db4objects.Db4o.dll - False - - - - - OpenGrid.Framework.Data - {62CDF671-0000-0000-0000-000000000000} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False - - - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - -======= Local @@ -222,4 +109,3 @@ ->>>>>>> .r921 diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user +++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj index 351de2a65e..5fe0cf78b4 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj @@ -1,122 +1,3 @@ -<<<<<<< .mine - - - Local - 8.0.50727 - 2.0 - {0F3C3AC1-0000-0000-0000-000000000000} - Debug - AnyCPU - - - - OpenGrid.Framework.Data.MySQL - JScript - Grid - IE50 - false - Library - - OpenGrid.Framework.Data.MySQL - - - - - - False - 285212672 - False - - - TRACE;DEBUG - - True - 4096 - False - ..\..\bin\ - False - False - False - 4 - - - - False - 285212672 - False - - - TRACE - - False - 4096 - True - ..\..\bin\ - False - False - False - 4 - - - - - System.dll - False - - - System.Xml.dll - False - - - System.Data.dll - False - - - ..\..\bin\libsecondlife.dll - False - - - ..\..\bin\MySql.Data.dll - False - - - - - OpenGrid.Framework.Data - {62CDF671-0000-0000-0000-000000000000} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - -======= Local @@ -234,4 +115,3 @@ ->>>>>>> .r921 diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj index 4360031af7..fa17367954 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj @@ -1,113 +1,3 @@ -<<<<<<< .mine - - - Local - 8.0.50727 - 2.0 - {1E3F341A-0000-0000-0000-000000000000} - Debug - AnyCPU - - - - OpenGrid.Framework.Data.SQLite - JScript - Grid - IE50 - false - Library - - OpenGrid.Framework.Data.SQLite - - - - - - False - 285212672 - False - - - TRACE;DEBUG - - True - 4096 - False - ..\..\bin\ - False - False - False - 4 - - - - False - 285212672 - False - - - TRACE - - False - 4096 - True - ..\..\bin\ - False - False - False - 4 - - - - - System.dll - False - - - System.Xml.dll - False - - - System.Data.dll - False - - - ..\..\bin\System.Data.SQLite.dll - False - - - ..\..\bin\libsecondlife.dll - False - - - - - OpenGrid.Framework.Data - {62CDF671-0000-0000-0000-000000000000} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False - - - - - Code - - - Code - - - Code - - - - - - - - - - -======= Local @@ -216,4 +106,3 @@ ->>>>>>> .r921 diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj index c0684a2ddd..990cd16292 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj @@ -1,118 +1,3 @@ -<<<<<<< .mine - - - Local - 8.0.50727 - 2.0 - {62CDF671-0000-0000-0000-000000000000} - Debug - AnyCPU - - - - OpenGrid.Framework.Data - JScript - Grid - IE50 - false - Library - - OpenGrid.Framework.Data - - - - - - False - 285212672 - False - - - TRACE;DEBUG - - True - 4096 - False - ..\..\bin\ - False - False - False - 4 - - - - False - 285212672 - False - - - TRACE - - False - 4096 - True - ..\..\bin\ - False - False - False - 4 - - - - - System.dll - False - - - System.Xml.dll - False - - - System.Data.dll - False - - - ..\..\bin\libsecondlife.dll - False - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - -======= Local @@ -226,4 +111,3 @@ ->>>>>>> .r921 diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj index dad56cb803..ea7548ad50 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj +++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj @@ -62,12 +62,12 @@ System.dll False - - ..\..\bin\OpenSim.Framework.dll + + OpenSim.Framework.dll False - - ..\..\bin\OpenSim.Servers.dll + + OpenSim.Servers.dll False diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user +++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj index 53afe161a6..a281e4faf6 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj @@ -1,4 +1,3 @@ -<<<<<<< .mine Local @@ -79,133 +78,6 @@ OpenSim.Framework.Console.dll False - - OpenSim.GridInterfaces.Local.dll - False - - - OpenSim.Servers.dll - False - - - ..\..\bin\libsecondlife.dll - False - - - ..\..\bin\Db4objects.Db4o.dll - False - - - XMLRPC.dll - False - - - - - - - Code - - - Code - - - Code - - - - - - - - - - -======= - - - Local - 8.0.50727 - 2.0 - {0021261B-0000-0000-0000-000000000000} - Debug - AnyCPU - - - - OpenGridServices.AssetServer - JScript - Grid - IE50 - false - Exe - - OpenGridServices.AssetServer - - - - - - False - 285212672 - False - - - TRACE;DEBUG - - True - 4096 - False - ..\..\bin\ - False - False - False - 4 - - - - False - 285212672 - False - - - TRACE - - False - 4096 - True - ..\..\bin\ - False - False - False - 4 - - - - - System.dll - False - - - System.Data.dll - False - - - System.Xml.dll - False - - - OpenSim.Framework.dll - False - - - OpenSim.Framework.Console.dll - False - - - OpenSim.GridInterfaces.Local.dll - False - OpenSim.Servers.dll False @@ -244,4 +116,3 @@ ->>>>>>> .r921 diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build index 0da1d3450b..700e32b884 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build @@ -25,7 +25,6 @@ - diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user +++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user +++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user +++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj index 0b896330f9..54d31b2f8d 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.csproj +++ b/OpenGridServices/ServiceManager/ServiceManager.csproj @@ -1,107 +1,3 @@ -<<<<<<< .mine - - - Local - 8.0.50727 - 2.0 - {E141F4EE-0000-0000-0000-000000000000} - Debug - AnyCPU - - - - - ServiceManager - JScript - Grid - IE50 - false - Exe - - - ServiceManager - - - - - - - False - 285212672 - False - - - TRACE;DEBUG - - - True - 4096 - False - ..\..\bin\ - False - False - False - 4 - - - - - False - 285212672 - False - - - TRACE - - - False - 4096 - True - ..\..\bin\ - False - False - False - 4 - - - - - - System.dll - False - - - System.ServiceProcess.dll - False - - - System.Xml.dll - False - - - ..\..\bin\libsecondlife.dll - False - - - OpenSim.GenericConfig.Xml.dll - False - - - - - - - Component - - - - - - - - - -======= Local @@ -174,18 +70,6 @@ System.Xml.dll False - - ..\..\bin\libsecondlife.dll - False - - - OpenSim.GenericConfig.Xml.dll - False - - - ..\..\bin\OpenSim.Framework.dll - False - @@ -202,4 +86,3 @@ ->>>>>>> .r921 diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj.user b/OpenGridServices/ServiceManager/ServiceManager.csproj.user index 1b6b14dcc3..082d673bf1 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.csproj.user +++ b/OpenGridServices/ServiceManager/ServiceManager.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build index 5e1dd72ade..163e086921 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.exe.build +++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build @@ -21,9 +21,6 @@ - - - diff --git a/OpenSim.build b/OpenSim.build index 51168a1303..a600918c08 100644 --- a/OpenSim.build +++ b/OpenSim.build @@ -46,10 +46,12 @@ + - + + @@ -71,6 +73,7 @@ + @@ -84,6 +87,7 @@ + @@ -95,10 +99,12 @@ + - + + diff --git a/OpenSim.sln b/OpenSim.sln index d2036f0103..33a72172cd 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C# Express 2005 +# Visual Studio 2005 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" @@ -41,93 +41,144 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) + ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) + ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) + ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) + ({642A14A8-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) + ({642A14A8-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) + ({642A14A8-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) + ({642A14A8-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) + ({642A14A8-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) + ({642A14A8-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) + ({642A14A8-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000}) + ({642A14A8-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).10 = ({642A14A8-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).14 = ({8E81D43C-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000}) + ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) + ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) + ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) + ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) + ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) + ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) + ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) + ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) + ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000}) + ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) + ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) + ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) + ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) + ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) + ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) + ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) + ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) + ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) + ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) + ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/OpenSim.suo b/OpenSim.suo index 9f36e2071fdce8123ed8d4542a5343217c159215..8f2c6c97fb489e247d854042e4e0e47e34631c6b 100644 GIT binary patch delta 25338 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 delta 12581 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 WfTQjQK9ZUCu0^cE#F`DH)c*nslc9|O diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user +++ b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user +++ b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user +++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user +++ b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user +++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user +++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs index 89c1f61bbe..dd9adac444 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs @@ -235,49 +235,6 @@ namespace OpenSim } } - ///

- /// - /// - /// - public void SendRegionHandshake(RegionInfo regionInfo) - { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet"); - System.Text.Encoding _enc = System.Text.Encoding.ASCII; - RegionHandshakePacket handshake = new RegionHandshakePacket(); - - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details"); - handshake.RegionInfo.BillableFactor = 0; - handshake.RegionInfo.IsEstateManager = false; - handshake.RegionInfo.TerrainHeightRange00 = regionInfo.TerrainHeightRange00; - handshake.RegionInfo.TerrainHeightRange01 = regionInfo.TerrainHeightRange01; - handshake.RegionInfo.TerrainHeightRange10 = regionInfo.TerrainHeightRange10; - handshake.RegionInfo.TerrainHeightRange11 = regionInfo.TerrainHeightRange11; - handshake.RegionInfo.TerrainStartHeight00 = regionInfo.TerrainStartHeight00; - handshake.RegionInfo.TerrainStartHeight01 = regionInfo.TerrainStartHeight01; - handshake.RegionInfo.TerrainStartHeight10 = regionInfo.TerrainStartHeight10; - handshake.RegionInfo.TerrainStartHeight11 = regionInfo.TerrainStartHeight11; - handshake.RegionInfo.SimAccess = 13; - handshake.RegionInfo.WaterHeight = regionInfo.RegionWaterHeight; - uint regionFlags = 72458694; - if (regionInfo.RegionTerraform) - { - regionFlags -= 64; - } - handshake.RegionInfo.RegionFlags = regionFlags; - handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.RegionName + "\0"); - handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000"); - handshake.RegionInfo.TerrainBase0 = regionInfo.TerrainBase0; - handshake.RegionInfo.TerrainBase1 = regionInfo.TerrainBase1; - handshake.RegionInfo.TerrainBase2 = regionInfo.TerrainBase2; - handshake.RegionInfo.TerrainBase3 = regionInfo.TerrainBase3; - handshake.RegionInfo.TerrainDetail0 = regionInfo.TerrainDetail0; - handshake.RegionInfo.TerrainDetail1 = regionInfo.TerrainDetail1; - handshake.RegionInfo.TerrainDetail2 = regionInfo.TerrainDetail2; - handshake.RegionInfo.TerrainDetail3 = regionInfo.TerrainDetail3; - handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37"); - - OutPacket(handshake); - } /// /// diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 990b5c37e3..fa91d7db67 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -124,7 +124,10 @@ - + + Code + + Code @@ -133,10 +136,10 @@ Code - + Code - + Code @@ -148,40 +151,37 @@ Code + + Code + + + Code + Code - - Code - - - Code - - - Code - - - Code - Code - + Code - + Code - + Code - + + Code + + Code Code - + Code diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index c984f5a551..fc33eb9af5 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build @@ -11,47 +11,26 @@ - - + + - + + - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - + + diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj index bd1a332963..6ffcf9ed5d 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj @@ -76,64 +76,64 @@ - - Code - - + Code Code - + Code Code + + Code + Code + + Code + Code - + Code - - Code - - - Code - - + Code Code - + Code Code - + Code - + Code Code + + Code + Code - + Code - + Code diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build index c5255db462..ac4d564317 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build @@ -11,26 +11,26 @@ - - - - - - - - - - - + + + + + + + + + + + - + - + diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs index 30abd84ada..ab3c34c412 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs +++ b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs @@ -1,5 +1,6 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) Contributors, http://www.openmetaverse.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -8,14 +9,14 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the +* * Neither the name of the OpenSim Project nor the * names of its contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -85,6 +86,28 @@ namespace OpenSim.Storage.LocalStorageBDB { } + + 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(); diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user +++ b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs index a50795aa17..93f55d669a 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs @@ -1,5 +1,6 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) Contributors, http://www.openmetaverse.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -8,14 +9,14 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the +* * Neither the name of the OpenSim Project nor the * names of its contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -28,132 +29,119 @@ 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 { - /// - /// - /// - public class Db4LocalStorage : ILocalStorage - { - private IObjectContainer db; + /// + /// + /// + public class Db4LocalStorage : ILocalStorage + { + private IObjectContainer db; private string datastore; - - public Db4LocalStorage() - { - - } + + public Db4LocalStorage() + { + + } public void Initialise(string dfile) { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage Opening " + dfile); + OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage Opening " + dfile); datastore = dfile; try { db = Db4oFactory.OpenFile(datastore); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage creation"); + OpenSim.Framework.Console.MainConsole.Instance.Verbose("Db4LocalStorage creation"); } catch (Exception e) { db.Close(); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage :Constructor - Exception occured"); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); + OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage :Constructor - Exception occured"); + OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString()); } } - - public void StorePrim(PrimData prim) - { - IObjectSet result = db.Query(new UUIDQuery(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.Texture = prim.Texture; - db.Set(found); - db.Commit(); - } - else - { - //not in storage - db.Set(prim); - db.Commit(); - } - } - - public void RemovePrim(LLUUID primID) - { - IObjectSet result = db.Query(new UUIDQuery(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.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count); - foreach (PrimData prim in result) { - receiver.PrimFromStorage(prim); - } - } - public float[] LoadWorld() + public void StorePrim(PrimData prim) { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Loading world...."); - //World blank = new World(); - float[] heightmap = null; - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Looking for a heightmap in local DB"); - IObjectSet world_result = db.Get(typeof(MapStorage)); - if (world_result.Count > 0) + IObjectSet result = db.Query(new UUIDPrimQuery(prim.FullID)); + if (result.Count > 0) { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Found a heightmap in local database, loading"); - MapStorage map = (MapStorage)world_result.Next(); - //blank.LandMap = map.Map; - heightmap = map.Map; + //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.Texture = prim.Texture; + db.Set(found); + db.Commit(); } else { - /* - OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - No heightmap found, generating new one"); - HeightmapGenHills hills = new HeightmapGenHills(); - // blank.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false); - // heightmap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false); - heightmap = new float[256, 256]; - OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Saving heightmap to local database"); - MapStorage map = new MapStorage(); - map.Map = heightmap; //blank.LandMap; - db.Set(map); + //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.MainConsole.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.MainConsole.Instance.Verbose("LoadWorld() - Loading world...."); + float[] heightmap = null; + OpenSim.Framework.Console.MainConsole.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.MainConsole.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; } @@ -163,7 +151,7 @@ namespace OpenSim.Storage.LocalStorageDb4o IObjectSet world_result = db.Get(typeof(MapStorage)); if (world_result.Count > 0) { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SaveWorld() - updating saved copy of heightmap in local database"); + OpenSim.Framework.Console.MainConsole.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database"); MapStorage map = (MapStorage)world_result.Next(); db.Delete(map); } @@ -173,10 +161,111 @@ namespace OpenSim.Storage.LocalStorageDb4o db.Commit(); } - public void ShutDown() - { - db.Commit(); - db.Close(); - } - } -} + 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) + { + MainConsole.Instance.Notice("Parcel Backup: Saving Parcels..."); + int i; + for (i = 0; i < parcel_data.GetLength(0); i++) + { + + SaveParcel(parcel_data[i]); + + } + MainConsole.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() + { + MainConsole.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) + { + MainConsole.Instance.Notice("Parcel Backup: Loading Parcels..."); + IObjectSet result = db.Get(typeof(ParcelData)); + if (result.Count > 0) + { + MainConsole.Instance.Notice("Parcel Backup: Parcels exist in database."); + foreach (ParcelData parcelData in result) + { + + recv.ParcelFromStorage(parcelData); + } + } + else + { + MainConsole.Instance.Notice("Parcel Backup: No parcels exist. Creating basic parcel."); + recv.NoParcelDataFromStorage(); + } + MainConsole.Instance.Notice("Parcel Backup: Parcels Restored"); + } + public void ShutDown() + { + db.Commit(); + db.Close(); + } + } +} \ No newline at end of file diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 9b4ff5d239..7d90947523 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj @@ -93,13 +93,16 @@ Code - - Code - Code - + + Code + + + Code + + Code diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index da2db1490c..9789712114 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build @@ -12,9 +12,10 @@ - - + + + diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs new file mode 100644 index 0000000000..d24fb5f770 --- /dev/null +++ b/OpenSim/OpenSim.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/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs new file mode 100644 index 0000000000..b2e8a91a02 --- /dev/null +++ b/OpenSim/OpenSim.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/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs deleted file mode 100644 index ba9e13914e..0000000000 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs +++ /dev/null @@ -1,25 +0,0 @@ -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 UUIDQuery : Predicate - { - private LLUUID _findID; - - public UUIDQuery(LLUUID find) - { - _findID = find; - } - public bool Match(PrimData prim) - { - return (prim.FullID == _findID); - } - } -} diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user +++ b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs index 11eca0f9eb..ee8b9ff152 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs +++ b/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs @@ -1,5 +1,6 @@ /* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ +* Copyright (c) Contributors, http://www.openmetaverse.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -8,14 +9,14 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the +* * Neither the name of the OpenSim Project nor the * names of its contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -36,7 +37,6 @@ using libsecondlife; using OpenSim.Framework.Interfaces; using OpenSim.Framework.Types; - namespace OpenSim.Storage.LocalStorageSQLite { public class SQLiteLocalStorage : ILocalStorage @@ -54,8 +54,8 @@ namespace OpenSim.Storage.LocalStorageSQLite catch (Exception e) { db.Close(); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :Constructor - Exception occured"); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); + OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured"); + OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString()); } } @@ -117,8 +117,8 @@ namespace OpenSim.Storage.LocalStorageSQLite } catch (Exception e) { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :StorePrim - Exception occured"); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); + OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured"); + OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString()); } cmd.Dispose(); @@ -144,8 +144,8 @@ namespace OpenSim.Storage.LocalStorageSQLite } catch (Exception e) { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :RemovePrim - Exception occured"); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); + OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured"); + OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString()); } cmd.Dispose(); @@ -167,6 +167,28 @@ namespace OpenSim.Storage.LocalStorageSQLite } + 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(); diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user +++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs index 478f224f35..04879a6353 100644 --- a/OpenSim/OpenSim.World/Avatar.Update.cs +++ b/OpenSim/OpenSim.World/Avatar.Update.cs @@ -43,7 +43,7 @@ namespace OpenSim.world public void SendInitialPosition() { Console.WriteLine("sending initial Avatar data"); - this.ControllingClient.SendAvatarData(this.regionData, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60)); + this.ControllingClient.SendAvatarData(this.m_world.m_regInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60)); } /// diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs index ecd938b2ef..368bc53224 100644 --- a/OpenSim/OpenSim.World/Avatar.cs +++ b/OpenSim/OpenSim.World/Avatar.cs @@ -33,11 +33,7 @@ namespace OpenSim.world private LLVector3 positionLastFrame = new LLVector3(0, 0, 0); private ulong m_regionHandle; private Dictionary m_clientThreads; - private string m_regionName; - private ushort m_regionWaterHeight; - private bool m_regionTerraform; private bool childAvatar = false; - private RegionInfo regionData; /// /// @@ -46,17 +42,13 @@ namespace OpenSim.world /// /// /// - public Avatar(IClientAPI theClient, World world, Dictionary clientThreads, RegionInfo regionDat) + public Avatar(IClientAPI theClient, World world, Dictionary clientThreads) { m_world = world; m_clientThreads = clientThreads; - regionData = regionDat; this.uuid = theClient.AgentId; - m_regionName = regionData.RegionName; - m_regionHandle = regionData.RegionHandle; - m_regionTerraform = regionData.RegionTerraform; - m_regionWaterHeight = regionData.RegionWaterHeight; + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)"); ControllingClient = theClient; this.firstname = ControllingClient.FirstName; @@ -148,7 +140,7 @@ namespace OpenSim.world /// public void CompleteMovement() { - this.ControllingClient.MoveAgentIntoRegion(this.regionData); + this.ControllingClient.MoveAgentIntoRegion(this.m_world.m_regInfo); } /// @@ -174,7 +166,7 @@ namespace OpenSim.world /// public void SendRegionHandshake() { - this.ControllingClient.SendRegionHandshake(this.regionData); + this.m_world.estateManager.sendRegionHandshake(this.ControllingClient); } /// diff --git a/OpenSim/OpenSim.World/Estate/EstateManager.cs b/OpenSim/OpenSim.World/Estate/EstateManager.cs new file mode 100644 index 0000000000..37abc6d780 --- /dev/null +++ b/OpenSim/OpenSim.World/Estate/EstateManager.cs @@ -0,0 +1,296 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using OpenSim.Framework.Types; +using OpenSim.Framework.Interfaces; +using OpenSim.world; +using OpenSim; + +using libsecondlife; +using libsecondlife.Packets; + +namespace OpenSim.world.Estate +{ + + /// + /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings + /// + public class EstateManager + { + private World m_world; + + public EstateManager(World world) + { + m_world = world; //Estate settings found at world.m_regInfo.estateSettings + } + + 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_world.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.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length"); + } + else + { + m_world.m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None; + + if (convertParamStringToBool(packet.ParamList[0].Parameter)) + { + m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform; + } + + if (convertParamStringToBool(packet.ParamList[1].Parameter)) + { + m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly; + } + + if (convertParamStringToBool(packet.ParamList[2].Parameter)) + { + m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage; + } + + if (convertParamStringToBool(packet.ParamList[3].Parameter) == false) + { + m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell; + } + + + int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter))); + m_world.m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents; + + float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); + m_world.m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor; + + int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter)); + m_world.m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel; + + + if (convertParamStringToBool(packet.ParamList[7].Parameter)) + { + m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject; + } + + if (convertParamStringToBool(packet.ParamList[8].Parameter)) + { + m_world.m_regInfo.estateSettings.regionFlags = m_world.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_world.m_regInfo.estateSettings.terrainBase0 = tempUUID; + break; + case 1: + m_world.m_regInfo.estateSettings.terrainBase1 = tempUUID; + break; + case 2: + m_world.m_regInfo.estateSettings.terrainBase2 = tempUUID; + break; + case 3: + m_world.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_world.m_regInfo.estateSettings.terrainDetail0 = tempUUID; + break; + case 1: + m_world.m_regInfo.estateSettings.terrainDetail1 = tempUUID; + break; + case 2: + m_world.m_regInfo.estateSettings.terrainDetail2 = tempUUID; + break; + case 3: + m_world.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_world.m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow; + m_world.m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh; + break; + case 1: + m_world.m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow; + m_world.m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh; + break; + case 2: + m_world.m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow; + m_world.m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh; + break; + case 3: + m_world.m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow; + m_world.m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh; + break; + } + } + } + break; + case "texturecommit": + sendRegionHandshakeToAll(); + break; + case "setregionterrain": + if (packet.ParamList.Length != 9) + { + OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length"); + } + else + { + m_world.m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter)); + m_world.m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter)); + m_world.m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter)); + m_world.m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter); + m_world.m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); + + sendRegionInfoPacketToAll(); + } + break; + default: + OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString()); + break; + } + } + } + + public void sendRegionInfoPacketToAll() + { + foreach (OpenSim.world.Avatar av in m_world.Avatars.Values) + { + this.sendRegionInfoPacket(av.ControllingClient); + } + } + + public void sendRegionHandshakeToAll() + { + foreach (OpenSim.world.Avatar av in m_world.Avatars.Values) + { + this.sendRegionHandshake(av.ControllingClient); + } + } + + public void sendRegionInfoPacket(IClientAPI remote_client) + { + + AgentCircuitData circuitData = remote_client.RequestClientInfo(); + + RegionInfoPacket regionInfoPacket = new RegionInfoPacket(); + regionInfoPacket.AgentData.AgentID = circuitData.AgentID; + regionInfoPacket.AgentData.SessionID = circuitData.SessionID; + regionInfoPacket.RegionInfo.BillableFactor = m_world.m_regInfo.estateSettings.billableFactor; + regionInfoPacket.RegionInfo.EstateID = m_world.m_regInfo.estateSettings.estateID; + regionInfoPacket.RegionInfo.MaxAgents = m_world.m_regInfo.estateSettings.maxAgents; + regionInfoPacket.RegionInfo.ObjectBonusFactor = m_world.m_regInfo.estateSettings.objectBonusFactor; + regionInfoPacket.RegionInfo.ParentEstateID = m_world.m_regInfo.estateSettings.parentEstateID; + regionInfoPacket.RegionInfo.PricePerMeter = m_world.m_regInfo.estateSettings.pricePerMeter; + regionInfoPacket.RegionInfo.RedirectGridX = m_world.m_regInfo.estateSettings.redirectGridX; + regionInfoPacket.RegionInfo.RedirectGridY = m_world.m_regInfo.estateSettings.redirectGridY; + regionInfoPacket.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags; + regionInfoPacket.RegionInfo.SimAccess = (byte)m_world.m_regInfo.estateSettings.simAccess; + regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_world.m_regInfo.RegionName); + regionInfoPacket.RegionInfo.SunHour = m_world.m_regInfo.estateSettings.sunHour; + regionInfoPacket.RegionInfo.TerrainLowerLimit = m_world.m_regInfo.estateSettings.terrainLowerLimit; + regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_world.m_regInfo.estateSettings.terrainRaiseLimit; + regionInfoPacket.RegionInfo.UseEstateSun = !m_world.m_regInfo.estateSettings.useFixedSun; + regionInfoPacket.RegionInfo.WaterHeight = m_world.m_regInfo.estateSettings.waterHeight; + + remote_client.OutPacket(regionInfoPacket); + } + + public void sendRegionHandshake(IClientAPI remote_client) + { + System.Text.Encoding _enc = System.Text.Encoding.ASCII; + RegionHandshakePacket handshake = new RegionHandshakePacket(); + + handshake.RegionInfo.BillableFactor = m_world.m_regInfo.estateSettings.billableFactor; + handshake.RegionInfo.IsEstateManager = false; + handshake.RegionInfo.TerrainHeightRange00 = m_world.m_regInfo.estateSettings.terrainHeightRange0; + handshake.RegionInfo.TerrainHeightRange01 = m_world.m_regInfo.estateSettings.terrainHeightRange1; + handshake.RegionInfo.TerrainHeightRange10 = m_world.m_regInfo.estateSettings.terrainHeightRange2; + handshake.RegionInfo.TerrainHeightRange11 = m_world.m_regInfo.estateSettings.terrainHeightRange3; + handshake.RegionInfo.TerrainStartHeight00 = m_world.m_regInfo.estateSettings.terrainStartHeight0; + handshake.RegionInfo.TerrainStartHeight01 = m_world.m_regInfo.estateSettings.terrainStartHeight1; + handshake.RegionInfo.TerrainStartHeight10 = m_world.m_regInfo.estateSettings.terrainStartHeight2; + handshake.RegionInfo.TerrainStartHeight11 = m_world.m_regInfo.estateSettings.terrainStartHeight3; + handshake.RegionInfo.SimAccess = (byte)m_world.m_regInfo.estateSettings.simAccess; + handshake.RegionInfo.WaterHeight = m_world.m_regInfo.estateSettings.waterHeight; + + + handshake.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags; + + handshake.RegionInfo.SimName = _enc.GetBytes(m_world.m_regInfo.estateSettings.waterHeight + "\0"); + handshake.RegionInfo.SimOwner = m_world.m_regInfo.MasterAvatarAssignedUUID; + handshake.RegionInfo.TerrainBase0 = m_world.m_regInfo.estateSettings.terrainBase0; + handshake.RegionInfo.TerrainBase1 = m_world.m_regInfo.estateSettings.terrainBase1; + handshake.RegionInfo.TerrainBase2 = m_world.m_regInfo.estateSettings.terrainBase2; + handshake.RegionInfo.TerrainBase3 = m_world.m_regInfo.estateSettings.terrainBase3; + handshake.RegionInfo.TerrainDetail0 = m_world.m_regInfo.estateSettings.terrainDetail0; + handshake.RegionInfo.TerrainDetail1 = m_world.m_regInfo.estateSettings.terrainDetail1; + handshake.RegionInfo.TerrainDetail2 = m_world.m_regInfo.estateSettings.terrainDetail2; + handshake.RegionInfo.TerrainDetail3 = m_world.m_regInfo.estateSettings.terrainDetail3; + handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting? + + remote_client.OutPacket(handshake); + } + } +} diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj index dd469a9db1..f3c7b1ff4e 100644 --- a/OpenSim/OpenSim.World/OpenSim.World.csproj +++ b/OpenSim/OpenSim.World/OpenSim.World.csproj @@ -133,28 +133,19 @@ Code - + Code - + Code Code - - Code - - - Code - Code - - Code - - + Code @@ -163,19 +154,31 @@ Code - + Code - + + Code + + + Code + + Code Code + + Code + + + Code + Code - + Code @@ -187,6 +190,9 @@ Code + + Code + diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj.user b/OpenSim/OpenSim.World/OpenSim.World.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/OpenSim/OpenSim.World/OpenSim.World.csproj.user +++ b/OpenSim/OpenSim.World/OpenSim.World.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.World/ParcelManager.cs b/OpenSim/OpenSim.World/ParcelManager.cs new file mode 100644 index 0000000000..d571150323 --- /dev/null +++ b/OpenSim/OpenSim.World/ParcelManager.cs @@ -0,0 +1,832 @@ +/* +* Copyright (c) Contributors, http://www.openmetaverse.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) 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; + +namespace OpenSim.world +{ + + + #region ParcelManager Class + /// + /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc) + /// + public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver + { + + #region Constants + //Parcel types set with flags in ParcelOverlay. + //Only one of these can be used. + public const byte PARCEL_TYPE_PUBLIC = (byte)0; //Equals 00000000 + public const byte PARCEL_TYPE_OWNED_BY_OTHER = (byte)1; //Equals 00000001 + public const byte PARCEL_TYPE_OWNED_BY_GROUP = (byte)2; //Equals 00000010 + public const byte PARCEL_TYPE_OWNED_BY_REQUESTER = (byte)3; //Equals 00000011 + public const byte PARCEL_TYPE_IS_FOR_SALE = (byte)4; //Equals 00000100 + public const byte PARCEL_TYPE_IS_BEING_AUCTIONED = (byte)5; //Equals 00000101 + + + //Flags that when set, a border on the given side will be placed + //NOTE: North and East is assumable by the west and south sides (if parcel to east has a west border, then I have an east border; etc) + //This took forever to figure out -- jeesh. /blame LL for even having to send these + public const byte PARCEL_FLAG_PROPERTY_BORDER_WEST = (byte)64; //Equals 01000000 + public const byte PARCEL_FLAG_PROPERTY_BORDER_SOUTH = (byte)128; //Equals 10000000 + + //RequestResults (I think these are right, they seem to work): + public const int PARCEL_RESULT_ONE_PARCEL = 0; // The request they made contained only one parcel + public const int PARCEL_RESULT_MULTIPLE_PARCELS = 1; // The request they made contained more than one parcel + + //These are other constants. Yay! + public const int START_PARCEL_LOCAL_ID = 1; + #endregion + + #region Member Variables + public Dictionary parcelList = new Dictionary(); + private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1; + private int[,] parcelIDList = new int[64, 64]; + + private static World m_world; + #endregion + + #region Constructors + public ParcelManager(World world) + { + + m_world = world; + parcelIDList.Initialize(); + + } + #endregion + + #region Member Functions + + #region Parcel From Storage Functions + public void ParcelFromStorage(ParcelData data) + { + Parcel new_parcel = new Parcel(data.ownerID, data.isGroupOwned, m_world); + new_parcel.parcelData = data.Copy(); + new_parcel.setParcelBitmapFromByteArray(); + addParcel(new_parcel); + + } + + public void NoParcelDataFromStorage() + { + resetSimParcels(); + } + #endregion + + #region Parcel Add/Remove/Get/Create + /// + /// Creates a basic Parcel object without an owner (a zeroed key) + /// + /// + public Parcel createBaseParcel() + { + return new Parcel(new LLUUID(), false, m_world); + } + + /// + /// Adds a parcel to the stored list and adds them to the parcelIDList to what they own + /// + /// The parcel being added + public void addParcel(Parcel new_parcel) + { + lastParcelLocalID++; + new_parcel.parcelData.localID = lastParcelLocalID; + parcelList.Add(lastParcelLocalID, new_parcel.Copy()); + + + bool[,] parcelBitmap = new_parcel.getParcelBitmap(); + int x, y; + for (x = 0; x < 64; x++) + { + for (y = 0; y < 64; y++) + { + if (parcelBitmap[x, y]) + { + parcelIDList[x, y] = lastParcelLocalID; + } + } + } + parcelList[lastParcelLocalID].forceUpdateParcelInfo(); + + + } + /// + /// Removes a parcel from the list. Will not remove if local_id is still owning an area in parcelIDList + /// + /// Parcel.localID of the parcel to remove. + public void removeParcel(int local_id) + { + int x, y; + for (x = 0; x < 64; x++) + { + for (y = 0; y < 64; y++) + { + if (parcelIDList[x, y] == local_id) + { + throw new Exception("Could not remove parcel. Still being used at " + x + ", " + y); + } + } + } + m_world.localStorage.RemoveParcel(parcelList[local_id].parcelData); + parcelList.Remove(local_id); + } + + public void performFinalParcelJoin(Parcel master, Parcel slave) + { + int x, y; + bool[,] parcelBitmapSlave = slave.getParcelBitmap(); + for (x = 0; x < 64; x++) + { + for (y = 0; y < 64; y++) + { + if (parcelBitmapSlave[x, y]) + { + parcelIDList[x, y] = master.parcelData.localID; + } + } + } + removeParcel(slave.parcelData.localID); + } + /// + /// Get the parcel at the specified point + /// + /// Value between 0 - 256 on the x axis of the point + /// Value between 0 - 256 on the y axis of the point + /// Parcel at the point supplied + public Parcel getParcel(int x, int y) + { + if (x > 256 || y > 256 || x < 0 || y < 0) + { + throw new Exception("Error: Parcel not found at point " + x + ", " + y); + } + else + { + return parcelList[parcelIDList[x / 4, y / 4]]; + } + + } + #endregion + + #region Parcel Modification + /// + /// Subdivides a parcel + /// + /// West Point + /// South Point + /// East Point + /// North Point + /// LLUUID of user who is trying to subdivide + /// Returns true if successful + public bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id) + { + //First, lets loop through the points and make sure they are all in the same parcel + //Get the parcel at start + Parcel startParcel = getParcel(start_x, start_y); + if (startParcel == null) return false; //No such parcel at the beginning + + //Loop through the points + try + { + int totalX = end_x - start_x; + int totalY = end_y - start_y; + int x, y; + for (y = 0; y < totalY; y++) + { + for (x = 0; x < totalX; x++) + { + Parcel tempParcel = getParcel(start_x + x, start_y + y); + if (tempParcel == null) return false; //No such parcel at that point + if (tempParcel != startParcel) return false; //Subdividing over 2 parcels; no-no + } + } + } + catch (Exception e) + { + return false; //Exception. For now, lets skip subdivision + } + + //If we are still here, then they are subdividing within one parcel + //Check owner + if (startParcel.parcelData.ownerID != attempting_user_id) + { + return false; //They cant do this! + } + + //Lets create a new parcel with bitmap activated at that point (keeping the old parcels info) + Parcel newParcel = startParcel.Copy(); + newParcel.parcelData.parcelName = "Subdivision of " + newParcel.parcelData.parcelName; + newParcel.parcelData.globalID = LLUUID.Random(); + + newParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(start_x, start_y, end_x, end_y)); + + //Now, lets set the subdivision area of the original to false + int startParcelIndex = startParcel.parcelData.localID; + parcelList[startParcelIndex].setParcelBitmap(Parcel.modifyParcelBitmapSquare(startParcel.getParcelBitmap(), start_x, start_y, end_x, end_y, false)); + parcelList[startParcelIndex].forceUpdateParcelInfo(); + + + //Now add the new parcel + addParcel(newParcel); + + + + + + return true; + } + /// + /// Join 2 parcels together + /// + /// x value in first parcel + /// y value in first parcel + /// x value in second parcel + /// y value in second parcel + /// LLUUID of the avatar trying to join the parcels + /// Returns true if successful + public bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id) + { + end_x -= 4; + end_y -= 4; + + //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box! + //This should be fixed later -- somewhat "incomplete code" --Ming + Parcel startParcel, endParcel; + + try + { + startParcel = getParcel(start_x, start_y); + endParcel = getParcel(end_x, end_y); + } + catch (Exception e) + { + return false; //Error occured when trying to get the start and end parcels + } + if (startParcel == endParcel) + { + return false; //Subdivision of the same parcel is not allowed + } + + //Check the parcel owners: + if (startParcel.parcelData.ownerID != endParcel.parcelData.ownerID) + { + return false; + } + if (startParcel.parcelData.ownerID != attempting_user_id) + { + //TODO: Group editing stuff. Avatar owner support for now + return false; + } + + //Same owners! Lets join them + //Merge them to startParcel + parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap())); + performFinalParcelJoin(startParcel, endParcel); + + return true; + + + + } + #endregion + + #region Parcel Updating + /// + /// Where we send the ParcelOverlay packet to the client + /// + /// The object representing the client + public void sendParcelOverlay(IClientAPI remote_client) + { + const int PARCEL_BLOCKS_PER_PACKET = 1024; + int x, y = 0; + byte[] byteArray = new byte[PARCEL_BLOCKS_PER_PACKET]; + int byteArrayCount = 0; + int sequenceID = 0; + ParcelOverlayPacket packet; + + for (y = 0; y < 64; y++) + { + for (x = 0; x < 64; x++) + { + byte tempByte = (byte)0; //This represents the byte for the current 4x4 + Parcel currentParcelBlock = getParcel(x * 4, y * 4); + + if (currentParcelBlock.parcelData.ownerID == remote_client.AgentId) + { + //Owner Flag + tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_REQUESTER); + } + else if (currentParcelBlock.parcelData.salePrice > 0 && (currentParcelBlock.parcelData.authBuyerID == LLUUID.Zero || currentParcelBlock.parcelData.authBuyerID == remote_client.AgentId)) + { + //Sale Flag + tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE); + } + else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero) + { + //Public Flag + tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC); + } + else + { + //Other Flag + tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_OTHER); + } + + + //Now for border control + if (x == 0) + { + tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST); + } + else if (getParcel((x - 1) * 4, y * 4) != currentParcelBlock) + { + tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST); + } + + if (y == 0) + { + tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH); + } + else if (getParcel(x * 4, (y - 1) * 4) != currentParcelBlock) + { + tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH); + } + + byteArray[byteArrayCount] = tempByte; + byteArrayCount++; + if (byteArrayCount >= PARCEL_BLOCKS_PER_PACKET) + { + byteArrayCount = 0; + packet = new ParcelOverlayPacket(); + packet.ParcelData.Data = byteArray; + packet.ParcelData.SequenceID = sequenceID; + remote_client.OutPacket((Packet)packet); + sequenceID++; + byteArray = new byte[PARCEL_BLOCKS_PER_PACKET]; + } + } + } + + packet = new ParcelOverlayPacket(); + packet.ParcelData.Data = byteArray; + packet.ParcelData.SequenceID = sequenceID; //Eh? + remote_client.OutPacket((Packet)packet); + } + #endregion + + /// + /// Resets the sim to the default parcel (full sim parcel owned by the default user) + /// + public void resetSimParcels() + { + //Remove all the parcels in the sim and add a blank, full sim parcel set to public + parcelList.Clear(); + lastParcelLocalID = START_PARCEL_LOCAL_ID - 1; + parcelIDList.Initialize(); + + Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world); + + fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256)); + fullSimParcel.parcelData.parcelName = "Your Sim Parcel"; + fullSimParcel.parcelData.parcelDesc = ""; + + fullSimParcel.parcelData.ownerID = m_world.m_regInfo.MasterAvatarAssignedUUID; + fullSimParcel.parcelData.salePrice = 1; + fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale; + fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased; + + addParcel(fullSimParcel); + + } + #endregion + } + #endregion + + + #region Parcel Class + /// + /// Keeps track of a specific parcel's information + /// + public class Parcel + { + #region Member Variables + public ParcelData parcelData = new ParcelData(); + public World m_world; + + private bool[,] parcelBitmap = new bool[64, 64]; + + #endregion + + + #region Constructors + public Parcel(LLUUID owner_id, bool is_group_owned, World world) + { + m_world = world; + parcelData.ownerID = owner_id; + parcelData.isGroupOwned = is_group_owned; + + } + #endregion + + + #region Member Functions + + #region General Functions + /// + /// Checks to see if this parcel contains a point + /// + /// + /// + /// Returns true if the parcel contains the specified point + public bool containsPoint(int x, int y) + { + if (x >= 0 && y >= 0 && x <= 256 && x <= 256) + { + return (parcelBitmap[x / 4, y / 4] == true); + } + else + { + return false; + } + } + + public Parcel Copy() + { + Parcel newParcel = new Parcel(this.parcelData.ownerID, this.parcelData.isGroupOwned, m_world); + + //Place all new variables here! + newParcel.parcelBitmap = (bool[,])(this.parcelBitmap.Clone()); + newParcel.parcelData = parcelData.Copy(); + + return newParcel; + } + + #endregion + + + #region Packet Request Handling + /// + /// Sends parcel properties as requested + /// + /// ID sent by client for them to keep track of + /// Bool sent by client for them to use + /// Object representing the client + public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, 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; + + foreach (Avatar av in m_world.Avatars.Values) + { + Parcel over = m_world.parcelManager.getParcel((int)Math.Round(av.Pos.X), (int)Math.Round(av.Pos.Y)); + if (over == this) + { + sendParcelProperties(0, false, 0, av.ControllingClient); + } + } + } + } + #endregion + + + #region Update Functions + /// + /// Updates the AABBMin and AABBMax values after area/shape modification of parcel + /// + private void updateAABBAndAreaValues() + { + int min_x = 64; + int min_y = 64; + int max_x = 0; + int max_y = 0; + int tempArea = 0; + int x, y; + for (x = 0; x < 64; x++) + { + for (y = 0; y < 64; y++) + { + if (parcelBitmap[x, y] == true) + { + if (min_x > x) min_x = x; + if (min_y > y) min_y = y; + if (max_x < x) max_x = x; + if (max_y < y) max_y = y; + tempArea += 16; //16sqm parcel + } + } + } + parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]); + parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]); + parcelData.area = tempArea; + } + + public void updateParcelBitmapByteArray() + { + parcelData.parcelBitmapByteArray = convertParcelBitmapToBytes(); + } + + /// + /// Update all settings in parcel such as area, bitmap byte array, etc + /// + public void forceUpdateParcelInfo() + { + this.updateAABBAndAreaValues(); + this.updateParcelBitmapByteArray(); + } + + public void setParcelBitmapFromByteArray() + { + parcelBitmap = convertBytesToParcelBitmap(); + } + #endregion + + + #region Parcel Bitmap Functions + /// + /// Sets the parcel's bitmap manually + /// + /// 64x64 block representing where this parcel is on a map + public void setParcelBitmap(bool[,] bitmap) + { + if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2) + { + //Throw an exception - The bitmap is not 64x64 + throw new Exception("Error: Invalid Parcel Bitmap"); + } + else + { + //Valid: Lets set it + parcelBitmap = bitmap; + forceUpdateParcelInfo(); + + } + } + /// + /// Gets the parcels bitmap manually + /// + /// + public bool[,] getParcelBitmap() + { + return parcelBitmap; + } + /// + /// Converts the parcel bitmap to a packet friendly byte array + /// + /// + private byte[] convertParcelBitmapToBytes() + { + byte[] tempConvertArr = new byte[512]; + byte tempByte = 0; + int x, y, i, byteNum = 0; + i = 0; + for (y = 0; y < 64; y++) + { + for (x = 0; x < 64; x++) + { + tempByte = Convert.ToByte(tempByte | Convert.ToByte(parcelBitmap[x, y]) << (i++ % 8)); + if (i % 8 == 0) + { + tempConvertArr[byteNum] = tempByte; + tempByte = (byte)0; + i = 0; + byteNum++; + } + } + } + return tempConvertArr; + } + + private bool[,] convertBytesToParcelBitmap() + { + bool[,] tempConvertMap = new bool[64, 64]; + tempConvertMap.Initialize(); + byte tempByte = 0; + int x = 0, y = 0, i = 0, bitNum = 0; + for(i = 0; i < 512; i++) + { + tempByte = parcelData.parcelBitmapByteArray[i]; + for(bitNum = 0; bitNum < 8; bitNum++) + { + bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1); + tempConvertMap[x, y] = bit; + x++; + if(x > 63) + { + x = 0; + y++; + } + + } + + } + return tempConvertMap; + } + /// + /// Full sim parcel creation + /// + /// + public static bool[,] basicFullRegionParcelBitmap() + { + return getSquareParcelBitmap(0, 0, 256, 256); + } + + /// + /// Used to modify the bitmap between the x and y points. Points use 64 scale + /// + /// + /// + /// + /// + /// + public static bool[,] getSquareParcelBitmap(int start_x, int start_y, int end_x, int end_y) + { + + bool[,] tempBitmap = new bool[64, 64]; + tempBitmap.Initialize(); + + tempBitmap = modifyParcelBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true); + return tempBitmap; + } + + /// + /// Change a parcel's bitmap at within a square and set those points to a specific value + /// + /// + /// + /// + /// + /// + /// + /// + public static bool[,] modifyParcelBitmapSquare(bool[,] parcel_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value) + { + if (parcel_bitmap.GetLength(0) != 64 || parcel_bitmap.GetLength(1) != 64 || parcel_bitmap.Rank != 2) + { + //Throw an exception - The bitmap is not 64x64 + throw new Exception("Error: Invalid Parcel Bitmap in modifyParcelBitmapSquare()"); + } + + int x, y; + for (y = 0; y < 64; y++) + { + for (x = 0; x < 64; x++) + { + if (x >= start_x / 4 && x < end_x / 4 + && y >= start_y / 4 && y < end_y / 4) + { + parcel_bitmap[x, y] = set_value; + } + } + } + return parcel_bitmap; + } + /// + /// Join the true values of 2 bitmaps together + /// + /// + /// + /// + public static bool[,] mergeParcelBitmaps(bool[,] bitmap_base, bool[,] bitmap_add) + { + if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2) + { + //Throw an exception - The bitmap is not 64x64 + throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeParcelBitmaps"); + } + if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2) + { + //Throw an exception - The bitmap is not 64x64 + throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeParcelBitmaps"); + + } + + int x, y; + for (y = 0; y < 64; y++) + { + for (x = 0; x < 64; x++) + { + if (bitmap_add[x, y]) + { + bitmap_base[x, y] = true; + } + } + } + return bitmap_base; + } + #endregion + + #endregion + + + } + #endregion + + +} diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs index 1d56ea32a0..1f97820898 100644 --- a/OpenSim/OpenSim.World/World.cs +++ b/OpenSim/OpenSim.World/World.cs @@ -15,6 +15,8 @@ using OpenSim.Framework; using OpenSim.RegionServer.world.scripting; using OpenSim.Terrain; using OpenGrid.Framework.Communications; +using OpenSim.world.Estate; + namespace OpenSim.world { @@ -40,6 +42,9 @@ namespace OpenSim.world protected RegionCommsHostBase regionCommsHost; protected RegionServerCommsManager commsManager; + public ParcelManager parcelManager; + public EstateManager estateManager; + #region Properties /// /// @@ -444,7 +449,7 @@ namespace OpenSim.world /// /// /// - /// + /// /// public override void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child) @@ -458,7 +463,7 @@ namespace OpenSim.world try { OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); - newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo); + newAvatar = new Avatar(remoteClient, this, m_clientThreads); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); newAvatar.SendRegionHandshake(); diff --git a/OpenSim/OpenSim.World/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs index 19a8fb5992..4d806e3b00 100644 --- a/OpenSim/OpenSim.World/WorldBase.cs +++ b/OpenSim/OpenSim.World/WorldBase.cs @@ -23,7 +23,7 @@ namespace OpenSim.world protected string m_regionName; // protected InventoryCache _inventoryCache; // protected AssetCache _assetCache; - protected RegionInfo m_regInfo; + public RegionInfo m_regInfo; public TerrainEngine Terrain; //TODO: Replace TerrainManager with this. protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine diff --git a/OpenSim/OpenSim/OpenSim.csproj.user b/OpenSim/OpenSim/OpenSim.csproj.user index ba0418b936..66e2cb4e43 100644 --- a/OpenSim/OpenSim/OpenSim.csproj.user +++ b/OpenSim/OpenSim/OpenSim.csproj.user @@ -3,7 +3,7 @@ Debug AnyCPU -loginserver -sandbox -accounts - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build index 4f8ca8a6ba..9c209ac4ec 100644 --- a/OpenSim/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim/OpenSim.exe.build @@ -29,8 +29,10 @@ + + diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs index 7c83dee6b1..cbcf3dbac7 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSim/OpenSimMain.cs @@ -69,7 +69,6 @@ namespace OpenSim m_loginserver = startLoginServer; m_physicsEngine = physicsEngine; m_config = configFile; - m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, silent); OpenSim.Framework.Console.MainConsole.Instance = m_console; } diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index 55efffac57..df6b4f4426 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj @@ -83,9 +83,6 @@ Code - - Code - Code @@ -95,19 +92,25 @@ Code - + Code - - Code - - + Code Code - + + Code + + + Code + + + Code + + Code @@ -119,40 +122,28 @@ Code - - Code - - - Code - - - Code - Code - - Code - - - Code - - - Code - Code + + Code + Code - + Code - + Code - + + Code + + Code @@ -161,10 +152,7 @@ Code - - Code - - + Code @@ -176,13 +164,19 @@ Code + + Code + Code - + Code - + + Code + + Code @@ -191,6 +185,12 @@ Code + + Code + + + Code + Code diff --git a/Prebuild/src/Prebuild.csproj.user b/Prebuild/src/Prebuild.csproj.user index 9bfaf67280..082d673bf1 100644 --- a/Prebuild/src/Prebuild.csproj.user +++ b/Prebuild/src/Prebuild.csproj.user @@ -2,7 +2,7 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + C:\sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index 43f5516127..f2c8cabd40 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build @@ -14,42 +14,42 @@ - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + - - + + + + +