From ea798195758a6692b583930e5846c643157143be Mon Sep 17 00:00:00 2001
From: mingchen
Date: Wed, 6 Jun 2007 03:00:59 +0000
Subject: Changes: *Added support for Subdivision (use master avatar to login
 to try out) *Added Parcel Border support *Enabled user account storage, but
 only when a new account is created

Bug Fixes:
*Fixed crash on startup while in sandbox when "Setting up master avatar"
*Fixed most core functions in ParcelManager and Parcel that where broken
*Fixed Parcel saving to database

Known Issues:
*Dividing parcel fails in viewer (gives an error about needing 2 parcels)


---
 Common/OpenSim.Framework/Types/ParcelData.cs       | 28 ++++++++++++++++++++++
 Common/OpenSim.Framework/UserProfileManagerBase.cs |  1 +
 Common/OpenSim.Servers/LocalUserProfileManager.cs  |  2 +-
 Common/OpenSim.Servers/LoginServer.cs              |  2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'Common')

diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/Common/OpenSim.Framework/Types/ParcelData.cs
index b16926e..7b3a24c 100644
--- a/Common/OpenSim.Framework/Types/ParcelData.cs
+++ b/Common/OpenSim.Framework/Types/ParcelData.cs
@@ -28,6 +28,34 @@ namespace OpenSim.Framework.Types
             public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None;
 
             public int localID = 0;
+
+            public ParcelData Copy()
+            {
+                ParcelData parcelData = new ParcelData();
+
+                parcelData.AABBMax = this.AABBMax;
+                parcelData.AABBMin = this.AABBMin;
+                parcelData.area = this.area;
+                parcelData.auctionID = this.auctionID;
+                parcelData.authBuyerID = this.authBuyerID;
+                parcelData.category = this.category;
+                parcelData.claimDate = this.claimDate;
+                parcelData.claimPrice = this.claimPrice;
+                parcelData.groupID = this.groupID;
+                parcelData.groupPrims = this.groupPrims;
+                parcelData.isGroupOwned = this.isGroupOwned;
+                parcelData.localID = this.localID;
+                parcelData.ownerID = this.ownerID;
+                parcelData.parcelBitmapByteArray = (byte[])this.parcelBitmapByteArray.Clone();
+                parcelData.parcelDesc = this.parcelDesc;
+                parcelData.parcelFlags = this.parcelFlags;
+                parcelData.parcelName = this.parcelName;
+                parcelData.parcelStatus = this.parcelStatus;
+                parcelData.salePrice = this.salePrice;
+
+                return parcelData;
+           
+            }
         }
     
 }
diff --git a/Common/OpenSim.Framework/UserProfileManagerBase.cs b/Common/OpenSim.Framework/UserProfileManagerBase.cs
index 6c80611..e0c0174 100644
--- a/Common/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/Common/OpenSim.Framework/UserProfileManagerBase.cs
@@ -133,6 +133,7 @@ namespace OpenSim.Framework.User
             newprofile.UUID = LLUUID.Random();
 	    newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);
             this.UserProfiles.Add(newprofile.UUID, newprofile);
+            SaveUserProfiles();
             return newprofile;
         }
 
diff --git a/Common/OpenSim.Servers/LocalUserProfileManager.cs b/Common/OpenSim.Servers/LocalUserProfileManager.cs
index acfa211..6f65176 100644
--- a/Common/OpenSim.Servers/LocalUserProfileManager.cs
+++ b/Common/OpenSim.Servers/LocalUserProfileManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.UserServer
 
         public override void InitUserProfiles()
         {
-            // TODO: need to load from database
+            base.InitUserProfiles();
         }
 
         public override void CustomiseResponse(ref System.Collections.Hashtable response, UserProfile theUser)
diff --git a/Common/OpenSim.Servers/LoginServer.cs b/Common/OpenSim.Servers/LoginServer.cs
index bf98fbb..3d4b955 100644
--- a/Common/OpenSim.Servers/LoginServer.cs
+++ b/Common/OpenSim.Servers/LoginServer.cs
@@ -98,7 +98,7 @@ namespace OpenSim.UserServer
             this._mpasswd = EncodePassword("testpass");
 
             userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr, regionX, regionY);
-            //userManager.InitUserProfiles();
+            userManager.InitUserProfiles();
             userManager.SetKeys("", "", "", "Welcome to OpenSim");
         }
 
-- 
cgit v1.1