OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added Basic Parcel Support 

*Created Parcel class to handle each parcel 
*Created ParcelManager class to handle the Parcel Object 
*For now, by default it is assigned to a fake avatar key and set for sale to L$0
zircon^2
mingchen 2007-06-03 16:02:08 +00:00
parent 79de35aea2
commit f22e27498e
11 changed files with 751 additions and 697 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

260
Common/OpenSim.Servers/OpenSim.Servers.csproj
View File

@ -1,130 +1,130 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{111F9E8F-0000-0000-0000-000000000000}</ProjectGuid> <ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
<AssemblyKeyContainerName> <AssemblyKeyContainerName>
</AssemblyKeyContainerName> </AssemblyKeyContainerName>
<AssemblyName>OpenSim.Servers</AssemblyName> <AssemblyName>OpenSim.Servers</AssemblyName>
<DefaultClientScript>JScript</DefaultClientScript> <DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema> <DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder></AppDesignerFolder> <AppDesignerFolder></AppDesignerFolder>
<RootNamespace>OpenSim.Servers</RootNamespace> <RootNamespace>OpenSim.Servers</RootNamespace>
<StartupObject></StartupObject> <StartupObject></StartupObject>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress> <BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile></DocumentationFile>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize> <Optimize>False</Optimize>
<OutputPath>../../bin/</OutputPath> <OutputPath>..\..\bin\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn></NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress> <BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile></DocumentationFile>
<DebugSymbols>True</DebugSymbols> <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize> <Optimize>True</Optimize>
<OutputPath>../../bin/</OutputPath> <OutputPath>..\..\bin\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn></NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" > <Reference Include="System" >
<HintPath>System.dll</HintPath> <HintPath>System.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Xml" > <Reference Include="System.Xml" >
<HintPath>System.Xml.dll</HintPath> <HintPath>System.Xml.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="libsecondlife.dll" > <Reference Include="libsecondlife.dll" >
<HintPath>..\..\bin\libsecondlife.dll</HintPath> <HintPath>..\..\bin\libsecondlife.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../OpenSim.Framework/OpenSim.Framework.csproj"> <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{7404933D-0000-0000-0000-000000000000}</Project> <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{16759386-0000-0000-0000-000000000000}</Project> <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../XmlRpcCS/XMLRPC.csproj"> <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
<Name>XMLRPC</Name> <Name>XMLRPC</Name>
<Project>{9A8B526E-0000-0000-0000-000000000000}</Project> <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="BaseHttpServer.cs"> <Compile Include="LoginServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="BaseServer.cs"> <Compile Include="BaseHttpServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="CheckSumServer.cs"> <Compile Include="BaseServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="IRestHandler.cs"> <Compile Include="IRestHandler.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LocalUserProfileManager.cs"> <Compile Include="LocalUserProfileManager.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LoginResponse.cs"> <Compile Include="XmlRpcMethod.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LoginServer.cs"> <Compile Include="LoginResponse.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="UDPServerBase.cs"> <Compile Include="CheckSumServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="XmlRpcMethod.cs"> <Compile Include="UDPServerBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup> <PropertyGroup>
<PreBuildEvent> <PreBuildEvent>
</PreBuildEvent> </PreBuildEvent>
<PostBuildEvent> <PostBuildEvent>
</PostBuildEvent> </PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

281
OpenSim.sln
View File

@ -1,160 +1,121 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageSQLite", "OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj", "{4ADDEFD0-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Scripting.EmbeddedJVM", "OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj", "{5C69901F-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "Common/OpenSim.Framework/OpenSim.Framework.csproj", "{7404933D-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim\OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj", "{16759386-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common/XmlRpcCS/XMLRPC.csproj", "{9A8B526E-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Common/OpenSim.Servers/OpenSim.Servers.csproj", "{111F9E8F-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim\OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj", "{4D4E187D-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml", "Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj", "{E88EF749-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj", "{43258694-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj", "{58019DB8-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim\OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4F874463-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml", "Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj", "{CAC10AC1-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim\OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj", "{38FBC3BB-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim\OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj", "{A86B5F7E-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "Common\OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj", "{B771F391-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Common\OpenSim.Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim/OpenSim/OpenSim.csproj", "{17ED9A0D-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim\OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj", "{6EB57A93-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageSQLite", "OpenSim\OpenSim.Storage\LocalStorageSQLite\OpenSim.Storage.LocalStorageSQLite.csproj", "{6B20B603-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj", "{DA1FDCE5-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Scripting.EmbeddedJVM", "OpenSim\OpenSim.Scripting\EmbeddedJVM\OpenSim.Scripting.EmbeddedJVM.csproj", "{97A82740-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj", "{9CBFE2C1-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{E06C7BD9-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Any CPU = Release|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
({4ADDEFD0-0000-0000-0000-000000000000}).5 = ({7404933D-0000-0000-0000-000000000000}) {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({4ADDEFD0-0000-0000-0000-000000000000}).6 = ({16759386-0000-0000-0000-000000000000}) {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({5C69901F-0000-0000-0000-000000000000}).2 = ({7404933D-0000-0000-0000-000000000000}) {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({7404933D-0000-0000-0000-000000000000}).4 = ({9A8B526E-0000-0000-0000-000000000000}) {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({111F9E8F-0000-0000-0000-000000000000}).2 = ({7404933D-0000-0000-0000-000000000000}) {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({111F9E8F-0000-0000-0000-000000000000}).3 = ({16759386-0000-0000-0000-000000000000}) {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({111F9E8F-0000-0000-0000-000000000000}).5 = ({9A8B526E-0000-0000-0000-000000000000}) {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({4D4E187D-0000-0000-0000-000000000000}).4 = ({7404933D-0000-0000-0000-000000000000}) {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({4D4E187D-0000-0000-0000-000000000000}).5 = ({16759386-0000-0000-0000-000000000000}) {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({43258694-0000-0000-0000-000000000000}).2 = ({DA1FDCE5-0000-0000-0000-000000000000}) {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({58019DB8-0000-0000-0000-000000000000}).5 = ({9CBFE2C1-0000-0000-0000-000000000000}) {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({58019DB8-0000-0000-0000-000000000000}).6 = ({7404933D-0000-0000-0000-000000000000}) {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({58019DB8-0000-0000-0000-000000000000}).7 = ({16759386-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({58019DB8-0000-0000-0000-000000000000}).8 = ({CAC10AC1-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({58019DB8-0000-0000-0000-000000000000}).9 = ({DA1FDCE5-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({58019DB8-0000-0000-0000-000000000000}).10 = ({111F9E8F-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({58019DB8-0000-0000-0000-000000000000}).11 = ({9A8B526E-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({CAC10AC1-0000-0000-0000-000000000000}).2 = ({7404933D-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({38FBC3BB-0000-0000-0000-000000000000}).2 = ({DA1FDCE5-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({A86B5F7E-0000-0000-0000-000000000000}).4 = ({7404933D-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({A86B5F7E-0000-0000-0000-000000000000}).5 = ({16759386-0000-0000-0000-000000000000}) {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({B771F391-0000-0000-0000-000000000000}).3 = ({DA1FDCE5-0000-0000-0000-000000000000}) {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({17ED9A0D-0000-0000-0000-000000000000}).5 = ({9CBFE2C1-0000-0000-0000-000000000000}) {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({17ED9A0D-0000-0000-0000-000000000000}).6 = ({7404933D-0000-0000-0000-000000000000}) {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({17ED9A0D-0000-0000-0000-000000000000}).7 = ({16759386-0000-0000-0000-000000000000}) {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({17ED9A0D-0000-0000-0000-000000000000}).8 = ({DA1FDCE5-0000-0000-0000-000000000000}) {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({17ED9A0D-0000-0000-0000-000000000000}).9 = ({111F9E8F-0000-0000-0000-000000000000}) {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({17ED9A0D-0000-0000-0000-000000000000}).10 = ({58019DB8-0000-0000-0000-000000000000}) {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({17ED9A0D-0000-0000-0000-000000000000}).11 = ({CAC10AC1-0000-0000-0000-000000000000}) {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({17ED9A0D-0000-0000-0000-000000000000}).12 = ({9A8B526E-0000-0000-0000-000000000000}) {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({6EB57A93-0000-0000-0000-000000000000}).3 = ({7404933D-0000-0000-0000-000000000000}) {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({6EB57A93-0000-0000-0000-000000000000}).4 = ({16759386-0000-0000-0000-000000000000}) {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({6EB57A93-0000-0000-0000-000000000000}).5 = ({9A8B526E-0000-0000-0000-000000000000}) {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({DA1FDCE5-0000-0000-0000-000000000000}).3 = ({7404933D-0000-0000-0000-000000000000}) {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({DA1FDCE5-0000-0000-0000-000000000000}).4 = ({16759386-0000-0000-0000-000000000000}) {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({E06C7BD9-0000-0000-0000-000000000000}).6 = ({7404933D-0000-0000-0000-000000000000}) {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({E06C7BD9-0000-0000-0000-000000000000}).7 = ({16759386-0000-0000-0000-000000000000}) {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
EndGlobalSection {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
GlobalSection(ProjectConfigurationPlatforms) = postSolution {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4ADDEFD0-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{4ADDEFD0-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4ADDEFD0-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4ADDEFD0-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C69901F-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{5C69901F-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C69901F-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C69901F-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7404933D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{7404933D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7404933D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7404933D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{16759386-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{16759386-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{16759386-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{16759386-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A8B526E-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{9A8B526E-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A8B526E-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A8B526E-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{111F9E8F-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{111F9E8F-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{111F9E8F-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{111F9E8F-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D4E187D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{4D4E187D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D4E187D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D4E187D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43258694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{43258694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43258694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43258694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58019DB8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{58019DB8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection
{58019DB8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU GlobalSection(SolutionProperties) = preSolution
{58019DB8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU HideSolutionNode = FALSE
{CAC10AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection
{CAC10AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobal
{CAC10AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CAC10AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38FBC3BB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38FBC3BB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{38FBC3BB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38FBC3BB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A86B5F7E-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A86B5F7E-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{A86B5F7E-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A86B5F7E-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B771F391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B771F391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{B771F391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B771F391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17ED9A0D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17ED9A0D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{17ED9A0D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17ED9A0D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6EB57A93-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6EB57A93-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{6EB57A93-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6EB57A93-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA1FDCE5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA1FDCE5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{DA1FDCE5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA1FDCE5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CBFE2C1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CBFE2C1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{9CBFE2C1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CBFE2C1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E06C7BD9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E06C7BD9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{E06C7BD9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E06C7BD9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

40
OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
View File

@ -32,6 +32,7 @@ namespace OpenSim
public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient); public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient);
public delegate void StatusChange(bool status); public delegate void StatusChange(bool status);
public event ChatFromViewer OnChatFromViewer; public event ChatFromViewer OnChatFromViewer;
public event RezObject OnRezObject; public event RezObject OnRezObject;
public event GenericCall4 OnDeRezObject; public event GenericCall4 OnDeRezObject;
@ -53,18 +54,21 @@ namespace OpenSim
public event UpdatePrimRotation OnUpdatePrimRotation; public event UpdatePrimRotation OnUpdatePrimRotation;
public event UpdatePrimVector OnUpdatePrimScale; public event UpdatePrimVector OnUpdatePrimScale;
public event StatusChange OnChildAgentStatus; public event StatusChange OnChildAgentStatus;
public event ParcelPropertiesRequest OnParcelPropertiesRequest;
protected override void ProcessInPacket(Packet Pack) protected override void ProcessInPacket(Packet Pack)
{ {
ack_pack(Pack); ack_pack(Pack);
debug = true;
if (debug) if (debug)
{ {
if (Pack.Type != PacketType.AgentUpdate) if (Pack.Type != PacketType.AgentUpdate)
{ {
Console.WriteLine(Pack.Type.ToString()); Console.WriteLine("IN: " + Pack.Type.ToString());
} }
} }
if (this.ProcessPacketMethod(Pack)) if (this.ProcessPacketMethod(Pack))
{ {
//there is a handler registered that handled this packet type //there is a handler registered that handled this packet type
@ -447,6 +451,13 @@ namespace OpenSim
break; break;
#endregion #endregion
#region Parcel Packets
case PacketType.ParcelPropertiesRequest:
ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North),propertiesRequest.ParcelData.SequenceID,propertiesRequest.ParcelData.SnapSelection, this);
break;
#endregion
#region unimplemented handlers #region unimplemented handlers
case PacketType.AgentIsNowWearing: case PacketType.AgentIsNowWearing:
// AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
@ -455,6 +466,33 @@ namespace OpenSim
case PacketType.ObjectScale: case PacketType.ObjectScale:
//OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
break; break;
case PacketType.MoneyBalanceRequest:
//This need to be actually done and not thrown back with fake info
MoneyBalanceRequestPacket incoming = (MoneyBalanceRequestPacket)Pack;
MoneyBalanceReplyPacket outgoing = new MoneyBalanceReplyPacket();
outgoing.MoneyData.AgentID = incoming.AgentData.AgentID;
outgoing.MoneyData.MoneyBalance = 31337;
outgoing.MoneyData.SquareMetersCommitted = 0;
outgoing.MoneyData.SquareMetersCredit = 100000000;
outgoing.MoneyData.TransactionID = incoming.MoneyData.TransactionID;
outgoing.MoneyData.TransactionSuccess = true;
outgoing.MoneyData.Description = libsecondlife.Helpers.StringToField("");
this.OutPacket((Packet)outgoing);
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sent Temporary Money packet (they have leet monies)");
break;
case PacketType.EstateCovenantRequest:
//This should be actually done and not thrown back with fake info
EstateCovenantRequestPacket estateCovenantRequest = (EstateCovenantRequestPacket)Pack;
EstateCovenantReplyPacket estateCovenantReply = new EstateCovenantReplyPacket();
estateCovenantReply.Data.EstateName = libsecondlife.Helpers.StringToField("Leet Estate");
estateCovenantReply.Data.EstateOwnerID = LLUUID.Zero;
estateCovenantReply.Data.CovenantID = LLUUID.Zero;
estateCovenantReply.Data.CovenantTimestamp = (uint)0;
this.OutPacket((Packet)estateCovenantReply);
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sent Temporary Estate packet (they are in leet estate)");
break;
#endregion #endregion
} }
} }

4
OpenSim/OpenSim.RegionServer/ClientView.cs
View File

@ -110,7 +110,6 @@ namespace OpenSim
m_child = child; m_child = child;
m_regionData = regionDat; m_regionData = regionDat;
m_authenticateSessionsHandler = authenSessions; m_authenticateSessionsHandler = authenSessions;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
cirpack = initialcirpack; cirpack = initialcirpack;
userEP = remoteEP; userEP = remoteEP;
@ -135,6 +134,9 @@ namespace OpenSim
this.RegisterLocalPacketHandlers(); this.RegisterLocalPacketHandlers();
m_world.parcelManager.sendParcelOverlay(this);
ClientThread = new Thread(new ThreadStart(AuthUser)); ClientThread = new Thread(new ThreadStart(AuthUser));
ClientThread.IsBackground = true; ClientThread.IsBackground = true;
ClientThread.Start(); ClientThread.Start();

2
OpenSim/OpenSim.RegionServer/ClientViewBase.cs
View File

@ -46,6 +46,8 @@ namespace OpenSim
// Keep track of when this packet was sent out // Keep track of when this packet was sent out
Pack.TickCount = Environment.TickCount; Pack.TickCount = Environment.TickCount;
//Console.WriteLine("OUT: " + Pack.Type.ToString());
if (!Pack.Header.Resent) if (!Pack.Header.Resent)
{ {
// Set the sequence number // Set the sequence number

519
OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
View File

@ -1,258 +1,261 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{58019DB8-0000-0000-0000-000000000000}</ProjectGuid> <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
<AssemblyKeyContainerName> <AssemblyKeyContainerName>
</AssemblyKeyContainerName> </AssemblyKeyContainerName>
<AssemblyName>OpenSim.RegionServer</AssemblyName> <AssemblyName>OpenSim.RegionServer</AssemblyName>
<DefaultClientScript>JScript</DefaultClientScript> <DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema> <DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder></AppDesignerFolder> <AppDesignerFolder></AppDesignerFolder>
<RootNamespace>OpenSim.RegionServer</RootNamespace> <RootNamespace>OpenSim.RegionServer</RootNamespace>
<StartupObject></StartupObject> <StartupObject></StartupObject>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress> <BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile></DocumentationFile>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize> <Optimize>False</Optimize>
<OutputPath>../../bin/</OutputPath> <OutputPath>..\..\bin\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn></NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress> <BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile></DocumentationFile>
<DebugSymbols>True</DebugSymbols> <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize> <Optimize>True</Optimize>
<OutputPath>../../bin/</OutputPath> <OutputPath>..\..\bin\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn></NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" > <Reference Include="System" >
<HintPath>System.dll</HintPath> <HintPath>System.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Xml" > <Reference Include="System.Xml" >
<HintPath>System.Xml.dll</HintPath> <HintPath>System.Xml.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="libsecondlife.dll" > <Reference Include="libsecondlife.dll" >
<HintPath>..\..\bin\libsecondlife.dll</HintPath> <HintPath>..\..\bin\libsecondlife.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Axiom.MathLib.dll" > <Reference Include="Axiom.MathLib.dll" >
<HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Db4objects.Db4o.dll" > <Reference Include="Db4objects.Db4o.dll" >
<HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj"> <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
<Name>OpenSim.Terrain.BasicTerrain</Name> <Name>OpenSim.Terrain.BasicTerrain</Name>
<Project>{9CBFE2C1-0000-0000-0000-000000000000}</Project> <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/OpenSim.Framework/OpenSim.Framework.csproj"> <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{7404933D-0000-0000-0000-000000000000}</Project> <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{16759386-0000-0000-0000-000000000000}</Project> <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj"> <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
<Name>OpenSim.GenericConfig.Xml</Name> <Name>OpenSim.GenericConfig.Xml</Name>
<Project>{CAC10AC1-0000-0000-0000-000000000000}</Project> <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/OpenSim.Servers/OpenSim.Servers.csproj"> <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
<Name>OpenSim.Servers</Name> <Name>OpenSim.Servers</Name>
<Project>{111F9E8F-0000-0000-0000-000000000000}</Project> <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/XmlRpcCS/XMLRPC.csproj"> <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
<Name>XMLRPC</Name> <Name>XMLRPC</Name>
<Project>{9A8B526E-0000-0000-0000-000000000000}</Project> <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AgentAssetUpload.cs"> <Compile Include="OpenSimMain.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="AuthenticateSessionsBase.cs"> <Compile Include="UDPServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="AuthenticateSessionsLocal.cs"> <Compile Include="AuthenticateSessionsLocal.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="AuthenticateSessionsRemote.cs"> <Compile Include="AuthenticateSessionsRemote.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientView.Grid.cs"> <Compile Include="OpenSimNetworkHandler.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientView.PacketHandlers.cs"> <Compile Include="Grid.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientView.ProcessPackets.cs"> <Compile Include="ClientView.Grid.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientView.cs"> <Compile Include="PacketServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientViewBase.cs"> <Compile Include="RegionInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Grid.cs"> <Compile Include="ClientView.PacketHandlers.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="OpenSimMain.cs"> <Compile Include="AuthenticateSessionsBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="OpenSimNetworkHandler.cs"> <Compile Include="VersionInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="PacketServer.cs"> <Compile Include="AgentAssetUpload.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="RegionInfo.cs"> <Compile Include="ClientViewBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="RegionInfoBase.cs"> <Compile Include="RegionServerBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="RegionServerBase.cs"> <Compile Include="ClientView.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="UDPServer.cs"> <Compile Include="RegionInfoBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="VersionInfo.cs"> <Compile Include="ClientView.ProcessPackets.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Assets/AssetCache.cs"> <Compile Include="CAPS\AdminWebFront.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Assets/InventoryCache.cs"> <Compile Include="world\Avatar.Client.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="CAPS/AdminWebFront.cs"> <Compile Include="world\Entity.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="types/Mesh.cs"> <Compile Include="world\Avatar.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="types/Triangle.cs"> <Compile Include="world\World.PacketHandlers.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/Avatar.Client.cs"> <Compile Include="world\Avatar.Update.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/Avatar.Update.cs"> <Compile Include="world\AvatarAnimations.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/Avatar.cs"> <Compile Include="world\WorldBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/AvatarAnimations.cs"> <Compile Include="world\SceneObject.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/Entity.cs"> <Compile Include="world\World.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/Primitive.cs"> <Compile Include="world\Primitive.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/Primitive2.cs"> <Compile Include="world\World.Scripting.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/SceneObject.cs"> <Compile Include="world\Primitive2.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/World.PacketHandlers.cs"> <Compile Include="world\ParcelManager.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/World.Scripting.cs"> <Compile Include="world\scripting\IScriptHandler.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/World.cs"> <Compile Include="world\scripting\ScriptFactory.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/WorldBase.cs"> <Compile Include="world\scripting\IScriptContext.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/scripting/IScriptContext.cs"> <Compile Include="world\scripting\Script.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/scripting/IScriptEntity.cs"> <Compile Include="world\scripting\IScriptEntity.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/scripting/IScriptHandler.cs"> <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/scripting/Script.cs"> <Compile Include="Assets\InventoryCache.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/scripting/ScriptFactory.cs"> <Compile Include="Assets\AssetCache.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world/scripting/Scripts/FollowRandomAvatar.cs"> <Compile Include="types\Mesh.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
</ItemGroup> <Compile Include="types\Triangle.cs">
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <SubType>Code</SubType>
<PropertyGroup> </Compile>
<PreBuildEvent> </ItemGroup>
</PreBuildEvent> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PostBuildEvent> <PropertyGroup>
</PostBuildEvent> <PreBuildEvent>
</PropertyGroup> </PreBuildEvent>
</Project> <PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>

15
OpenSim/OpenSim.RegionServer/RegionInfo.cs
View File

@ -26,6 +26,8 @@ namespace OpenSim
public string UserRecvKey = ""; public string UserRecvKey = "";
private bool isSandbox; private bool isSandbox;
public string RegionOwnerName = "";
public string DataStore; public string DataStore;
public RegionInfo() public RegionInfo()
@ -222,6 +224,19 @@ namespace OpenSim
} }
attri = "";
attri = configData.GetAttribute("RegionOwnerName");
if (attri == "")
{
string name = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Region Owner Avatar Name", "Test User");
this.RegionOwnerName = name;
configData.SetAttribute("RegionOwnerName", this.RegionOwnerName);
}
else
{
this.RegionOwnerName = attri;
}
if (!isSandbox) if (!isSandbox)
{ {
//shouldn't be reading this data in here, it should be up to the classes implementing the server interfaces to read what they need from the config object //shouldn't be reading this data in here, it should be up to the classes implementing the server interfaces to read what they need from the config object

1
OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
View File

@ -19,6 +19,7 @@ namespace OpenSim
public ulong RegionHandle; public ulong RegionHandle;
public ushort RegionWaterHeight = 20; public ushort RegionWaterHeight = 20;
public bool RegionTerraform = true; public bool RegionTerraform = true;
public LLUUID RegionOwner = new LLUUID();
public int IPListenPort; public int IPListenPort;
public string IPListenAddr; public string IPListenAddr;

24
OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
View File

@ -292,6 +292,30 @@ namespace OpenSim.world
} }
} }
} }
#region Parcel Packet Handlers
void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, ClientView remote_client)
{
//Get the parcels within the bounds
List<Parcel> temp = new List<Parcel>();
int x, y;
int inc_x = end_x - start_x;
int inc_y = end_y - start_y;
for(x = 0; x < inc_x; x++)
{
for(y = 0; y < inc_y; y++)
{
Parcel currentParcel = parcelManager.getParcel(start_x + x,start_y + y);
if(!temp.Contains(currentParcel))
{
temp.Add(currentParcel);
currentParcel.sendParcelProperties(sequence_id,snap_selection,remote_client);
}
}
}
parcelManager.sendParcelOverlay(remote_client);
}
#endregion
/* /*
public void RequestMapBlock(ClientView simClient, int minX, int minY, int maxX, int maxY) public void RequestMapBlock(ClientView simClient, int minX, int minY, int maxX, int maxY)

8
OpenSim/OpenSim.RegionServer/world/World.cs
View File

@ -35,6 +35,7 @@ namespace OpenSim.world
private Dictionary<string, ScriptFactory> m_scripts; private Dictionary<string, ScriptFactory> m_scripts;
private Mutex updateLock; private Mutex updateLock;
public string m_datastore; public string m_datastore;
public ParcelManager parcelManager;
#region Properties #region Properties
public PhysicsScene PhysScene public PhysicsScene PhysScene
@ -85,6 +86,8 @@ namespace OpenSim.world
Avatar.LoadAnims(); Avatar.LoadAnims();
this.SetDefaultScripts(); this.SetDefaultScripts();
this.LoadScriptEngines(); this.LoadScriptEngines();
parcelManager = new ParcelManager(this);
} }
catch (Exception e) catch (Exception e)
{ {
@ -564,6 +567,7 @@ namespace OpenSim.world
agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects); agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects);
agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim); agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim);
agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape); agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape);
agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim); agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim);
agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags); agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags);
agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture); agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture);
@ -571,6 +575,8 @@ namespace OpenSim.world
agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation); agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation);
agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale); agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);
agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject); agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);
agentClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(ParcelPropertiesRequest);
Avatar newAvatar = null; Avatar newAvatar = null;
try try
{ {
@ -618,6 +624,8 @@ namespace OpenSim.world
return newAvatar; return newAvatar;
} }
public override void RemoveViewerAgent(ClientView agentClient) public override void RemoveViewerAgent(ClientView agentClient)
{ {
try try

294
OpenSim/OpenSim/OpenSim.csproj
View File

@ -1,147 +1,147 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{17ED9A0D-0000-0000-0000-000000000000}</ProjectGuid> <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
<AssemblyKeyContainerName> <AssemblyKeyContainerName>
</AssemblyKeyContainerName> </AssemblyKeyContainerName>
<AssemblyName>OpenSim</AssemblyName> <AssemblyName>OpenSim</AssemblyName>
<DefaultClientScript>JScript</DefaultClientScript> <DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema> <DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<AppDesignerFolder></AppDesignerFolder> <AppDesignerFolder></AppDesignerFolder>
<RootNamespace>OpenSim</RootNamespace> <RootNamespace>OpenSim</RootNamespace>
<StartupObject></StartupObject> <StartupObject></StartupObject>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress> <BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile></DocumentationFile>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize> <Optimize>False</Optimize>
<OutputPath>../../bin/</OutputPath> <OutputPath>..\..\bin\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn></NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress> <BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile></DocumentationFile>
<DebugSymbols>True</DebugSymbols> <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize> <Optimize>True</Optimize>
<OutputPath>../../bin/</OutputPath> <OutputPath>..\..\bin\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn></NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" > <Reference Include="System" >
<HintPath>System.dll</HintPath> <HintPath>System.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Xml" > <Reference Include="System.Xml" >
<HintPath>System.Xml.dll</HintPath> <HintPath>System.Xml.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="libsecondlife.dll" > <Reference Include="libsecondlife.dll" >
<HintPath>..\..\bin\libsecondlife.dll</HintPath> <HintPath>..\..\bin\libsecondlife.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Axiom.MathLib.dll" > <Reference Include="Axiom.MathLib.dll" >
<HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Db4objects.Db4o.dll" > <Reference Include="Db4objects.Db4o.dll" >
<HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj"> <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
<Name>OpenSim.Terrain.BasicTerrain</Name> <Name>OpenSim.Terrain.BasicTerrain</Name>
<Project>{9CBFE2C1-0000-0000-0000-000000000000}</Project> <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/OpenSim.Framework/OpenSim.Framework.csproj"> <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{7404933D-0000-0000-0000-000000000000}</Project> <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{16759386-0000-0000-0000-000000000000}</Project> <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/OpenSim.Servers/OpenSim.Servers.csproj"> <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
<Name>OpenSim.Servers</Name> <Name>OpenSim.Servers</Name>
<Project>{111F9E8F-0000-0000-0000-000000000000}</Project> <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../OpenSim.RegionServer/OpenSim.RegionServer.csproj"> <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
<Name>OpenSim.RegionServer</Name> <Name>OpenSim.RegionServer</Name>
<Project>{58019DB8-0000-0000-0000-000000000000}</Project> <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj"> <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
<Name>OpenSim.GenericConfig.Xml</Name> <Name>OpenSim.GenericConfig.Xml</Name>
<Project>{CAC10AC1-0000-0000-0000-000000000000}</Project> <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="../../Common/XmlRpcCS/XMLRPC.csproj"> <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
<Name>XMLRPC</Name> <Name>XMLRPC</Name>
<Project>{9A8B526E-0000-0000-0000-000000000000}</Project> <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Application.cs"> <Compile Include="OpenSimMain.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="OpenSimMain.cs"> <Compile Include="Application.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup> <PropertyGroup>
<PreBuildEvent> <PreBuildEvent>
</PreBuildEvent> </PreBuildEvent>
<PostBuildEvent> <PostBuildEvent>
</PostBuildEvent> </PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>