ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

*Merged EstateManager, EstateSettings, ParcelManager,Parcel, and ParcelData classes

Browse Source 
*Incorporated EstateSettings into the RegionInfo class
*Next step is to load from db, save to db the parcel and estate settings
This commit is contained in:
mingchen
2007-06-08 19:10:55 +00:00
parent 93c36b8865
commit 2239ecba18
77 changed files with 1941 additions and 1315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenSim/OpenSim.RegionServer/ClientView.API.cs
View File

@@ -235,49 +235,6 @@ namespace OpenSim
}
}
/// <summary>
///
/// </summary>
/// <param name="regionInfo"></param>
public void SendRegionHandshake(RegionInfo regionInfo)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
System.Text.Encoding _enc = System.Text.Encoding.ASCII;
RegionHandshakePacket handshake = new RegionHandshakePacket();
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");
handshake.RegionInfo.BillableFactor = 0;
handshake.RegionInfo.IsEstateManager = false;
handshake.RegionInfo.TerrainHeightRange00 = regionInfo.TerrainHeightRange00;
handshake.RegionInfo.TerrainHeightRange01 = regionInfo.TerrainHeightRange01;
handshake.RegionInfo.TerrainHeightRange10 = regionInfo.TerrainHeightRange10;
handshake.RegionInfo.TerrainHeightRange11 = regionInfo.TerrainHeightRange11;
handshake.RegionInfo.TerrainStartHeight00 = regionInfo.TerrainStartHeight00;
handshake.RegionInfo.TerrainStartHeight01 = regionInfo.TerrainStartHeight01;
handshake.RegionInfo.TerrainStartHeight10 = regionInfo.TerrainStartHeight10;
handshake.RegionInfo.TerrainStartHeight11 = regionInfo.TerrainStartHeight11;
handshake.RegionInfo.SimAccess = 13;
handshake.RegionInfo.WaterHeight = regionInfo.RegionWaterHeight;
uint regionFlags = 72458694;
if (regionInfo.RegionTerraform)
{
regionFlags -= 64;
}
handshake.RegionInfo.RegionFlags = regionFlags;
handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.RegionName + "\0");
handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");
handshake.RegionInfo.TerrainBase0 = regionInfo.TerrainBase0;
handshake.RegionInfo.TerrainBase1 = regionInfo.TerrainBase1;
handshake.RegionInfo.TerrainBase2 = regionInfo.TerrainBase2;
handshake.RegionInfo.TerrainBase3 = regionInfo.TerrainBase3;
handshake.RegionInfo.TerrainDetail0 = regionInfo.TerrainDetail0;
handshake.RegionInfo.TerrainDetail1 = regionInfo.TerrainDetail1;
handshake.RegionInfo.TerrainDetail2 = regionInfo.TerrainDetail2;
handshake.RegionInfo.TerrainDetail3 = regionInfo.TerrainDetail3;
handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");
OutPacket(handshake);
}
/// <summary>
///

40
OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
View File

@@ -124,7 +124,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="AgentAssetUpload.cs">
<Compile Include="NetworkServersInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UDPServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AuthenticateSessionsLocal.cs">
@@ -133,10 +136,10 @@
<Compile Include="AuthenticateSessionsRemote.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.API.cs">
<Compile Include="OpenSimNetworkHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.cs">
<Compile Include="UserConfigUtility.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.Grid.cs">
@@ -148,40 +151,37 @@
<Compile Include="ClientView.ProcessPackets.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="VersionInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AgentAssetUpload.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientViewBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CommsManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NetworkServersInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OpenSimNetworkHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="PacketServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionServerBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UDPServer.cs">
<Compile Include="CommsManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UserConfigUtility.cs">
<Compile Include="ClientView.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="VersionInfo.cs">
<Compile Include="PacketServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Assets\AssetCache.cs">
<Compile Include="ClientView.API.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CAPS\AdminWebFront.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Assets\InventoryCache.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CAPS\AdminWebFront.cs">
<Compile Include="Assets\AssetCache.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>

2
OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath>
<ReferencePath>C:\sugilite\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>

47
OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
View File

@@ -11,47 +11,26 @@
<resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="AgentAssetUpload.cs" />
<include name="AuthenticateSessionsBase.cs" />
<include name="NetworkServersInfo.cs" />
<include name="UDPServer.cs" />
<include name="AuthenticateSessionsLocal.cs" />
<include name="AuthenticateSessionsRemote.cs" />
<include name="ClientView.cs" />
<include name="OpenSimNetworkHandler.cs" />
<include name="UserConfigUtility.cs" />
<include name="ClientView.Grid.cs" />
<include name="ClientView.PacketHandlers.cs" />
<include name="ClientView.ProcessPackets.cs" />
<include name="ClientViewBase.cs" />
<include name="Grid.cs" />
<include name="OpenSimMain.cs" />
<include name="OpenSimNetworkHandler.cs" />
<include name="PacketServer.cs" />
<include name="RegionInfo.cs" />
<include name="RegionInfoBase.cs" />
<include name="RegionServerBase.cs" />
<include name="UDPServer.cs" />
<include name="VersionInfo.cs" />
<include name="Assets/AssetCache.cs" />
<include name="Assets/InventoryCache.cs" />
<include name="AgentAssetUpload.cs" />
<include name="ClientViewBase.cs" />
<include name="RegionServerBase.cs" />
<include name="CommsManager.cs" />
<include name="ClientView.cs" />
<include name="PacketServer.cs" />
<include name="ClientView.API.cs" />
<include name="CAPS/AdminWebFront.cs" />
<include name="types/Mesh.cs" />
<include name="types/Triangle.cs" />
<include name="world/Avatar.Client.cs" />
<include name="world/Avatar.cs" />
<include name="world/Avatar.Update.cs" />
<include name="world/AvatarAnimations.cs" />
<include name="world/Entity.cs" />
<include name="world/Primitive.cs" />
<include name="world/Primitive2.cs" />
<include name="world/SceneObject.cs" />
<include name="world/World.cs" />
<include name="world/World.PacketHandlers.cs" />
<include name="world/World.Scripting.cs" />
<include name="world/WorldBase.cs" />
<include name="world/scripting/IScriptContext.cs" />
<include name="world/scripting/IScriptEntity.cs" />
<include name="world/scripting/IScriptHandler.cs" />
<include name="world/scripting/Script.cs" />
<include name="world/scripting/ScriptFactory.cs" />
<include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
<include name="Assets/InventoryCache.cs" />
<include name="Assets/AssetCache.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>