From 06387d0344b8fa84b790a9dd910fda8a0a1128bb Mon Sep 17 00:00:00 2001 From: MW Date: Sat, 26 May 2007 14:55:17 +0000 Subject: [PATCH] Goodbye World --- .../OpenSim.Framework.Console.csproj.user | 2 +- .../Interfaces/IClientAPI.cs | 28 +++ .../OpenSim.Framework.csproj.user | 2 +- .../Xml/OpenSim.GenericConfig.Xml.csproj.user | 2 +- .../OpenSim.Servers.csproj.user | 2 +- Common/XmlRpcCS/XMLRPC.csproj.user | 2 +- OpenGridServices.sln | 125 +++++----- ...OpenGrid.Config.GridConfigDb4o.csproj.user | 2 +- .../OpenGrid.Framework.Data.DB4o.csproj.user | 2 +- .../OpenGrid.Framework.Data.MSSQL.csproj.user | 2 +- .../OpenGrid.Framework.Data.MySQL.csproj.user | 2 +- ...OpenGrid.Framework.Data.SQLite.csproj.user | 2 +- .../OpenGrid.Framework.Data.csproj.user | 2 +- .../OpenGrid.Framework.Manager.csproj.user | 2 +- .../OpenGridServices.AssetServer.csproj | 43 ++-- .../OpenGridServices.AssetServer.csproj.user | 2 +- .../OpenGridServices.GridServer.csproj.user | 2 +- .../OpenGridServices.UserServer.csproj.user | 2 +- ...OpenUser.Config.UserConfigDb4o.csproj.user | 2 +- .../ServiceManager/ServiceManager.csproj | 33 ++- .../ServiceManager/ServiceManager.csproj.user | 2 +- OpenSim.sln | 216 +++++++++++------- OpenSim.suo | Bin 331264 -> 331264 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.csproj | 57 +++-- .../OpenSim.RegionServer.csproj.user | 2 +- .../OpenSim.Scripting.EmbeddedJVM.csproj.user | 2 +- ...Storage.LocalStorageBerkeleyDB.csproj.user | 2 +- ...enSim.Storage.LocalStorageDb4o.csproj.user | 2 +- ...Sim.Storage.LocalStorageSQLite.csproj.user | 2 +- .../OpenSim.Terrain.BasicTerrain.csproj.user | 2 +- .../world => OpenSim.World}/Avatar.Client.cs | 0 .../world => OpenSim.World}/Avatar.Update.cs | 0 .../world => OpenSim.World}/Avatar.cs | 0 .../AvatarAnimations.cs | 0 .../world => OpenSim.World}/Entity.cs | 0 OpenSim/OpenSim.World/OpenSim.World.csproj | 195 ++++++++++++++++ .../OpenSim.World/OpenSim.World.csproj.user | 12 + .../world => OpenSim.World}/Primitive.cs | 0 .../world => OpenSim.World}/Primitive2.cs | 0 .../world => OpenSim.World}/SceneObject.cs | 0 .../World.PacketHandlers.cs | 0 .../World.Scripting.cs | 0 .../world => OpenSim.World}/World.cs | 83 +------ .../world => OpenSim.World}/WorldBase.cs | 2 +- .../scripting/IScriptContext.cs | 0 .../scripting/IScriptEntity.cs | 0 .../scripting/IScriptHandler.cs | 0 .../scripting/Script.cs | 0 .../scripting/ScriptFactory.cs | 0 .../scripting/Scripts/FollowRandomAvatar.cs | 0 .../types/Mesh.cs | 0 .../types/Triangle.cs | 0 OpenSim/OpenSim/OpenSim.csproj.user | 2 +- Prebuild/src/Prebuild.csproj.user | 2 +- prebuild.xml | 32 +++ 61 files changed, 560 insertions(+), 328 deletions(-) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/Avatar.Client.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/Avatar.Update.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/Avatar.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/AvatarAnimations.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/Entity.cs (100%) create mode 100644 OpenSim/OpenSim.World/OpenSim.World.csproj create mode 100644 OpenSim/OpenSim.World/OpenSim.World.csproj.user rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/Primitive.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/Primitive2.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/SceneObject.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/World.PacketHandlers.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/World.Scripting.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/World.cs (81%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/WorldBase.cs (95%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/scripting/IScriptContext.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/scripting/IScriptEntity.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/scripting/IScriptHandler.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/scripting/Script.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/scripting/ScriptFactory.cs (100%) rename OpenSim/{OpenSim.RegionServer/world => OpenSim.World}/scripting/Scripts/FollowRandomAvatar.cs (100%) rename OpenSim/{OpenSim.RegionServer => OpenSim.World}/types/Mesh.cs (100%) rename OpenSim/{OpenSim.RegionServer => OpenSim.World}/types/Triangle.cs (100%) diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs index 9f7b619f7e..b6ae2328c5 100644 --- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs +++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs @@ -14,6 +14,17 @@ namespace OpenSim.Framework.Interfaces public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam); public delegate void StartAnim(LLUUID animID, int seq); public delegate void LinkObjects(uint parent, List children); + public delegate void GenericCall(IClientAPI remoteClient); + public delegate void GenericCall2(); + public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary. + public delegate void GenericCall4(Packet packet, IClientAPI remoteClient); + public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); + public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); + public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); + public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); + public delegate void UpdatePrimVector(uint localID, LLVector3 pos, IClientAPI remoteClient); + public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); + public delegate void StatusChange(bool status); public interface IClientAPI { @@ -23,6 +34,23 @@ namespace OpenSim.Framework.Interfaces event SetAppearance OnSetAppearance; event StartAnim OnStartAnim; event LinkObjects OnLinkObjects; + event GenericCall4 OnDeRezObject; + event ModifyTerrain OnModifyTerrain; + event GenericCall OnRegionHandShakeReply; + event GenericCall OnRequestWearables; + event GenericCall2 OnCompleteMovementToRegion; + event GenericCall3 OnAgentUpdate; + event GenericCall OnRequestAvatarsData; + event GenericCall4 OnAddPrim; + event UpdateShape OnUpdatePrimShape; + event ObjectSelect OnObjectSelect; + event UpdatePrimFlags OnUpdatePrimFlags; + event UpdatePrimTexture OnUpdatePrimTexture; + event UpdatePrimVector OnUpdatePrimPosition; + event UpdatePrimRotation OnUpdatePrimRotation; + event UpdatePrimVector OnUpdatePrimScale; + event StatusChange OnChildAgentStatus; + event GenericCall2 OnStopMovement; LLVector3 StartPos { diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Common/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices.sln b/OpenGridServices.sln index bc21256417..641f710e01 100644 --- a/OpenGridServices.sln +++ b/OpenGridServices.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C# Express 2005 +# Visual Studio 2005 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}" @@ -25,61 +25,70 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-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 - {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F3C3AC1-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 + ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000}) + ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) + ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000}) + ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000}) + ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) + ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000}) + ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj index cee7b77fb5..f170f429b2 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,8 +6,7 @@ {0021261B-0000-0000-0000-000000000000} Debug AnyCPU - - + OpenGridServices.AssetServer @@ -16,11 +15,9 @@ IE50 false Exe - - + OpenGridServices.AssetServer - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,43 +55,42 @@ False False 4 - - + - + System.dll False - + System.Data.dll False - + System.Xml.dll False - + OpenSim.Framework.dll False - + OpenSim.Framework.Console.dll False - + OpenSim.Servers.dll False - + ..\..\bin\libsecondlife.dll False - + ..\..\bin\Db4objects.Db4o.dll False - + XMLRPC.dll False @@ -122,4 +115,4 @@ - \ No newline at end of file + diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj index 392f56020d..54d31b2f8d 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.csproj +++ b/OpenGridServices/ServiceManager/ServiceManager.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,8 +6,7 @@ {E141F4EE-0000-0000-0000-000000000000} Debug AnyCPU - - + ServiceManager @@ -16,11 +15,9 @@ IE50 false Exe - - + ServiceManager - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,19 +55,18 @@ False False 4 - - + - + System.dll False - + System.ServiceProcess.dll False - + System.Xml.dll False @@ -82,7 +75,7 @@ - Component + Code @@ -92,4 +85,4 @@ - \ No newline at end of file + diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj.user b/OpenGridServices/ServiceManager/ServiceManager.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim.sln b/OpenSim.sln index 4ad8e635fa..2c63df5d90 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.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" @@ -8,6 +8,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", EndProject 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.World", "OpenSim\OpenSim.World\OpenSim.World.csproj", "{642A14A8-0000-0000-0000-000000000000}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim\OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}" @@ -37,85 +39,135 @@ 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 - {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 - {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 - {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}) + ({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}) + ({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 = ({632E1BFD-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).11 = ({E88EF749-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).12 = ({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}) + ({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 + {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 + {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 + {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 dfcacfefe2cbbf7a21c76ad16f67d344e441e248..2234af6ed7b519a5083d52b97ce18cd39633f45b 100644 GIT binary patch literal 331264 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 delta 15150 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 Kci|+n-0?qG??Lqd diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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 d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 08a9e4c4d1..a6bc5aed52 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,8 +6,7 @@ {632E1BFD-0000-0000-0000-000000000000} Debug AnyCPU - - + OpenSim.RegionServer @@ -16,11 +15,9 @@ IE50 false Library - - + OpenSim.RegionServer - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,28 +55,26 @@ False False 4 - - + - + System.dll False - - + System.Xml.dll False - + ..\..\bin\libsecondlife.dll False - + ..\..\bin\Axiom.MathLib.dll False - + ..\..\bin\Db4objects.Db4o.dll False @@ -92,43 +84,43 @@ OpenSim.Terrain.BasicTerrain {2270B8FE-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework.Console {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.GenericConfig.Xml {E88EF749-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Physics.Manager {8BE16150-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Servers {8BB20F0A-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False XMLRPC {8E81D43C-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False @@ -144,7 +136,9 @@ Code - + + Code + Code @@ -160,6 +154,9 @@ Code + + Code + Code @@ -264,4 +261,4 @@ - \ No newline at end of file + diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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 index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim/OpenSim.World/Avatar.Client.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs rename to OpenSim/OpenSim.World/Avatar.Client.cs diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs rename to OpenSim/OpenSim.World/Avatar.Update.cs diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/Avatar.cs rename to OpenSim/OpenSim.World/Avatar.cs diff --git a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim/OpenSim.World/AvatarAnimations.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs rename to OpenSim/OpenSim.World/AvatarAnimations.cs diff --git a/OpenSim/OpenSim.RegionServer/world/Entity.cs b/OpenSim/OpenSim.World/Entity.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/Entity.cs rename to OpenSim/OpenSim.World/Entity.cs diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj new file mode 100644 index 0000000000..471f14833c --- /dev/null +++ b/OpenSim/OpenSim.World/OpenSim.World.csproj @@ -0,0 +1,195 @@ + + + Local + 8.0.50727 + 2.0 + {642A14A8-0000-0000-0000-000000000000} + Debug + AnyCPU + + + + OpenSim.World + JScript + Grid + IE50 + false + Library + + OpenSim.World + + + + + + 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 + + + ..\..\bin\libsecondlife.dll + False + + + ..\..\bin\Axiom.MathLib.dll + False + + + ..\..\bin\Db4objects.Db4o.dll + False + + + + + OpenSim.Terrain.BasicTerrain + {2270B8FE-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.Framework + {8ACA2445-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.Framework.Console + {A7CD0630-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.GenericConfig.Xml + {E88EF749-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.Physics.Manager + {8BE16150-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.Servers + {8BB20F0A-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + XMLRPC + {8E81D43C-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + + + 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 new file mode 100644 index 0000000000..9bfaf67280 --- /dev/null +++ b/OpenSim/OpenSim.World/OpenSim.World.csproj.user @@ -0,0 +1,12 @@ + + + Debug + AnyCPU + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ + 8.0.50727 + ProjectFiles + 0 + + + + diff --git a/OpenSim/OpenSim.RegionServer/world/Primitive.cs b/OpenSim/OpenSim.World/Primitive.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/Primitive.cs rename to OpenSim/OpenSim.World/Primitive.cs diff --git a/OpenSim/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim/OpenSim.World/Primitive2.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/Primitive2.cs rename to OpenSim/OpenSim.World/Primitive2.cs diff --git a/OpenSim/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim/OpenSim.World/SceneObject.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/SceneObject.cs rename to OpenSim/OpenSim.World/SceneObject.cs diff --git a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim/OpenSim.World/World.PacketHandlers.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs rename to OpenSim/OpenSim.World/World.PacketHandlers.cs diff --git a/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim/OpenSim.World/World.Scripting.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/World.Scripting.cs rename to OpenSim/OpenSim.World/World.Scripting.cs diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.World/World.cs similarity index 81% rename from OpenSim/OpenSim.RegionServer/world/World.cs rename to OpenSim/OpenSim.World/World.cs index ec9bbc9093..d840d10e49 100644 --- a/OpenSim/OpenSim.RegionServer/world/World.cs +++ b/OpenSim/OpenSim.World/World.cs @@ -57,7 +57,7 @@ namespace OpenSim.world /// Dictionary to contain client threads /// Region Handle for this region /// Region Name for this region - public World(Dictionary clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName) + public World(Dictionary clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName) { try { @@ -531,92 +531,13 @@ namespace OpenSim.world public override Avatar AddViewerAgent(ClientView agentClient) { - //register for events - agentClient.OnChatFromViewer += new ChatFromViewer(this.SimChat); - agentClient.OnRezObject += new RezObject(this.RezObject); - agentClient.OnModifyTerrain += new ModifyTerrain(this.ModifyTerrain); - agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData); - agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims); - agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient); - agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects); - agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim); - agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape); - agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim); - agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags); - agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture); - agentClient.OnUpdatePrimPosition += new ClientView.UpdatePrimVector(this.UpdatePrimPosition); - agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation); - agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale); - agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject); - Avatar newAvatar = null; - try - { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); - newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); - newAvatar.SendRegionHandshake(this); - //if (!agentClient.m_child) - //{ - - PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); - lock (this.LockPhysicsEngine) - { - newAvatar.PhysActor = this.phyScene.AddAvatar(pVec); - } - // } - lock (Entities) - { - if (!Entities.ContainsKey(agentClient.AgentID)) - { - this.Entities.Add(agentClient.AgentID, newAvatar); - } - else - { - Entities[agentClient.AgentID] = newAvatar; - } - } - lock (Avatars) - { - if (Avatars.ContainsKey(agentClient.AgentID)) - { - Avatars[agentClient.AgentID] = newAvatar; - } - else - { - this.Avatars.Add(agentClient.AgentID, newAvatar); - } - } - } - catch (Exception e) - { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString()); - } return newAvatar; } public override void RemoveViewerAgent(ClientView agentClient) { - try - { - lock (Entities) - { - Entities.Remove(agentClient.AgentID); - } - lock (Avatars) - { - Avatars.Remove(agentClient.AgentID); - } - if (agentClient.ClientAvatar.PhysActor != null) - { - this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor); - } - } - catch (Exception e) - { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString()); - } + } #endregion diff --git a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs similarity index 95% rename from OpenSim/OpenSim.RegionServer/world/WorldBase.cs rename to OpenSim/OpenSim.World/WorldBase.cs index ea71411f6b..8fe98d3a48 100644 --- a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs +++ b/OpenSim/OpenSim.World/WorldBase.cs @@ -20,7 +20,7 @@ namespace OpenSim.world public class WorldBase { public Dictionary Entities; - protected Dictionary m_clientThreads; + protected Dictionary m_clientThreads; protected ulong m_regionHandle; protected string m_regionName; protected InventoryCache _inventoryCache; diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim/OpenSim.World/scripting/IScriptContext.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs rename to OpenSim/OpenSim.World/scripting/IScriptContext.cs diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim/OpenSim.World/scripting/IScriptEntity.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs rename to OpenSim/OpenSim.World/scripting/IScriptEntity.cs diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim/OpenSim.World/scripting/IScriptHandler.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs rename to OpenSim/OpenSim.World/scripting/IScriptHandler.cs diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim/OpenSim.World/scripting/Script.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/scripting/Script.cs rename to OpenSim/OpenSim.World/scripting/Script.cs diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim/OpenSim.World/scripting/ScriptFactory.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs rename to OpenSim/OpenSim.World/scripting/ScriptFactory.cs diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.World/scripting/Scripts/FollowRandomAvatar.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs rename to OpenSim/OpenSim.World/scripting/Scripts/FollowRandomAvatar.cs diff --git a/OpenSim/OpenSim.RegionServer/types/Mesh.cs b/OpenSim/OpenSim.World/types/Mesh.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/types/Mesh.cs rename to OpenSim/OpenSim.World/types/Mesh.cs diff --git a/OpenSim/OpenSim.RegionServer/types/Triangle.cs b/OpenSim/OpenSim.World/types/Triangle.cs similarity index 100% rename from OpenSim/OpenSim.RegionServer/types/Triangle.cs rename to OpenSim/OpenSim.World/types/Triangle.cs diff --git a/OpenSim/OpenSim/OpenSim.csproj.user b/OpenSim/OpenSim/OpenSim.csproj.user index 1422ebf093..ba0418b936 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/Prebuild/src/Prebuild.csproj.user b/Prebuild/src/Prebuild.csproj.user index d47d65d021..9bfaf67280 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\opensim15-07\bin\ + C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 diff --git a/prebuild.xml b/prebuild.xml index c91f72af9d..9280881a65 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -443,6 +443,38 @@ + + + + + ../../bin/ + + + + + ../../bin/ + + + + ../../bin/ + + + + + + + + + + + + + + + + + +