From 4224b695acc2e1ad0199dc0ad7f560494182ed54 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Sat, 9 Jun 2007 21:45:58 +0000 Subject: [PATCH] * LogFile now defaults to "{apptype}.log" * cleaned away suo and user files. * added handy string chat variety to the API * Moved LockPhysicsEngine on World to SyncRoot on IWorld * Introduced NextLocalId instead of World fuggliness. * Transformed GetRegionInfo to Property on IWorld for great justice * Extracted default wearables (good to have) * Deleted unused BaseServer * Used IWorld instead of World wherever possible * The client constructor's not getting unused port any longer. * Extracted ClientView factoring so PacketServer can be tweaked. * Added SendLayerData to World * Made WorldBase abstract and cleaned it up a bit * added OpenGrid.Framework.Communications.dll.build and OpenSim.World.dll.build to svn * Added code for two examples (but not in prebuild yet) --- .../OpenGrid.Framework.Communications.csproj | 24 +- ...penGrid.Framework.Communications.dll.build | 51 ++++ .../OpenSim.Framework.Console/ConsoleBase.cs | 6 + .../OpenSim.Framework.Console.csproj.user | 12 - .../Interfaces/IClientAPI.cs | 1 + Common/OpenSim.Framework/Interfaces/IWorld.cs | 5 +- .../OpenSim.Framework.csproj | 106 ++++---- .../OpenSim.Framework.csproj.user | 12 - .../OpenSim.Framework.dll.build | 62 ++--- .../OpenSim.Framework/Types/AgentWearable.cs | 15 ++ .../Xml/OpenSim.GenericConfig.Xml.csproj.user | 12 - Common/OpenSim.Servers/BaseServer.cs | 10 - Common/OpenSim.Servers/OpenSim.Servers.csproj | 13 +- .../OpenSim.Servers.csproj.user | 12 - .../OpenSim.Servers/OpenSim.Servers.dll.build | 7 +- Common/XmlRpcCS/XMLRPC.csproj | 80 +++--- Common/XmlRpcCS/XMLRPC.csproj.user | 12 - Common/XmlRpcCS/XMLRPC.dll.build | 28 +-- OpenGridServices.suo | Bin 139776 -> 0 bytes ...OpenGrid.Config.GridConfigDb4o.csproj.user | 12 - .../OpenGrid.Framework.Data.DB4o.csproj | 4 +- .../OpenGrid.Framework.Data.DB4o.csproj.user | 12 - .../OpenGrid.Framework.Data.DB4o.dll.build | 4 +- .../OpenGrid.Framework.Data.MSSQL.csproj.user | 12 - .../OpenGrid.Framework.Data.MySQL.csproj | 14 +- .../OpenGrid.Framework.Data.MySQL.csproj.user | 12 - .../OpenGrid.Framework.Data.MySQL.dll.build | 8 +- .../OpenGrid.Framework.Data.SQLite.csproj | 4 +- ...OpenGrid.Framework.Data.SQLite.csproj.user | 12 - .../OpenGrid.Framework.Data.SQLite.dll.build | 2 +- .../OpenGrid.Framework.Data.csproj | 6 +- .../OpenGrid.Framework.Data.csproj.user | 12 - .../OpenGrid.Framework.Data.dll.build | 2 +- .../OpenGrid.Framework.Manager.csproj.user | 12 - .../OpenGridServices.AssetServer.csproj | 4 +- .../OpenGridServices.AssetServer.csproj.user | 12 - .../OpenGridServices.AssetServer.exe.build | 2 +- .../OpenGridServices.GridServer.csproj.user | 12 - .../OpenGridServices.UserServer.csproj.user | 12 - ...OpenUser.Config.UserConfigDb4o.csproj.user | 12 - OpenSim.sln | 229 +++++++----------- OpenSim/Examples/SimpleApp/MyWorld.cs | 101 ++++++++ OpenSim/Examples/SimpleApp/Program.cs | 110 +++++++++ .../SimpleApp/Properties/AssemblyInfo.cs | 33 +++ OpenSim/Examples/SimpleApp/SimpleApp.csproj | 86 +++++++ OpenSim/Examples/SimpleApp2/MyClientView.cs | 69 ++++++ OpenSim/Examples/SimpleApp2/MyPacketServer.cs | 30 +++ OpenSim/Examples/SimpleApp2/Program.cs | 160 ++++++++++++ .../SimpleApp2/Properties/AssemblyInfo.cs | 33 +++ OpenSim/Examples/SimpleApp2/SimpleApp2.csproj | 87 +++++++ .../OpenSim.GridInterfaces.Local.csproj.user | 12 - .../OpenSim.GridInterfaces.Remote.csproj.user | 12 - ...Sim.Physics.BasicPhysicsPlugin.csproj.user | 12 - .../OpenSim.Physics.Manager.csproj.user | 12 - .../OpenSim.Physics.OdePlugin.csproj.user | 12 - .../OpenSim.Physics.PhysXPlugin.csproj.user | 12 - .../AuthenticateSessionsLocal.cs | 8 +- .../OpenSim.RegionServer/ClientView.API.cs | 5 + OpenSim/OpenSim.RegionServer/ClientView.cs | 6 +- .../OpenSim.RegionServer.csproj | 70 +++--- .../OpenSim.RegionServer.csproj.user | 12 - .../OpenSim.RegionServer.dll.build | 30 +-- OpenSim/OpenSim.RegionServer/PacketServer.cs | 10 +- .../OpenSim.Scripting.EmbeddedJVM.csproj | 62 ++--- .../OpenSim.Scripting.EmbeddedJVM.csproj.user | 12 - .../OpenSim.Scripting.EmbeddedJVM.dll.build | 26 +- ...Storage.LocalStorageBerkeleyDB.csproj.user | 12 - .../OpenSim.Storage.LocalStorageDb4o.csproj | 6 +- ...enSim.Storage.LocalStorageDb4o.csproj.user | 12 - ...OpenSim.Storage.LocalStorageDb4o.dll.build | 2 +- ...Sim.Storage.LocalStorageSQLite.csproj.user | 12 - .../OpenSim.Terrain.BasicTerrain.csproj.user | 12 - OpenSim/OpenSim.World/Avatar.cs | 11 +- OpenSim/OpenSim.World/Entity.cs | 2 +- OpenSim/OpenSim.World/OpenSim.World.csproj | 52 ++-- .../OpenSim.World/OpenSim.World.csproj.user | 12 - OpenSim/OpenSim.World/OpenSim.World.dll.build | 71 ++++++ OpenSim/OpenSim.World/World.cs | 18 +- OpenSim/OpenSim.World/WorldBase.cs | 91 +++---- OpenSim/OpenSim/OpenSim.csproj.user | 13 - Prebuild/src/Prebuild.csproj | 70 +++--- Prebuild/src/Prebuild.csproj.user | 12 - Prebuild/src/Prebuild.exe.build | 36 +-- 83 files changed, 1371 insertions(+), 974 deletions(-) create mode 100644 Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build delete mode 100644 Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user delete mode 100644 Common/OpenSim.Framework/OpenSim.Framework.csproj.user delete mode 100644 Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user delete mode 100644 Common/OpenSim.Servers/BaseServer.cs delete mode 100644 Common/OpenSim.Servers/OpenSim.Servers.csproj.user delete mode 100644 Common/XmlRpcCS/XMLRPC.csproj.user delete mode 100644 OpenGridServices.suo delete mode 100644 OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user delete mode 100644 OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user delete mode 100644 OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user delete mode 100644 OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user delete mode 100644 OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user delete mode 100644 OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user delete mode 100644 OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user delete mode 100644 OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user delete mode 100644 OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user delete mode 100644 OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user delete mode 100644 OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user create mode 100644 OpenSim/Examples/SimpleApp/MyWorld.cs create mode 100644 OpenSim/Examples/SimpleApp/Program.cs create mode 100644 OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs create mode 100644 OpenSim/Examples/SimpleApp/SimpleApp.csproj create mode 100644 OpenSim/Examples/SimpleApp2/MyClientView.cs create mode 100644 OpenSim/Examples/SimpleApp2/MyPacketServer.cs create mode 100644 OpenSim/Examples/SimpleApp2/Program.cs create mode 100644 OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs create mode 100644 OpenSim/Examples/SimpleApp2/SimpleApp2.csproj delete mode 100644 OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user delete mode 100644 OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user delete mode 100644 OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user delete mode 100644 OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user delete mode 100644 OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user delete mode 100644 OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user delete mode 100644 OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user delete mode 100644 OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user delete mode 100644 OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user delete mode 100644 OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user delete mode 100644 OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user delete mode 100644 OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user delete mode 100644 OpenSim/OpenSim.World/OpenSim.World.csproj.user create mode 100644 OpenSim/OpenSim.World/OpenSim.World.dll.build delete mode 100644 OpenSim/OpenSim/OpenSim.csproj.user delete mode 100644 Prebuild/src/Prebuild.csproj.user diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj index 689210bdd1..94682be1c9 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj @@ -83,22 +83,13 @@ Code - - Code - Code - + Code - - Code - - - Code - - + Code @@ -107,7 +98,16 @@ Code - + + Code + + + Code + + + Code + + Code diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build new file mode 100644 index 0000000000..a6616bf956 --- /dev/null +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Common/OpenSim.Framework.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/ConsoleBase.cs index 0377998f1f..80a28e9dc3 100644 --- a/Common/OpenSim.Framework.Console/ConsoleBase.cs +++ b/Common/OpenSim.Framework.Console/ConsoleBase.cs @@ -54,6 +54,12 @@ namespace OpenSim.Framework.Console this.cmdparser = cmdparser; this.m_silent = silent; System.Console.WriteLine("ServerConsole.cs - creating new local console"); + + if( String.IsNullOrEmpty( LogFile ) ) + { + LogFile = componentname + ".log"; + } + System.Console.WriteLine("Logs will be saved to current directory in " + LogFile); Log = File.AppendText(LogFile); Log.WriteLine("========================================================================"); diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 d5b2ae453d..9d28dabc45 100644 --- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs +++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs @@ -94,6 +94,7 @@ namespace OpenSim.Framework.Interfaces void OutPacket(Packet newPack); void SendWearables(AvatarWearable[] wearables); void SendRegionHandshake(RegionInfo regionInfo); + void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); void SendLayerData(float[] map); void MoveAgentIntoRegion(RegionInfo regInfo); diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs index ab2d63db29..eee30b7d21 100644 --- a/Common/OpenSim.Framework/Interfaces/IWorld.cs +++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs @@ -10,6 +10,9 @@ namespace OpenSim.Framework.Interfaces { void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child); void RemoveAvatar(LLUUID agentID); - RegionInfo GetRegionInfo(); + + RegionInfo RegionInfo { get; } + object SyncRoot { get; } + uint NextLocalId { get; } } } diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index 7e14e6a94c..f72c5f569b 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj +++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj @@ -90,58 +90,49 @@ - - Code - Code Code - - Code - - - Code - - - Code - - + Code Code - + Code - + Code - - Code - - + Code Code - + Code - + Code - + + Code + + + Code + + Code Code - + Code @@ -150,25 +141,37 @@ Code - + Code - + Code - + Code - + + Code + + + Code + + + Code + + + Code + + Code Code - + Code - + Code @@ -177,34 +180,25 @@ Code - + Code - - Code - - + Code Code - - Code - - - Code - - - Code - - + Code Code - + + Code + + Code @@ -213,19 +207,25 @@ Code - - Code - - - Code - Code - + Code - + + Code + + + Code + + + Code + + + Code + + Code diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 2678e54c17..7ead9a80df 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build @@ -11,52 +11,52 @@ - - - - - - - - - + + + + - - - + + + + + - + - - - - - - + + + + + + + + + + - - - + + - - - - + - + + - - - - + + + + + + diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/Common/OpenSim.Framework/Types/AgentWearable.cs index b7fbe3c493..49c1292af5 100644 --- a/Common/OpenSim.Framework/Types/AgentWearable.cs +++ b/Common/OpenSim.Framework/Types/AgentWearable.cs @@ -14,5 +14,20 @@ namespace OpenSim.Framework.Types { } + + public static AvatarWearable[] DefaultWearables + { + get + { + AvatarWearable[] defaultWearables = new AvatarWearable[13]; //should be 13 of these + for (int i = 0; i < 13; i++) + { + defaultWearables[i] = new AvatarWearable(); + } + defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); + defaultWearables[0].ItemID = LLUUID.Random(); + return defaultWearables; + } + } } } diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/Common/OpenSim.Servers/BaseServer.cs b/Common/OpenSim.Servers/BaseServer.cs deleted file mode 100644 index 0a4c4983ee..0000000000 --- a/Common/OpenSim.Servers/BaseServer.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace OpenSim.Servers -{ - public class BaseServer - { - } -} diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj index 6768ce45ae..0c61f75793 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.csproj +++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj @@ -92,13 +92,10 @@ - - Code - Code - + Code @@ -107,18 +104,18 @@ Code - - Code - Code - + Code Code + + Code + diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 a2af584834..ec868f19cb 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build +++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build @@ -11,15 +11,14 @@ - - + - - + + diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj index 1ab494ed27..61f8be0162 100644 --- a/Common/XmlRpcCS/XMLRPC.csproj +++ b/Common/XmlRpcCS/XMLRPC.csproj @@ -70,58 +70,58 @@ - - Code - - - Code - - - Code - Code - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - Code + + Code + Code + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + Code - + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + Code diff --git a/Common/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/Common/XmlRpcCS/XMLRPC.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build index e7936c3195..2eabfcd0c4 100644 --- a/Common/XmlRpcCS/XMLRPC.dll.build +++ b/Common/XmlRpcCS/XMLRPC.dll.build @@ -11,24 +11,24 @@ - - - - - - - - - - - - - + - + + + + + + + + + + + + + diff --git a/OpenGridServices.suo b/OpenGridServices.suo deleted file mode 100644 index 728df77f08d566812024a1ee65b8963805e2bc84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139776 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 yg=Xem#)2SDPtFxArS0y`Q;_9Nb;c?A - - Debug - AnyCPU - 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 3b783ca607..82d4f5fab5 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj @@ -88,13 +88,13 @@ - + Code Code - + Code 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build index db8662d7f8..8e0f53a0b1 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build @@ -11,9 +11,9 @@ - - + + 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 5fe0cf78b4..75ef149790 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj @@ -88,19 +88,19 @@ + + Code + Code - - Code - - - Code - Code - + + Code + + Code 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build index 84d3d56f4b..78f4afe523 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build @@ -11,11 +11,11 @@ - - - - + + + + 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 fa17367954..463cf86c2c 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj @@ -88,10 +88,10 @@ - + Code - + Code 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build index 8c0f8fe878..1be9b43403 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build @@ -11,8 +11,8 @@ - + diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj index 990cd16292..a57220494c 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj @@ -81,9 +81,6 @@ Code - - Code - Code @@ -93,6 +90,9 @@ Code + + Code + Code diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build index c993a8d4ba..e6e0313fc8 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build @@ -12,10 +12,10 @@ - + diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 a281e4faf6..f170f429b2 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj @@ -98,10 +98,10 @@ - + Code - + Code diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 700e32b884..72bfc7482b 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build @@ -11,8 +11,8 @@ - + diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenSim.sln b/OpenSim.sln index 33a72172cd..5b54b056c3 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -41,144 +41,93 @@ 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(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 + 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 EndGlobal diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs new file mode 100644 index 0000000000..27775f12a5 --- /dev/null +++ b/OpenSim/Examples/SimpleApp/MyWorld.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenSim.Framework.Interfaces; +using OpenSim.Framework.Types; +using OpenSim.Framework.Console; +using libsecondlife; + +namespace SimpleApp +{ + public class MyWorld : IWorld + { + private RegionInfo m_regionInfo; + + public MyWorld(RegionInfo regionInfo) + { + m_regionInfo = regionInfo; + } + + private void SendLayerData(IClientAPI remoteClient) + { + float[] map = new float[65536]; + + for (int i = 0; i < 65536; i++) + { + int x = i % 256; + int y = i / 256; + + map[i] = (float)(x + y / 2); + } + + remoteClient.SendLayerData(map); + } + + #region IWorld Members + + void IWorld.AddNewAvatar(IClientAPI client, LLUUID agentID, bool child) + { + LLVector3 pos = new LLVector3(128, 128, 128); + + client.OnRegionHandShakeReply += SendLayerData; + client.OnChatFromViewer += + delegate(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) + { + // Echo it (so you know what you typed) + client.SendChatMessage(message, type, fromPos, fromName, fromAgentID); + client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero ); + }; + + client.OnRequestWearables += SendWearables; + + client.OnCompleteMovementToRegion += delegate() + { + client.MoveAgentIntoRegion(m_regionInfo); + }; + + client.OnCompleteMovementToRegion += delegate() + { + client.SendAvatarData(m_regionInfo, client.FirstName, + client.LastName, client.AgentId, 0, + pos); + + client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero ); + }; + + client.SendRegionHandshake(m_regionInfo); + + } + + private void SendWearables( IClientAPI client ) + { + client.SendWearables( AvatarWearable.DefaultWearables ); + } + + void IWorld.RemoveAvatar(LLUUID agentID) + { + + } + + RegionInfo IWorld.RegionInfo + { + get { return m_regionInfo; } + } + + object IWorld.SyncRoot + { + get { return this; } + } + + private uint m_nextLocalId = 1; + + uint IWorld.NextLocalId + { + get { return m_nextLocalId++; } + } + + #endregion + + + } +} diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs new file mode 100644 index 0000000000..e44bdbaf4a --- /dev/null +++ b/OpenSim/Examples/SimpleApp/Program.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenSim; +using OpenSim.Servers; +using OpenSim.GridInterfaces.Local; +using OpenSim.Framework.Interfaces; +using OpenSim.Framework.Types; +using OpenSim.UserServer; +using OpenSim.Framework.Console; +using OpenSim.world; +using OpenSim.Physics.Manager; +using OpenSim.Assets; +using libsecondlife; + +namespace SimpleApp +{ + class Program : IAssetReceiver, conscmd_callback + { + private ConsoleBase m_console; + + private void Run() + { + m_console = new ConsoleBase(null, "SimpleApp", this, false); + MainConsole.Instance = m_console; + + CheckSumServer checksumServer = new CheckSumServer(12036); + checksumServer.ServerListener(); + + string simAddr = "127.0.0.1"; + int simPort = 9000; + + LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false ); + loginServer.Startup(); + + AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal(); + loginServer.SetSessionHandler(localSessions.AddNewSessionHandler ); + + InventoryCache inventoryCache = new InventoryCache(); + + LocalAssetServer assetServer = new LocalAssetServer(); + assetServer.SetServerInfo("http://127.0.0.1:8003/", ""); + assetServer.SetReceiver(this); + + AssetCache assetCache = new AssetCache(assetServer); + + UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, localSessions ); + PacketServer packetServer = new PacketServer( udpServer, (uint) simPort ); + udpServer.ServerListener(); + + ClientView.TerrainManager = new TerrainManager(new SecondLife()); + + RegionInfo regionInfo = new RegionInfo(); + + udpServer.LocalWorld = new MyWorld( regionInfo ); + + // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo); + // PhysicsScene physicsScene = new NullPhysicsScene(); + // world.PhysicsScene = physicsScene; + // udpServer.LocalWorld = world; + + BaseHttpServer httpServer = new BaseHttpServer( simPort ); + httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod ); + httpServer.Start(); + + m_console.WriteLine( LogPriority.NORMAL, "Press enter to quit."); + m_console.ReadLine(); + } + + private void AddNewSessionHandler(Login loginData) + { + m_console.WriteLine( LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last ); + } + + #region IAssetReceiver Members + + public void AssetReceived( AssetBase asset, bool IsTexture) + { + throw new Exception("The method or operation is not implemented."); + } + + public void AssetNotFound( AssetBase asset) + { + throw new Exception("The method or operation is not implemented."); + } + + #endregion + + #region conscmd_callback Members + + public void RunCmd(string cmd, string[] cmdparams) + { + throw new Exception("The method or operation is not implemented."); + } + + public void Show(string ShowWhat) + { + throw new Exception("The method or operation is not implemented."); + } + + #endregion + + static void Main(string[] args) + { + Program app = new Program(); + + app.Run(); + } + } +} diff --git a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..0f9bf0fc59 --- /dev/null +++ b/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("SimpleApp")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Playahead AB")] +[assembly: AssemblyProduct("SimpleApp")] +[assembly: AssemblyCopyright("Copyright © Playahead AB 2007")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("a5cfa45f-5acf-4b2e-9c50-1dd1fd7608ee")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Examples/SimpleApp/SimpleApp.csproj new file mode 100644 index 0000000000..51e14de3f9 --- /dev/null +++ b/OpenSim/Examples/SimpleApp/SimpleApp.csproj @@ -0,0 +1,86 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {AD062D99-DD53-4D37-A4B8-2AF635377AEB} + Exe + Properties + SimpleApp + SimpleApp + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\..\..\bin\libsecondlife.dll + + + + + + + + + + + + + {A7CD0630-0000-0000-0000-000000000000} + OpenSim.Framework.Console + + + {8ACA2445-0000-0000-0000-000000000000} + OpenSim.Framework + + + {8BB20F0A-0000-0000-0000-000000000000} + OpenSim.Servers + + + {8E81D43C-0000-0000-0000-000000000000} + XMLRPC + + + {546099CD-0000-0000-0000-000000000000} + OpenSim.GridInterfaces.Local + + + {8BE16150-0000-0000-0000-000000000000} + OpenSim.Physics.Manager + + + {632E1BFD-0000-0000-0000-000000000000} + OpenSim.RegionServer + + + {642A14A8-0000-0000-0000-000000000000} + OpenSim.World + + + + + \ No newline at end of file diff --git a/OpenSim/Examples/SimpleApp2/MyClientView.cs b/OpenSim/Examples/SimpleApp2/MyClientView.cs new file mode 100644 index 0000000000..dd8869c733 --- /dev/null +++ b/OpenSim/Examples/SimpleApp2/MyClientView.cs @@ -0,0 +1,69 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenSim; +using libsecondlife; +using OpenSim.Framework.Interfaces; +using System.Net; +using libsecondlife.Packets; +using OpenSim.Assets; +using OpenSim.Framework.Types; +using OpenSim.Framework; + +namespace SimpleApp2 +{ + public class MyClientView : ClientView + { + private float[] m_map; + private Dictionary m_clientAPIs; + + public MyClientView(float[] map, Dictionary clientAPIs, EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions) + : base(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions) + { + m_map = map; + m_clientAPIs = clientAPIs; + + OnRegionHandShakeReply += RegionHandShakeReplyHandler; + OnChatFromViewer += ChatHandler; + OnRequestWearables += RequestWearablesHandler; + OnCompleteMovementToRegion += CompleteMovementToRegionHandler; + } + + private void ChatHandler(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) + { + // Echo it (so you know what you typed) + SendChatMessage(message, type, fromPos, fromName, fromAgentID); + SendChatMessage("Ready.", 1, fromPos, "System", LLUUID.Zero); + } + + private void CompleteMovementToRegionHandler() + { + LLVector3 pos = new LLVector3(128, 128, 128); + + MoveAgentIntoRegion(m_world.RegionInfo); + + SendAvatarData( m_world.RegionInfo, FirstName, + LastName, AgentId, 0, + pos); + + SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero); + + + + // OpenSim.world.Primitive prim = new OpenSim.world.Primitive( m_clientAPIs, m_world.RegionInfo.RegionHandle, m_world, AgentId ); + + // SendNewPrim( prim ); + + } + + private void RegionHandShakeReplyHandler(IClientAPI client) + { + client.SendLayerData(m_map); + } + + private void RequestWearablesHandler(IClientAPI client) + { + SendWearables(AvatarWearable.DefaultWearables); + } + } +} diff --git a/OpenSim/Examples/SimpleApp2/MyPacketServer.cs b/OpenSim/Examples/SimpleApp2/MyPacketServer.cs new file mode 100644 index 0000000000..9c21016e5c --- /dev/null +++ b/OpenSim/Examples/SimpleApp2/MyPacketServer.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenSim; +using OpenSim.Assets; +using System.Net; +using libsecondlife.Packets; +using OpenSim.Framework.Interfaces; +using OpenSim.Framework; + +namespace SimpleApp2 +{ + public class MyPacketServer : PacketServer + { + private float[] m_map; + + public MyPacketServer(float[] map, OpenSimNetworkHandler networkHandler, uint port ) : base( networkHandler, port ) + { + m_map = map; + } + + protected override ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions) + { + // (EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions) + + + return new MyClientView(m_map, ClientAPIs, remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions); + } + } +} diff --git a/OpenSim/Examples/SimpleApp2/Program.cs b/OpenSim/Examples/SimpleApp2/Program.cs new file mode 100644 index 0000000000..9b977f6810 --- /dev/null +++ b/OpenSim/Examples/SimpleApp2/Program.cs @@ -0,0 +1,160 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenSim; +using OpenSim.Servers; +using OpenSim.GridInterfaces.Local; +using OpenSim.Framework.Interfaces; +using OpenSim.Framework.Types; +using OpenSim.UserServer; +using OpenSim.Framework.Console; +using OpenSim.world; +using OpenSim.Physics.Manager; +using OpenSim.Assets; +using libsecondlife; + +namespace SimpleApp2 +{ + class Program : IWorld, IAssetReceiver, conscmd_callback + { + private ConsoleBase m_console; + private RegionInfo m_regionInfo; + private float[] m_map; + + private void Run() + { + m_console = new ConsoleBase(null, "SimpleApp", this, false); + MainConsole.Instance = m_console; + + m_map = CreateMap(); + + CheckSumServer checksumServer = new CheckSumServer(12036); + checksumServer.ServerListener(); + + string simAddr = "127.0.0.1"; + int simPort = 9000; + + LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false); + loginServer.Startup(); + + AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal(); + loginServer.SetSessionHandler(localSessions.AddNewSessionHandler); + + InventoryCache inventoryCache = new InventoryCache(); + + LocalAssetServer assetServer = new LocalAssetServer(); + assetServer.SetServerInfo("http://127.0.0.1:8003/", ""); + assetServer.SetReceiver(this); + + AssetCache assetCache = new AssetCache(assetServer); + + UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, localSessions); + PacketServer packetServer = new MyPacketServer(m_map, udpServer, (uint) simPort ); + udpServer.ServerListener(); + + ClientView.TerrainManager = new TerrainManager(new SecondLife()); + + m_regionInfo = new RegionInfo(); + + udpServer.LocalWorld = this; + + // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo); + // PhysicsScene physicsScene = new NullPhysicsScene(); + // world.PhysicsScene = physicsScene; + // udpServer.LocalWorld = world; + + BaseHttpServer httpServer = new BaseHttpServer(simPort); + httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); + httpServer.Start(); + + m_console.WriteLine(LogPriority.NORMAL, "Press enter to quit."); + m_console.ReadLine(); + } + + private float[] CreateMap() + { + float[] map = new float[65536]; + + for (int i = 0; i < 65536; i++) + { + int x = i % 256; + int y = i / 256; + + map[i] = (float)(x + y / 2); + } + + return map; + } + + private void AddNewSessionHandler(Login loginData) + { + m_console.WriteLine(LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last); + } + + static void Main(string[] args) + { + Program app = new Program(); + + app.Run(); + } + + #region IWorld Members + + void IWorld.AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child) + { + remoteClient.SendRegionHandshake(m_regionInfo); + } + + void IWorld.RemoveAvatar(LLUUID agentID) + { + throw new Exception("The method or operation is not implemented."); + } + + RegionInfo IWorld.RegionInfo + { + get { return m_regionInfo; } + } + + object IWorld.SyncRoot + { + get { return this; } + } + + private uint m_nextLocalId = 1; + + uint IWorld.NextLocalId + { + get { return m_nextLocalId++; } + } + + #endregion + + #region IAssetReceiver Members + + public void AssetReceived(AssetBase asset, bool IsTexture) + { + throw new Exception("The method or operation is not implemented."); + } + + public void AssetNotFound(AssetBase asset) + { + throw new Exception("The method or operation is not implemented."); + } + + #endregion + + #region conscmd_callback Members + + public void RunCmd(string cmd, string[] cmdparams) + { + throw new Exception("The method or operation is not implemented."); + } + + public void Show(string ShowWhat) + { + throw new Exception("The method or operation is not implemented."); + } + + #endregion + } +} diff --git a/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs b/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..f7d6aae3ee --- /dev/null +++ b/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("SimpleApp2")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Playahead AB")] +[assembly: AssemblyProduct("SimpleApp2")] +[assembly: AssemblyCopyright("Copyright © Playahead AB 2007")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("bdda0707-02b4-46ca-87ce-ab3c12558a4a")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj new file mode 100644 index 0000000000..92664e360a --- /dev/null +++ b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj @@ -0,0 +1,87 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {C84B2171-D386-4377-B490-9C5A56674B9E} + Exe + Properties + SimpleApp2 + SimpleApp2 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\..\..\bin\libsecondlife.dll + + + + + + + + + + + + + + {A7CD0630-0000-0000-0000-000000000000} + OpenSim.Framework.Console + + + {8ACA2445-0000-0000-0000-000000000000} + OpenSim.Framework + + + {8BB20F0A-0000-0000-0000-000000000000} + OpenSim.Servers + + + {8E81D43C-0000-0000-0000-000000000000} + XMLRPC + + + {546099CD-0000-0000-0000-000000000000} + OpenSim.GridInterfaces.Local + + + {8BE16150-0000-0000-0000-000000000000} + OpenSim.Physics.Manager + + + {632E1BFD-0000-0000-0000-000000000000} + OpenSim.RegionServer + + + {642A14A8-0000-0000-0000-000000000000} + OpenSim.World + + + + + \ No newline at end of file diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs index 91772f880e..4db7ccbaf4 100644 --- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs +++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs @@ -13,7 +13,13 @@ namespace OpenSim { } - + + public bool AddNewSessionHandler(ulong regionHandle, Login loginData) + { + AddNewSession( loginData ); + return true; + } + public void AddNewSession(Login loginData) { AgentCircuitData agent = new AgentCircuitData(); diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs index 9e0cd48b1c..37e27f813b 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs @@ -153,6 +153,11 @@ namespace OpenSim OutPacket(mov); } + public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) + { + SendChatMessage( Helpers.StringToField( message ), type, fromPos, fromName, fromAgentID); + } + /// /// /// diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs index d970162df3..f9a7fe44a4 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.cs @@ -70,7 +70,7 @@ namespace OpenSim private AgentAssetUpload UploadAssets; private LLUUID newAssetFolder = LLUUID.Zero; private bool debug = false; - private IWorld m_world; + protected IWorld m_world; private Dictionary m_clientThreads; private AssetCache m_assetCache; private IGridServer m_gridServer; @@ -78,11 +78,9 @@ namespace OpenSim private int cachedtextureserial = 0; private RegionInfo m_regionData; protected AuthenticateSessionsBase m_authenticateSessionsHandler; - protected uint serverPort = 0; - public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions, uint port) + public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions ) { - this.serverPort = port; m_world = world; m_clientThreads = clientThreads; m_assetCache = assetCache; diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 2fc651680f..990b5c37e3 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -124,10 +124,7 @@ - - Code - - + Code @@ -136,52 +133,55 @@ Code - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - + Code Code - + + Code + + Code Code - + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + Code Code - + Code diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 c988025b10..8384407bdd 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build @@ -11,26 +11,26 @@ - - + - - - - - - - - - - - + + + - - + + + + + + + + + + + diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs index ab77b5d14c..f1ca88168e 100644 --- a/OpenSim/OpenSim.RegionServer/PacketServer.cs +++ b/OpenSim/OpenSim.RegionServer/PacketServer.cs @@ -66,9 +66,17 @@ namespace OpenSim } + protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions) + { + return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions ); + } + public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass) { - ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass, serverPort); + ClientView newuser = + CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache, + authenticateSessionsClass); + this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser); diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj index 6ffcf9ed5d..bd1a332963 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 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 deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 ac4d564317..c5255db462 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/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index af8285b32b..15ae5bf313 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj @@ -93,6 +93,9 @@ Code + + Code + Code @@ -102,9 +105,6 @@ Code - - Code - diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - 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 72aac2a670..c2fd2bdab4 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build @@ -12,10 +12,10 @@ + - diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs index c251d57d83..4ab576c0eb 100644 --- a/OpenSim/OpenSim.World/Avatar.cs +++ b/OpenSim/OpenSim.World/Avatar.cs @@ -55,21 +55,16 @@ namespace OpenSim.world ControllingClient = theClient; this.firstname = ControllingClient.FirstName; this.lastname = ControllingClient.LastName; - localid = 8880000 + (this.m_world._localNumber++); + localid = this.m_world.NextLocalId; Pos = ControllingClient.StartPos; visualParams = new byte[218]; for (int i = 0; i < 218; i++) { visualParams[i] = 100; } - Wearables = new AvatarWearable[13]; //should be 13 of these - for (int i = 0; i < 13; i++) - { - Wearables[i] = new AvatarWearable(); - } - this.Wearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); - this.Wearables[0].ItemID = LLUUID.Random(); + Wearables = AvatarWearable.DefaultWearables; + this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); Console.WriteLine("avatar point 4"); diff --git a/OpenSim/OpenSim.World/Entity.cs b/OpenSim/OpenSim.World/Entity.cs index b14beed3f3..dd5f9a6646 100644 --- a/OpenSim/OpenSim.World/Entity.cs +++ b/OpenSim/OpenSim.World/Entity.cs @@ -51,7 +51,7 @@ namespace OpenSim.world { try { - lock (this.m_world.LockPhysicsEngine) + lock (this.m_world.SyncRoot) { this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z); diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj index f2fb596ba1..46803d6847 100644 --- a/OpenSim/OpenSim.World/OpenSim.World.csproj +++ b/OpenSim/OpenSim.World/OpenSim.World.csproj @@ -130,58 +130,58 @@ - - Code - - - Code - - - Code - - - Code - - - Code - Code + + Code + Code Code - - Code - - + Code Code + + Code + + + Code + Code + + Code + + + Code + + + Code + Code - - Code - - - Code - Code + + Code + + + Code + Code - + Code diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj.user b/OpenSim/OpenSim.World/OpenSim.World.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/OpenSim/OpenSim.World/OpenSim.World.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/OpenSim/OpenSim.World/OpenSim.World.dll.build b/OpenSim/OpenSim.World/OpenSim.World.dll.build new file mode 100644 index 0000000000..3fa534edd3 --- /dev/null +++ b/OpenSim/OpenSim.World/OpenSim.World.dll.build @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs index 011e39a839..7ef06e2a1e 100644 --- a/OpenSim/OpenSim.World/World.cs +++ b/OpenSim/OpenSim.World/World.cs @@ -23,10 +23,8 @@ namespace OpenSim.world public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI { protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); - public object LockPhysicsEngine = new object(); protected Dictionary Avatars; protected Dictionary Prims; - public uint _localNumber = 0; private PhysicsScene phyScene; private float timeStep = 0.1f; public ILocalStorage localStorage; @@ -59,6 +57,7 @@ namespace OpenSim.world return (this.phyScene); } } + #endregion #region Constructors @@ -155,7 +154,7 @@ namespace OpenSim.world Entities[UUID].addForces(); } - lock (this.LockPhysicsEngine) + lock (this.m_syncRoot) { this.phyScene.Simulate(timeStep); } @@ -203,7 +202,7 @@ namespace OpenSim.world OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving."); localStorage.SaveMap(Terrain.getHeights1D()); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics."); - lock (this.LockPhysicsEngine) + lock (this.m_syncRoot) { phyScene.SetTerrain(Terrain.getHeights1D()); } @@ -297,7 +296,7 @@ namespace OpenSim.world { Terrain.hills(); - lock (this.LockPhysicsEngine) + lock (this.m_syncRoot) { this.phyScene.SetTerrain(Terrain.getHeights1D()); } @@ -328,7 +327,7 @@ namespace OpenSim.world try { this.Terrain.setHeights2D(newMap); - lock (this.LockPhysicsEngine) + lock (this.m_syncRoot) { this.phyScene.SetTerrain(this.Terrain.getHeights1D()); } @@ -483,7 +482,7 @@ namespace OpenSim.world this.estateManager.sendRegionHandshake(remoteClient); PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); - lock (this.LockPhysicsEngine) + lock (this.m_syncRoot) { newAvatar.PhysActor = this.phyScene.AddAvatar(pVec); } @@ -612,5 +611,10 @@ namespace OpenSim.world } #endregion + + public override void SendLayerData(int px, int py, IClientAPI RemoteClient) + { + RemoteClient.SendLayerData( Terrain.getHeights1D() ); + } } } diff --git a/OpenSim/OpenSim.World/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs index 19a8fb5992..92bc6a3cda 100644 --- a/OpenSim/OpenSim.World/WorldBase.cs +++ b/OpenSim/OpenSim.World/WorldBase.cs @@ -15,61 +15,25 @@ using OpenSim.Terrain; namespace OpenSim.world { - public class WorldBase : IWorld + public abstract class WorldBase : IWorld { public Dictionary Entities; protected Dictionary m_clientThreads; protected ulong m_regionHandle; protected string m_regionName; - // protected InventoryCache _inventoryCache; - // protected AssetCache _assetCache; protected RegionInfo m_regInfo; public TerrainEngine Terrain; //TODO: Replace TerrainManager with this. protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine - - #region Properties - /* - public InventoryCache InventoryCache - { - set - { - this._inventoryCache = value; - } - } - - public AssetCache AssetCache - { - set - { - this._assetCache = value; - } - } - */ - #endregion - - #region Constructors - /// - /// - /// - public WorldBase() - { - - } - #endregion - - #region Setup Methods - - #endregion + protected object m_syncRoot = new object(); + private uint m_nextLocalId = 8880000; #region Update Methods /// /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation) /// - public virtual void Update() - { + public abstract void Update(); - } #endregion #region Terrain Methods @@ -77,11 +41,8 @@ namespace OpenSim.world /// /// Loads the World heightmap /// - public virtual void LoadWorldMap() - { - - } - + public abstract void LoadWorldMap(); + /// /// Send the region heightmap to the client /// @@ -97,10 +58,8 @@ namespace OpenSim.world /// Patch coordinate (x) 0..16 /// Patch coordinate (y) 0..16 /// The client to send to - public void SendLayerData(int px, int py, IClientAPI RemoteClient) - { - - } + public abstract void SendLayerData(int px, int py, IClientAPI RemoteClient); + #endregion #region Add/Remove Agent/Avatar @@ -110,39 +69,43 @@ namespace OpenSim.world /// /// /// - public virtual void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child) - { - return ; - } - + public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child); + /// /// /// /// - public virtual void RemoveAvatar(LLUUID agentID) - { - return ; - } - + public abstract void RemoveAvatar(LLUUID agentID); + #endregion /// /// /// /// - public virtual RegionInfo GetRegionInfo() + public virtual RegionInfo RegionInfo { - return null; + get { return null; } + } + + public object SyncRoot + { + get { return m_syncRoot; } + } + + public uint NextLocalId + { + get { return m_nextLocalId++; } } #region Shutdown /// /// Tidy before shutdown /// - public virtual void Close() - { + public abstract void Close(); - } #endregion + + } } diff --git a/OpenSim/OpenSim/OpenSim.csproj.user b/OpenSim/OpenSim/OpenSim.csproj.user deleted file mode 100644 index 66e2cb4e43..0000000000 --- a/OpenSim/OpenSim/OpenSim.csproj.user +++ /dev/null @@ -1,13 +0,0 @@ - - - Debug - AnyCPU - -loginserver -sandbox -accounts - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index df6b4f4426..55efffac57 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj @@ -83,6 +83,9 @@ Code + + Code + Code @@ -92,25 +95,19 @@ Code - - Code - - - Code - - + Code Code - - Code - Code - + + Code + + Code @@ -122,28 +119,40 @@ Code - + Code - + Code Code - + Code Code + + Code + Code - + Code - + + Code + + + Code + + + Code + + Code @@ -152,7 +161,10 @@ Code - + + Code + + Code @@ -164,33 +176,21 @@ Code - - Code - Code - - Code - - - Code - - - Code - - - Code - - - Code - Code Code + + Code + + + Code + Code diff --git a/Prebuild/src/Prebuild.csproj.user b/Prebuild/src/Prebuild.csproj.user deleted file mode 100644 index 082d673bf1..0000000000 --- a/Prebuild/src/Prebuild.csproj.user +++ /dev/null @@ -1,12 +0,0 @@ - - - Debug - AnyCPU - C:\sugilite\bin\ - 8.0.50727 - ProjectFiles - 0 - - - - diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index f2c8cabd40..43f5516127 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build @@ -14,42 +14,42 @@ + - - - - + - + + - - - - - - + + + + + + + + + + - + + - - - - - - + +