aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer
diff options
context:
space:
mode:
authormingchen2007-06-07 16:29:10 +0000
committermingchen2007-06-07 16:29:10 +0000
commit458c6b6f1687a63c7b443a8e76ee31da75c99247 (patch)
treea96d8c96f7da66344f83fbdc2c15c3e421230e34 /OpenSim/OpenSim.RegionServer
parentFixed SVN: All Done! Sorry for the delay (3 / 3) (diff)
downloadopensim-SC_OLD-458c6b6f1687a63c7b443a8e76ee31da75c99247.zip
opensim-SC_OLD-458c6b6f1687a63c7b443a8e76ee31da75c99247.tar.gz
opensim-SC_OLD-458c6b6f1687a63c7b443a8e76ee31da75c99247.tar.bz2
opensim-SC_OLD-458c6b6f1687a63c7b443a8e76ee31da75c99247.tar.xz
*Added EstateSettings.cs and moved many relevant variables from RegionInfoBase to EstateSettings class and added an EstateSettings objection to RegionInfoBase
*Added a few missed copyright headers *Fixed a filename typo
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj32
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build12
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionInfo.cs12
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionInfoBase.cs33
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs34
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs3
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/World.cs6
9 files changed, 57 insertions, 85 deletions
diff --git a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
index 7ddfcd2..5dab080 100644
--- a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
@@ -2,8 +2,13 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5using OpenSim.Framework.Types;
6
5namespace OpenSim.RegionServer.Estate 7namespace OpenSim.RegionServer.Estate
6{ 8{
9 /// <summary>
10 /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
11 /// </summary>
7 public class EstateManager 12 public class EstateManager
8 { 13 {
9 14
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index aa7ce5d..4f16f2c 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -142,15 +142,9 @@
142 <Compile Include="Grid.cs"> 142 <Compile Include="Grid.cs">
143 <SubType>Code</SubType> 143 <SubType>Code</SubType>
144 </Compile> 144 </Compile>
145 <Compile Include="RegionInfoBase.cs">
146 <SubType>Code</SubType>
147 </Compile>
148 <Compile Include="PacketServer.cs"> 145 <Compile Include="PacketServer.cs">
149 <SubType>Code</SubType> 146 <SubType>Code</SubType>
150 </Compile> 147 </Compile>
151 <Compile Include="RegionInfo.cs">
152 <SubType>Code</SubType>
153 </Compile>
154 <Compile Include="AuthenticateSessionsBase.cs"> 148 <Compile Include="AuthenticateSessionsBase.cs">
155 <SubType>Code</SubType> 149 <SubType>Code</SubType>
156 </Compile> 150 </Compile>
@@ -163,13 +157,16 @@
163 <Compile Include="RegionServerBase.cs"> 157 <Compile Include="RegionServerBase.cs">
164 <SubType>Code</SubType> 158 <SubType>Code</SubType>
165 </Compile> 159 </Compile>
166 <Compile Include="Simulator\Avatar.Client.cs"> 160 <Compile Include="RegionInfoBase.cs">
167 <SubType>Code</SubType> 161 <SubType>Code</SubType>
168 </Compile> 162 </Compile>
169 <Compile Include="Simulator\Entity.cs"> 163 <Compile Include="RegionInfo.cs">
170 <SubType>Code</SubType> 164 <SubType>Code</SubType>
171 </Compile> 165 </Compile>
172 <Compile Include="Simulator\Avatar.cs"> 166 <Compile Include="Simulator\Avatar.Client.cs">
167 <SubType>Code</SubType>
168 </Compile>
169 <Compile Include="Simulator\Entity.cs">
173 <SubType>Code</SubType> 170 <SubType>Code</SubType>
174 </Compile> 171 </Compile>
175 <Compile Include="Simulator\World.PacketHandlers.cs"> 172 <Compile Include="Simulator\World.PacketHandlers.cs">
@@ -181,25 +178,28 @@
181 <Compile Include="Simulator\AvatarAnimations.cs"> 178 <Compile Include="Simulator\AvatarAnimations.cs">
182 <SubType>Code</SubType> 179 <SubType>Code</SubType>
183 </Compile> 180 </Compile>
184 <Compile Include="Simulator\ParcelManager.cs"> 181 <Compile Include="Simulator\WorldBase.cs">
185 <SubType>Code</SubType> 182 <SubType>Code</SubType>
186 </Compile> 183 </Compile>
187 <Compile Include="Simulator\WorldBase.cs"> 184 <Compile Include="Simulator\Primitive.cs">
188 <SubType>Code</SubType> 185 <SubType>Code</SubType>
189 </Compile> 186 </Compile>
190 <Compile Include="Simulator\SceneObject.cs"> 187 <Compile Include="Simulator\World.Scripting.cs">
191 <SubType>Code</SubType> 188 <SubType>Code</SubType>
192 </Compile> 189 </Compile>
193 <Compile Include="Simulator\World.cs"> 190 <Compile Include="Simulator\Primitive2.cs">
194 <SubType>Code</SubType> 191 <SubType>Code</SubType>
195 </Compile> 192 </Compile>
196 <Compile Include="Simulator\Primitive.cs"> 193 <Compile Include="Simulator\Avatar.cs">
197 <SubType>Code</SubType> 194 <SubType>Code</SubType>
198 </Compile> 195 </Compile>
199 <Compile Include="Simulator\World.Scripting.cs"> 196 <Compile Include="Simulator\World.cs">
200 <SubType>Code</SubType> 197 <SubType>Code</SubType>
201 </Compile> 198 </Compile>
202 <Compile Include="Simulator\Primitive2.cs"> 199 <Compile Include="Simulator\SceneObject.cs">
200 <SubType>Code</SubType>
201 </Compile>
202 <Compile Include="Simulator\ParcelManager.cs">
203 <SubType>Code</SubType> 203 <SubType>Code</SubType>
204 </Compile> 204 </Compile>
205 <Compile Include="Estate\EstateManager.cs"> 205 <Compile Include="Estate\EstateManager.cs">
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 204796e..702c90c 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -17,26 +17,26 @@
17 <include name="AuthenticateSessionsRemote.cs" /> 17 <include name="AuthenticateSessionsRemote.cs" />
18 <include name="OpenSimNetworkHandler.cs" /> 18 <include name="OpenSimNetworkHandler.cs" />
19 <include name="Grid.cs" /> 19 <include name="Grid.cs" />
20 <include name="RegionInfoBase.cs" />
21 <include name="PacketServer.cs" /> 20 <include name="PacketServer.cs" />
22 <include name="RegionInfo.cs" />
23 <include name="AuthenticateSessionsBase.cs" /> 21 <include name="AuthenticateSessionsBase.cs" />
24 <include name="VersionInfo.cs" /> 22 <include name="VersionInfo.cs" />
25 <include name="AgentAssetUpload.cs" /> 23 <include name="AgentAssetUpload.cs" />
26 <include name="RegionServerBase.cs" /> 24 <include name="RegionServerBase.cs" />
25 <include name="RegionInfoBase.cs" />
26 <include name="RegionInfo.cs" />
27 <include name="Simulator/Avatar.Client.cs" /> 27 <include name="Simulator/Avatar.Client.cs" />
28 <include name="Simulator/Entity.cs" /> 28 <include name="Simulator/Entity.cs" />
29 <include name="Simulator/Avatar.cs" />
30 <include name="Simulator/World.PacketHandlers.cs" /> 29 <include name="Simulator/World.PacketHandlers.cs" />
31 <include name="Simulator/Avatar.Update.cs" /> 30 <include name="Simulator/Avatar.Update.cs" />
32 <include name="Simulator/AvatarAnimations.cs" /> 31 <include name="Simulator/AvatarAnimations.cs" />
33 <include name="Simulator/ParcelManager.cs" />
34 <include name="Simulator/WorldBase.cs" /> 32 <include name="Simulator/WorldBase.cs" />
35 <include name="Simulator/SceneObject.cs" />
36 <include name="Simulator/World.cs" />
37 <include name="Simulator/Primitive.cs" /> 33 <include name="Simulator/Primitive.cs" />
38 <include name="Simulator/World.Scripting.cs" /> 34 <include name="Simulator/World.Scripting.cs" />
39 <include name="Simulator/Primitive2.cs" /> 35 <include name="Simulator/Primitive2.cs" />
36 <include name="Simulator/Avatar.cs" />
37 <include name="Simulator/World.cs" />
38 <include name="Simulator/SceneObject.cs" />
39 <include name="Simulator/ParcelManager.cs" />
40 <include name="Estate/EstateManager.cs" /> 40 <include name="Estate/EstateManager.cs" />
41 <include name="CAPS/AdminWebFront.cs" /> 41 <include name="CAPS/AdminWebFront.cs" />
42 <include name="Assets/InventoryCache.cs" /> 42 <include name="Assets/InventoryCache.cs" />
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
index f14fd3f..de1750c 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
@@ -232,12 +232,12 @@ namespace OpenSim.RegionServer
232 attri = configData.GetAttribute("TerrainFile"); 232 attri = configData.GetAttribute("TerrainFile");
233 if (attri == "") 233 if (attri == "")
234 { 234 {
235 this.TerrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32"); 235 this.estateSettings.terrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
236 configData.SetAttribute("TerrainFile", this.TerrainFile); 236 configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile);
237 } 237 }
238 else 238 else
239 { 239 {
240 this.TerrainFile = attri; 240 this.estateSettings.terrainFile = attri;
241 } 241 }
242 242
243 attri = ""; 243 attri = "";
@@ -245,12 +245,12 @@ namespace OpenSim.RegionServer
245 if (attri == "") 245 if (attri == "")
246 { 246 {
247 string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0"); 247 string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
248 this.TerrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture); 248 this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
249 configData.SetAttribute("TerrainMultiplier", this.TerrainMultiplier.ToString()); 249 configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
250 } 250 }
251 else 251 else
252 { 252 {
253 this.TerrainMultiplier = Convert.ToDouble(attri); 253 this.estateSettings.terrainMultiplier = Convert.ToDouble(attri);
254 } 254 }
255 255
256 attri = ""; 256 attri = "";
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
index 8622857..a18c05f 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
@@ -33,6 +33,7 @@ using System.Web;
33using System.IO; 33using System.IO;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Utilities; 35using OpenSim.Framework.Utilities;
36using OpenSim.Framework.Types;
36using libsecondlife; 37using libsecondlife;
37 38
38namespace OpenSim.RegionServer 39namespace OpenSim.RegionServer
@@ -44,41 +45,13 @@ namespace OpenSim.RegionServer
44 public uint RegionLocX; 45 public uint RegionLocX;
45 public uint RegionLocY; 46 public uint RegionLocY;
46 public ulong RegionHandle; 47 public ulong RegionHandle;
47 public ushort RegionWaterHeight = 20; 48
48 public bool RegionTerraform = true;
49 public LLUUID RegionOwner = new LLUUID();
50 49
51 public int IPListenPort; 50 public int IPListenPort;
52 public string IPListenAddr; 51 public string IPListenAddr;
53 52
54 // Region Information
55 // Low resolution 'base' textures. No longer used.
56 public LLUUID TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default
57 public LLUUID TerrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default
58 public LLUUID TerrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default
59 public LLUUID TerrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default
60 // Higher resolution terrain textures
61 public LLUUID TerrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");
62 public LLUUID TerrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");
63 public LLUUID TerrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");
64 public LLUUID TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");
65 // First quad - each point is bilinearly interpolated at each meter of terrain
66 public float TerrainStartHeight00 = 10.0f; // NW Corner ( I think )
67 public float TerrainStartHeight01 = 10.0f; // NE Corner ( I think )
68 public float TerrainStartHeight10 = 10.0f; // SW Corner ( I think )
69 public float TerrainStartHeight11 = 10.0f; // SE Corner ( I think )
70 // Second quad - also bilinearly interpolated.
71 // Terrain texturing is done that:
72 // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
73 public float TerrainHeightRange00 = 60.0f;
74 public float TerrainHeightRange01 = 60.0f;
75 public float TerrainHeightRange10 = 60.0f;
76 public float TerrainHeightRange11 = 60.0f;
77
78 // Terrain Default (Must be in F32 Format!)
79 public string TerrainFile = "default.r32";
80 public double TerrainMultiplier = 60.0;
81 53
54 public EstateSettings estateSettings;
82 55
83 public RegionInfoBase() 56 public RegionInfoBase()
84 { 57 {
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs
index 0135e26..65a9a63 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs
@@ -425,14 +425,14 @@ namespace OpenSim.RegionServer.Simulator
425 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details"); 425 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");
426 handshake.RegionInfo.BillableFactor = 0; 426 handshake.RegionInfo.BillableFactor = 0;
427 handshake.RegionInfo.IsEstateManager = false; 427 handshake.RegionInfo.IsEstateManager = false;
428 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.TerrainHeightRange00; 428 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeNW;
429 handshake.RegionInfo.TerrainHeightRange01 = regionInfo.m_regInfo.TerrainHeightRange01; 429 handshake.RegionInfo.TerrainHeightRange01 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeNE;
430 handshake.RegionInfo.TerrainHeightRange10 = regionInfo.m_regInfo.TerrainHeightRange10; 430 handshake.RegionInfo.TerrainHeightRange10 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeSW;
431 handshake.RegionInfo.TerrainHeightRange11 = regionInfo.m_regInfo.TerrainHeightRange11; 431 handshake.RegionInfo.TerrainHeightRange11 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeSE;
432 handshake.RegionInfo.TerrainStartHeight00 = regionInfo.m_regInfo.TerrainStartHeight00; 432 handshake.RegionInfo.TerrainStartHeight00 = regionInfo.m_regInfo.estateSettings.terrainStartHeightNW;
433 handshake.RegionInfo.TerrainStartHeight01 = regionInfo.m_regInfo.TerrainStartHeight01; 433 handshake.RegionInfo.TerrainStartHeight01 = regionInfo.m_regInfo.estateSettings.terrainStartHeightNE;
434 handshake.RegionInfo.TerrainStartHeight10 = regionInfo.m_regInfo.TerrainStartHeight10; 434 handshake.RegionInfo.TerrainStartHeight10 = regionInfo.m_regInfo.estateSettings.terrainStartHeightSW;
435 handshake.RegionInfo.TerrainStartHeight11 = regionInfo.m_regInfo.TerrainStartHeight11; 435 handshake.RegionInfo.TerrainStartHeight11 = regionInfo.m_regInfo.estateSettings.terrainStartHeightSE;
436 handshake.RegionInfo.SimAccess = 13; 436 handshake.RegionInfo.SimAccess = 13;
437 handshake.RegionInfo.WaterHeight = m_regionWaterHeight; 437 handshake.RegionInfo.WaterHeight = m_regionWaterHeight;
438 uint regionFlags = 72458694; 438 uint regionFlags = 72458694;
@@ -442,15 +442,15 @@ namespace OpenSim.RegionServer.Simulator
442 } 442 }
443 handshake.RegionInfo.RegionFlags = regionFlags; 443 handshake.RegionInfo.RegionFlags = regionFlags;
444 handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0"); 444 handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0");
445 handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000"); 445 handshake.RegionInfo.SimOwner = regionInfo.m_regInfo.MasterAvatarAssignedUUID;
446 handshake.RegionInfo.TerrainBase0 = regionInfo.m_regInfo.TerrainBase0; 446 handshake.RegionInfo.TerrainBase0 = regionInfo.m_regInfo.estateSettings.terrainBase0;
447 handshake.RegionInfo.TerrainBase1 = regionInfo.m_regInfo.TerrainBase1; 447 handshake.RegionInfo.TerrainBase1 = regionInfo.m_regInfo.estateSettings.terrainBase1;
448 handshake.RegionInfo.TerrainBase2 = regionInfo.m_regInfo.TerrainBase2; 448 handshake.RegionInfo.TerrainBase2 = regionInfo.m_regInfo.estateSettings.terrainBase2;
449 handshake.RegionInfo.TerrainBase3 = regionInfo.m_regInfo.TerrainBase3; 449 handshake.RegionInfo.TerrainBase3 = regionInfo.m_regInfo.estateSettings.terrainBase3;
450 handshake.RegionInfo.TerrainDetail0 = regionInfo.m_regInfo.TerrainDetail0; 450 handshake.RegionInfo.TerrainDetail0 = regionInfo.m_regInfo.estateSettings.terrainDetail0;
451 handshake.RegionInfo.TerrainDetail1 = regionInfo.m_regInfo.TerrainDetail1; 451 handshake.RegionInfo.TerrainDetail1 = regionInfo.m_regInfo.estateSettings.terrainDetail1;
452 handshake.RegionInfo.TerrainDetail2 = regionInfo.m_regInfo.TerrainDetail2; 452 handshake.RegionInfo.TerrainDetail2 = regionInfo.m_regInfo.estateSettings.terrainDetail2;
453 handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.TerrainDetail3; 453 handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.estateSettings.terrainDetail3;
454 handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37"); 454 handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");
455 455
456 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet"); 456 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet");
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
index a9d4eea..6d432f1 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
@@ -284,7 +284,6 @@ namespace OpenSim.RegionServer.Simulator
284 { 284 {
285 end_x -= 4; 285 end_x -= 4;
286 end_y -= 4; 286 end_y -= 4;
287 Console.WriteLine("Joining Parcels between (" + start_x + ", " + start_y + ") and (" + end_x + ", " + end_y + ")");
288 287
289 //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box! 288 //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
290 //This should be fixed later -- somewhat "incomplete code" --Ming 289 //This should be fixed later -- somewhat "incomplete code" --Ming
@@ -315,7 +314,6 @@ namespace OpenSim.RegionServer.Simulator
315 return false; 314 return false;
316 } 315 }
317 316
318 Console.WriteLine("Performing Join on parcel: " + startParcel.parcelData.parcelName + " - " + startParcel.parcelData.area + "sqm and " + endParcel.parcelData.parcelName + " - " + endParcel.parcelData.area + "sqm");
319 //Same owners! Lets join them 317 //Same owners! Lets join them
320 //Merge them to startParcel 318 //Merge them to startParcel
321 parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap())); 319 parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
@@ -573,7 +571,6 @@ namespace OpenSim.RegionServer.Simulator
573 if (remote_client.AgentID == parcelData.ownerID) 571 if (remote_client.AgentID == parcelData.ownerID)
574 { 572 {
575 //Needs later group support 573 //Needs later group support
576 Console.WriteLine("Request for update - parcel #" + parcelData.localID);
577 parcelData.authBuyerID = packet.ParcelData.AuthBuyerID; 574 parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
578 parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category; 575 parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
579 parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc); 576 parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs b/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs
index 1ef91c9..ce2b50d 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs
@@ -41,11 +41,8 @@ namespace OpenSim.RegionServer.Simulator
41{ 41{
42 public class SceneObject : Entity 42 public class SceneObject : Entity
43 { 43 {
44 private LLUUID rootUUID;
45 private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>(); 44 private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>();
46 private Dictionary<uint, ClientView> m_clientThreads; 45
47 private World m_world;
48
49 public SceneObject() 46 public SceneObject()
50 { 47 {
51 48
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/World.cs b/OpenSim/OpenSim.RegionServer/Simulator/World.cs
index 150a092..b4e4f49 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/World.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/World.cs
@@ -463,7 +463,7 @@ namespace OpenSim.RegionServer.Simulator
463 float[] map = this.localStorage.LoadWorld(); 463 float[] map = this.localStorage.LoadWorld();
464 if (map == null) 464 if (map == null)
465 { 465 {
466 if (string.IsNullOrEmpty(this.m_regInfo.TerrainFile)) 466 if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
467 { 467 {
468 Console.WriteLine("No default terrain, procedurally generating..."); 468 Console.WriteLine("No default terrain, procedurally generating...");
469 this.Terrain.hills(); 469 this.Terrain.hills();
@@ -474,8 +474,8 @@ namespace OpenSim.RegionServer.Simulator
474 { 474 {
475 try 475 try
476 { 476 {
477 this.Terrain.loadFromFileF32(this.m_regInfo.TerrainFile); 477 this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);
478 this.Terrain *= this.m_regInfo.TerrainMultiplier; 478 this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;
479 } 479 }
480 catch (Exception e) 480 catch (Exception e)
481 { 481 {