diff options
Diffstat (limited to 'OpenSim/OpenSim.RegionServer')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs | 40 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.cs | 4 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientViewBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | 519 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/RegionInfo.cs | 15 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/RegionInfoBase.cs | 1 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs | 24 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/world/World.cs | 8 |
8 files changed, 353 insertions, 260 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs index 7340bea..a5ab78a 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs | |||
@@ -32,6 +32,7 @@ namespace OpenSim | |||
32 | public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient); | 32 | public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient); |
33 | public delegate void StatusChange(bool status); | 33 | public delegate void StatusChange(bool status); |
34 | 34 | ||
35 | |||
35 | public event ChatFromViewer OnChatFromViewer; | 36 | public event ChatFromViewer OnChatFromViewer; |
36 | public event RezObject OnRezObject; | 37 | public event RezObject OnRezObject; |
37 | public event GenericCall4 OnDeRezObject; | 38 | public event GenericCall4 OnDeRezObject; |
@@ -53,18 +54,21 @@ namespace OpenSim | |||
53 | public event UpdatePrimRotation OnUpdatePrimRotation; | 54 | public event UpdatePrimRotation OnUpdatePrimRotation; |
54 | public event UpdatePrimVector OnUpdatePrimScale; | 55 | public event UpdatePrimVector OnUpdatePrimScale; |
55 | public event StatusChange OnChildAgentStatus; | 56 | public event StatusChange OnChildAgentStatus; |
57 | public event ParcelPropertiesRequest OnParcelPropertiesRequest; | ||
56 | 58 | ||
57 | protected override void ProcessInPacket(Packet Pack) | 59 | protected override void ProcessInPacket(Packet Pack) |
58 | { | 60 | { |
59 | ack_pack(Pack); | 61 | ack_pack(Pack); |
62 | debug = true; | ||
60 | if (debug) | 63 | if (debug) |
61 | { | 64 | { |
62 | if (Pack.Type != PacketType.AgentUpdate) | 65 | if (Pack.Type != PacketType.AgentUpdate) |
63 | { | 66 | { |
64 | Console.WriteLine(Pack.Type.ToString()); | 67 | Console.WriteLine("IN: " + Pack.Type.ToString()); |
65 | } | 68 | } |
66 | } | 69 | } |
67 | 70 | ||
71 | |||
68 | if (this.ProcessPacketMethod(Pack)) | 72 | if (this.ProcessPacketMethod(Pack)) |
69 | { | 73 | { |
70 | //there is a handler registered that handled this packet type | 74 | //there is a handler registered that handled this packet type |
@@ -447,6 +451,13 @@ namespace OpenSim | |||
447 | break; | 451 | break; |
448 | #endregion | 452 | #endregion |
449 | 453 | ||
454 | #region Parcel Packets | ||
455 | case PacketType.ParcelPropertiesRequest: | ||
456 | ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack; | ||
457 | 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); | ||
458 | break; | ||
459 | #endregion | ||
460 | |||
450 | #region unimplemented handlers | 461 | #region unimplemented handlers |
451 | case PacketType.AgentIsNowWearing: | 462 | case PacketType.AgentIsNowWearing: |
452 | // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; | 463 | // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; |
@@ -455,6 +466,33 @@ namespace OpenSim | |||
455 | case PacketType.ObjectScale: | 466 | case PacketType.ObjectScale: |
456 | //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); | 467 | //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); |
457 | break; | 468 | break; |
469 | case PacketType.MoneyBalanceRequest: | ||
470 | //This need to be actually done and not thrown back with fake info | ||
471 | MoneyBalanceRequestPacket incoming = (MoneyBalanceRequestPacket)Pack; | ||
472 | MoneyBalanceReplyPacket outgoing = new MoneyBalanceReplyPacket(); | ||
473 | outgoing.MoneyData.AgentID = incoming.AgentData.AgentID; | ||
474 | outgoing.MoneyData.MoneyBalance = 31337; | ||
475 | outgoing.MoneyData.SquareMetersCommitted = 0; | ||
476 | outgoing.MoneyData.SquareMetersCredit = 100000000; | ||
477 | outgoing.MoneyData.TransactionID = incoming.MoneyData.TransactionID; | ||
478 | outgoing.MoneyData.TransactionSuccess = true; | ||
479 | outgoing.MoneyData.Description = libsecondlife.Helpers.StringToField(""); | ||
480 | this.OutPacket((Packet)outgoing); | ||
481 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sent Temporary Money packet (they have leet monies)"); | ||
482 | |||
483 | break; | ||
484 | |||
485 | case PacketType.EstateCovenantRequest: | ||
486 | //This should be actually done and not thrown back with fake info | ||
487 | EstateCovenantRequestPacket estateCovenantRequest = (EstateCovenantRequestPacket)Pack; | ||
488 | EstateCovenantReplyPacket estateCovenantReply = new EstateCovenantReplyPacket(); | ||
489 | estateCovenantReply.Data.EstateName = libsecondlife.Helpers.StringToField("Leet Estate"); | ||
490 | estateCovenantReply.Data.EstateOwnerID = LLUUID.Zero; | ||
491 | estateCovenantReply.Data.CovenantID = LLUUID.Zero; | ||
492 | estateCovenantReply.Data.CovenantTimestamp = (uint)0; | ||
493 | this.OutPacket((Packet)estateCovenantReply); | ||
494 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sent Temporary Estate packet (they are in leet estate)"); | ||
495 | break; | ||
458 | #endregion | 496 | #endregion |
459 | } | 497 | } |
460 | } | 498 | } |
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs index 295cd7b..51e5fd6 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.cs | |||
@@ -110,7 +110,6 @@ namespace OpenSim | |||
110 | m_child = child; | 110 | m_child = child; |
111 | m_regionData = regionDat; | 111 | m_regionData = regionDat; |
112 | m_authenticateSessionsHandler = authenSessions; | 112 | m_authenticateSessionsHandler = authenSessions; |
113 | |||
114 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request"); | 113 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request"); |
115 | cirpack = initialcirpack; | 114 | cirpack = initialcirpack; |
116 | userEP = remoteEP; | 115 | userEP = remoteEP; |
@@ -135,6 +134,9 @@ namespace OpenSim | |||
135 | 134 | ||
136 | this.RegisterLocalPacketHandlers(); | 135 | this.RegisterLocalPacketHandlers(); |
137 | 136 | ||
137 | |||
138 | m_world.parcelManager.sendParcelOverlay(this); | ||
139 | |||
138 | ClientThread = new Thread(new ThreadStart(AuthUser)); | 140 | ClientThread = new Thread(new ThreadStart(AuthUser)); |
139 | ClientThread.IsBackground = true; | 141 | ClientThread.IsBackground = true; |
140 | ClientThread.Start(); | 142 | ClientThread.Start(); |
diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs index 572dbce..3cba243 100644 --- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs +++ b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs | |||
@@ -46,6 +46,8 @@ namespace OpenSim | |||
46 | // Keep track of when this packet was sent out | 46 | // Keep track of when this packet was sent out |
47 | Pack.TickCount = Environment.TickCount; | 47 | Pack.TickCount = Environment.TickCount; |
48 | 48 | ||
49 | //Console.WriteLine("OUT: " + Pack.Type.ToString()); | ||
50 | |||
49 | if (!Pack.Header.Resent) | 51 | if (!Pack.Header.Resent) |
50 | { | 52 | { |
51 | // Set the sequence number | 53 | // Set the sequence number |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 2848baf..52bd9d8 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -1,258 +1,261 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{58019DB8-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.RegionServer</AssemblyName> | 12 | <AssemblyName>OpenSim.RegionServer</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.RegionServer</RootNamespace> | 19 | <RootNamespace>OpenSim.RegionServer</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>False</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>True</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>../../bin/</OutputPath> | 35 | <OutputPath>..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>True</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>False</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>../../bin/</OutputPath> | 53 | <OutputPath>..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Xml" > | 65 | <Reference Include="System.Xml" > |
66 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | 69 | <Reference Include="libsecondlife.dll" > |
70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="Axiom.MathLib.dll" > | 73 | <Reference Include="Axiom.MathLib.dll" > |
74 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 74 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="Db4objects.Db4o.dll" > | 77 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </Reference> | 80 | </Reference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <ProjectReference Include="../OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj"> | 83 | <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj"> |
84 | <Name>OpenSim.Terrain.BasicTerrain</Name> | 84 | <Name>OpenSim.Terrain.BasicTerrain</Name> |
85 | <Project>{9CBFE2C1-0000-0000-0000-000000000000}</Project> | 85 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> |
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Private>False</Private> | 87 | <Private>False</Private> |
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | <ProjectReference Include="../../Common/OpenSim.Framework/OpenSim.Framework.csproj"> | 89 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
90 | <Name>OpenSim.Framework</Name> | 90 | <Name>OpenSim.Framework</Name> |
91 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> | 91 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Private>False</Private> | 93 | <Private>False</Private> |
94 | </ProjectReference> | 94 | </ProjectReference> |
95 | <ProjectReference Include="../../Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> | 95 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
96 | <Name>OpenSim.Framework.Console</Name> | 96 | <Name>OpenSim.Framework.Console</Name> |
97 | <Project>{16759386-0000-0000-0000-000000000000}</Project> | 97 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
99 | <Private>False</Private> | 99 | <Private>False</Private> |
100 | </ProjectReference> | 100 | </ProjectReference> |
101 | <ProjectReference Include="../../Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj"> | 101 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> |
102 | <Name>OpenSim.GenericConfig.Xml</Name> | 102 | <Name>OpenSim.GenericConfig.Xml</Name> |
103 | <Project>{CAC10AC1-0000-0000-0000-000000000000}</Project> | 103 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> |
104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
105 | <Private>False</Private> | 105 | <Private>False</Private> |
106 | </ProjectReference> | 106 | </ProjectReference> |
107 | <ProjectReference Include="../OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj"> | 107 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> |
108 | <Name>OpenSim.Physics.Manager</Name> | 108 | <Name>OpenSim.Physics.Manager</Name> |
109 | <Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> | 109 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> |
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
111 | <Private>False</Private> | 111 | <Private>False</Private> |
112 | </ProjectReference> | 112 | </ProjectReference> |
113 | <ProjectReference Include="../../Common/OpenSim.Servers/OpenSim.Servers.csproj"> | 113 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> |
114 | <Name>OpenSim.Servers</Name> | 114 | <Name>OpenSim.Servers</Name> |
115 | <Project>{111F9E8F-0000-0000-0000-000000000000}</Project> | 115 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> |
116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
117 | <Private>False</Private> | 117 | <Private>False</Private> |
118 | </ProjectReference> | 118 | </ProjectReference> |
119 | <ProjectReference Include="../../Common/XmlRpcCS/XMLRPC.csproj"> | 119 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> |
120 | <Name>XMLRPC</Name> | 120 | <Name>XMLRPC</Name> |
121 | <Project>{9A8B526E-0000-0000-0000-000000000000}</Project> | 121 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> |
122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
123 | <Private>False</Private> | 123 | <Private>False</Private> |
124 | </ProjectReference> | 124 | </ProjectReference> |
125 | </ItemGroup> | 125 | </ItemGroup> |
126 | <ItemGroup> | 126 | <ItemGroup> |
127 | <Compile Include="AgentAssetUpload.cs"> | 127 | <Compile Include="OpenSimMain.cs"> |
128 | <SubType>Code</SubType> | 128 | <SubType>Code</SubType> |
129 | </Compile> | 129 | </Compile> |
130 | <Compile Include="AuthenticateSessionsBase.cs"> | 130 | <Compile Include="UDPServer.cs"> |
131 | <SubType>Code</SubType> | 131 | <SubType>Code</SubType> |
132 | </Compile> | 132 | </Compile> |
133 | <Compile Include="AuthenticateSessionsLocal.cs"> | 133 | <Compile Include="AuthenticateSessionsLocal.cs"> |
134 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
135 | </Compile> | 135 | </Compile> |
136 | <Compile Include="AuthenticateSessionsRemote.cs"> | 136 | <Compile Include="AuthenticateSessionsRemote.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="ClientView.Grid.cs"> | 139 | <Compile Include="OpenSimNetworkHandler.cs"> |
140 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
141 | </Compile> | 141 | </Compile> |
142 | <Compile Include="ClientView.PacketHandlers.cs"> | 142 | <Compile Include="Grid.cs"> |
143 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
144 | </Compile> | 144 | </Compile> |
145 | <Compile Include="ClientView.ProcessPackets.cs"> | 145 | <Compile Include="ClientView.Grid.cs"> |
146 | <SubType>Code</SubType> | 146 | <SubType>Code</SubType> |
147 | </Compile> | 147 | </Compile> |
148 | <Compile Include="ClientView.cs"> | 148 | <Compile Include="PacketServer.cs"> |
149 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
150 | </Compile> | 150 | </Compile> |
151 | <Compile Include="ClientViewBase.cs"> | 151 | <Compile Include="RegionInfo.cs"> |
152 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
153 | </Compile> | 153 | </Compile> |
154 | <Compile Include="Grid.cs"> | 154 | <Compile Include="ClientView.PacketHandlers.cs"> |
155 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
156 | </Compile> | 156 | </Compile> |
157 | <Compile Include="OpenSimMain.cs"> | 157 | <Compile Include="AuthenticateSessionsBase.cs"> |
158 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
159 | </Compile> | 159 | </Compile> |
160 | <Compile Include="OpenSimNetworkHandler.cs"> | 160 | <Compile Include="VersionInfo.cs"> |
161 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
162 | </Compile> | 162 | </Compile> |
163 | <Compile Include="PacketServer.cs"> | 163 | <Compile Include="AgentAssetUpload.cs"> |
164 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
165 | </Compile> | 165 | </Compile> |
166 | <Compile Include="RegionInfo.cs"> | 166 | <Compile Include="ClientViewBase.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
169 | <Compile Include="RegionInfoBase.cs"> | 169 | <Compile Include="RegionServerBase.cs"> |
170 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
171 | </Compile> | 171 | </Compile> |
172 | <Compile Include="RegionServerBase.cs"> | 172 | <Compile Include="ClientView.cs"> |
173 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
174 | </Compile> | 174 | </Compile> |
175 | <Compile Include="UDPServer.cs"> | 175 | <Compile Include="RegionInfoBase.cs"> |
176 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
177 | </Compile> | 177 | </Compile> |
178 | <Compile Include="VersionInfo.cs"> | 178 | <Compile Include="ClientView.ProcessPackets.cs"> |
179 | <SubType>Code</SubType> | 179 | <SubType>Code</SubType> |
180 | </Compile> | 180 | </Compile> |
181 | <Compile Include="Assets/AssetCache.cs"> | 181 | <Compile Include="CAPS\AdminWebFront.cs"> |
182 | <SubType>Code</SubType> | 182 | <SubType>Code</SubType> |
183 | </Compile> | 183 | </Compile> |
184 | <Compile Include="Assets/InventoryCache.cs"> | 184 | <Compile Include="world\Avatar.Client.cs"> |
185 | <SubType>Code</SubType> | 185 | <SubType>Code</SubType> |
186 | </Compile> | 186 | </Compile> |
187 | <Compile Include="CAPS/AdminWebFront.cs"> | 187 | <Compile Include="world\Entity.cs"> |
188 | <SubType>Code</SubType> | 188 | <SubType>Code</SubType> |
189 | </Compile> | 189 | </Compile> |
190 | <Compile Include="types/Mesh.cs"> | 190 | <Compile Include="world\Avatar.cs"> |
191 | <SubType>Code</SubType> | 191 | <SubType>Code</SubType> |
192 | </Compile> | 192 | </Compile> |
193 | <Compile Include="types/Triangle.cs"> | 193 | <Compile Include="world\World.PacketHandlers.cs"> |
194 | <SubType>Code</SubType> | 194 | <SubType>Code</SubType> |
195 | </Compile> | 195 | </Compile> |
196 | <Compile Include="world/Avatar.Client.cs"> | 196 | <Compile Include="world\Avatar.Update.cs"> |
197 | <SubType>Code</SubType> | 197 | <SubType>Code</SubType> |
198 | </Compile> | 198 | </Compile> |
199 | <Compile Include="world/Avatar.Update.cs"> | 199 | <Compile Include="world\AvatarAnimations.cs"> |
200 | <SubType>Code</SubType> | 200 | <SubType>Code</SubType> |
201 | </Compile> | 201 | </Compile> |
202 | <Compile Include="world/Avatar.cs"> | 202 | <Compile Include="world\WorldBase.cs"> |
203 | <SubType>Code</SubType> | 203 | <SubType>Code</SubType> |
204 | </Compile> | 204 | </Compile> |
205 | <Compile Include="world/AvatarAnimations.cs"> | 205 | <Compile Include="world\SceneObject.cs"> |
206 | <SubType>Code</SubType> | 206 | <SubType>Code</SubType> |
207 | </Compile> | 207 | </Compile> |
208 | <Compile Include="world/Entity.cs"> | 208 | <Compile Include="world\World.cs"> |
209 | <SubType>Code</SubType> | 209 | <SubType>Code</SubType> |
210 | </Compile> | 210 | </Compile> |
211 | <Compile Include="world/Primitive.cs"> | 211 | <Compile Include="world\Primitive.cs"> |
212 | <SubType>Code</SubType> | 212 | <SubType>Code</SubType> |
213 | </Compile> | 213 | </Compile> |
214 | <Compile Include="world/Primitive2.cs"> | 214 | <Compile Include="world\World.Scripting.cs"> |
215 | <SubType>Code</SubType> | 215 | <SubType>Code</SubType> |
216 | </Compile> | 216 | </Compile> |
217 | <Compile Include="world/SceneObject.cs"> | 217 | <Compile Include="world\Primitive2.cs"> |
218 | <SubType>Code</SubType> | 218 | <SubType>Code</SubType> |
219 | </Compile> | 219 | </Compile> |
220 | <Compile Include="world/World.PacketHandlers.cs"> | 220 | <Compile Include="world\ParcelManager.cs"> |
221 | <SubType>Code</SubType> | 221 | <SubType>Code</SubType> |
222 | </Compile> | 222 | </Compile> |
223 | <Compile Include="world/World.Scripting.cs"> | 223 | <Compile Include="world\scripting\IScriptHandler.cs"> |
224 | <SubType>Code</SubType> | 224 | <SubType>Code</SubType> |
225 | </Compile> | 225 | </Compile> |
226 | <Compile Include="world/World.cs"> | 226 | <Compile Include="world\scripting\ScriptFactory.cs"> |
227 | <SubType>Code</SubType> | 227 | <SubType>Code</SubType> |
228 | </Compile> | 228 | </Compile> |
229 | <Compile Include="world/WorldBase.cs"> | 229 | <Compile Include="world\scripting\IScriptContext.cs"> |
230 | <SubType>Code</SubType> | 230 | <SubType>Code</SubType> |
231 | </Compile> | 231 | </Compile> |
232 | <Compile Include="world/scripting/IScriptContext.cs"> | 232 | <Compile Include="world\scripting\Script.cs"> |
233 | <SubType>Code</SubType> | 233 | <SubType>Code</SubType> |
234 | </Compile> | 234 | </Compile> |
235 | <Compile Include="world/scripting/IScriptEntity.cs"> | 235 | <Compile Include="world\scripting\IScriptEntity.cs"> |
236 | <SubType>Code</SubType> | 236 | <SubType>Code</SubType> |
237 | </Compile> | 237 | </Compile> |
238 | <Compile Include="world/scripting/IScriptHandler.cs"> | 238 | <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs"> |
239 | <SubType>Code</SubType> | 239 | <SubType>Code</SubType> |
240 | </Compile> | 240 | </Compile> |
241 | <Compile Include="world/scripting/Script.cs"> | 241 | <Compile Include="Assets\InventoryCache.cs"> |
242 | <SubType>Code</SubType> | 242 | <SubType>Code</SubType> |
243 | </Compile> | 243 | </Compile> |
244 | <Compile Include="world/scripting/ScriptFactory.cs"> | 244 | <Compile Include="Assets\AssetCache.cs"> |
245 | <SubType>Code</SubType> | 245 | <SubType>Code</SubType> |
246 | </Compile> | 246 | </Compile> |
247 | <Compile Include="world/scripting/Scripts/FollowRandomAvatar.cs"> | 247 | <Compile Include="types\Mesh.cs"> |
248 | <SubType>Code</SubType> | 248 | <SubType>Code</SubType> |
249 | </Compile> | 249 | </Compile> |
250 | </ItemGroup> | 250 | <Compile Include="types\Triangle.cs"> |
251 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 251 | <SubType>Code</SubType> |
252 | <PropertyGroup> | 252 | </Compile> |
253 | <PreBuildEvent> | 253 | </ItemGroup> |
254 | </PreBuildEvent> | 254 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
255 | <PostBuildEvent> | 255 | <PropertyGroup> |
256 | </PostBuildEvent> | 256 | <PreBuildEvent> |
257 | </PropertyGroup> | 257 | </PreBuildEvent> |
258 | </Project> | 258 | <PostBuildEvent> |
259 | </PostBuildEvent> | ||
260 | </PropertyGroup> | ||
261 | </Project> | ||
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs index dc9bb1a..d0ce1ce 100644 --- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs +++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs | |||
@@ -26,6 +26,8 @@ namespace OpenSim | |||
26 | public string UserRecvKey = ""; | 26 | public string UserRecvKey = ""; |
27 | private bool isSandbox; | 27 | private bool isSandbox; |
28 | 28 | ||
29 | public string RegionOwnerName = ""; | ||
30 | |||
29 | public string DataStore; | 31 | public string DataStore; |
30 | 32 | ||
31 | public RegionInfo() | 33 | public RegionInfo() |
@@ -222,6 +224,19 @@ namespace OpenSim | |||
222 | } | 224 | } |
223 | 225 | ||
224 | 226 | ||
227 | attri = ""; | ||
228 | attri = configData.GetAttribute("RegionOwnerName"); | ||
229 | if (attri == "") | ||
230 | { | ||
231 | string name = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Region Owner Avatar Name", "Test User"); | ||
232 | this.RegionOwnerName = name; | ||
233 | configData.SetAttribute("RegionOwnerName", this.RegionOwnerName); | ||
234 | } | ||
235 | else | ||
236 | { | ||
237 | this.RegionOwnerName = attri; | ||
238 | } | ||
239 | |||
225 | if (!isSandbox) | 240 | if (!isSandbox) |
226 | { | 241 | { |
227 | //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 | 242 | //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 |
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs index 6e4c110..54557db 100644 --- a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs +++ b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs | |||
@@ -19,6 +19,7 @@ namespace OpenSim | |||
19 | public ulong RegionHandle; | 19 | public ulong RegionHandle; |
20 | public ushort RegionWaterHeight = 20; | 20 | public ushort RegionWaterHeight = 20; |
21 | public bool RegionTerraform = true; | 21 | public bool RegionTerraform = true; |
22 | public LLUUID RegionOwner = new LLUUID(); | ||
22 | 23 | ||
23 | public int IPListenPort; | 24 | public int IPListenPort; |
24 | public string IPListenAddr; | 25 | public string IPListenAddr; |
diff --git a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs index 4f32335..74b8e9d 100644 --- a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs +++ b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs | |||
@@ -292,6 +292,30 @@ namespace OpenSim.world | |||
292 | } | 292 | } |
293 | } | 293 | } |
294 | } | 294 | } |
295 | #region Parcel Packet Handlers | ||
296 | void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, ClientView remote_client) | ||
297 | { | ||
298 | //Get the parcels within the bounds | ||
299 | List<Parcel> temp = new List<Parcel>(); | ||
300 | int x, y; | ||
301 | int inc_x = end_x - start_x; | ||
302 | int inc_y = end_y - start_y; | ||
303 | for(x = 0; x < inc_x; x++) | ||
304 | { | ||
305 | for(y = 0; y < inc_y; y++) | ||
306 | { | ||
307 | Parcel currentParcel = parcelManager.getParcel(start_x + x,start_y + y); | ||
308 | if(!temp.Contains(currentParcel)) | ||
309 | { | ||
310 | temp.Add(currentParcel); | ||
311 | currentParcel.sendParcelProperties(sequence_id,snap_selection,remote_client); | ||
312 | } | ||
313 | } | ||
314 | } | ||
315 | |||
316 | parcelManager.sendParcelOverlay(remote_client); | ||
317 | } | ||
318 | #endregion | ||
295 | 319 | ||
296 | /* | 320 | /* |
297 | public void RequestMapBlock(ClientView simClient, int minX, int minY, int maxX, int maxY) | 321 | public void RequestMapBlock(ClientView simClient, int minX, int minY, int maxX, int maxY) |
diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs index ad1ce30..d2a13ca 100644 --- a/OpenSim/OpenSim.RegionServer/world/World.cs +++ b/OpenSim/OpenSim.RegionServer/world/World.cs | |||
@@ -35,6 +35,7 @@ namespace OpenSim.world | |||
35 | private Dictionary<string, ScriptFactory> m_scripts; | 35 | private Dictionary<string, ScriptFactory> m_scripts; |
36 | private Mutex updateLock; | 36 | private Mutex updateLock; |
37 | public string m_datastore; | 37 | public string m_datastore; |
38 | public ParcelManager parcelManager; | ||
38 | 39 | ||
39 | #region Properties | 40 | #region Properties |
40 | public PhysicsScene PhysScene | 41 | public PhysicsScene PhysScene |
@@ -85,6 +86,8 @@ namespace OpenSim.world | |||
85 | Avatar.LoadAnims(); | 86 | Avatar.LoadAnims(); |
86 | this.SetDefaultScripts(); | 87 | this.SetDefaultScripts(); |
87 | this.LoadScriptEngines(); | 88 | this.LoadScriptEngines(); |
89 | parcelManager = new ParcelManager(this); | ||
90 | |||
88 | } | 91 | } |
89 | catch (Exception e) | 92 | catch (Exception e) |
90 | { | 93 | { |
@@ -564,6 +567,7 @@ namespace OpenSim.world | |||
564 | agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects); | 567 | agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects); |
565 | agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim); | 568 | agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim); |
566 | agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape); | 569 | agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape); |
570 | |||
567 | agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim); | 571 | agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim); |
568 | agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags); | 572 | agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags); |
569 | agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture); | 573 | agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture); |
@@ -571,6 +575,8 @@ namespace OpenSim.world | |||
571 | agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation); | 575 | agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation); |
572 | agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale); | 576 | agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale); |
573 | agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject); | 577 | agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject); |
578 | |||
579 | agentClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(ParcelPropertiesRequest); | ||
574 | Avatar newAvatar = null; | 580 | Avatar newAvatar = null; |
575 | try | 581 | try |
576 | { | 582 | { |
@@ -618,6 +624,8 @@ namespace OpenSim.world | |||
618 | return newAvatar; | 624 | return newAvatar; |
619 | } | 625 | } |
620 | 626 | ||
627 | |||
628 | |||
621 | public override void RemoveViewerAgent(ClientView agentClient) | 629 | public override void RemoveViewerAgent(ClientView agentClient) |
622 | { | 630 | { |
623 | try | 631 | try |