diff options
author | mingchen | 2007-06-06 03:00:59 +0000 |
---|---|---|
committer | mingchen | 2007-06-06 03:00:59 +0000 |
commit | ea798195758a6692b583930e5846c643157143be (patch) | |
tree | 50ac10b862332a622dc50c991591cc65c084d9b5 /Common | |
parent | Unhippos! (diff) | |
download | opensim-SC_OLD-ea798195758a6692b583930e5846c643157143be.zip opensim-SC_OLD-ea798195758a6692b583930e5846c643157143be.tar.gz opensim-SC_OLD-ea798195758a6692b583930e5846c643157143be.tar.bz2 opensim-SC_OLD-ea798195758a6692b583930e5846c643157143be.tar.xz |
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)
Diffstat (limited to '')
-rw-r--r-- | Common/OpenSim.Framework/Types/ParcelData.cs | 28 | ||||
-rw-r--r-- | Common/OpenSim.Framework/UserProfileManagerBase.cs | 1 | ||||
-rw-r--r-- | Common/OpenSim.Servers/LocalUserProfileManager.cs | 2 | ||||
-rw-r--r-- | Common/OpenSim.Servers/LoginServer.cs | 2 |
4 files changed, 31 insertions, 2 deletions
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 | |||
28 | public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None; | 28 | public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None; |
29 | 29 | ||
30 | public int localID = 0; | 30 | public int localID = 0; |
31 | |||
32 | public ParcelData Copy() | ||
33 | { | ||
34 | ParcelData parcelData = new ParcelData(); | ||
35 | |||
36 | parcelData.AABBMax = this.AABBMax; | ||
37 | parcelData.AABBMin = this.AABBMin; | ||
38 | parcelData.area = this.area; | ||
39 | parcelData.auctionID = this.auctionID; | ||
40 | parcelData.authBuyerID = this.authBuyerID; | ||
41 | parcelData.category = this.category; | ||
42 | parcelData.claimDate = this.claimDate; | ||
43 | parcelData.claimPrice = this.claimPrice; | ||
44 | parcelData.groupID = this.groupID; | ||
45 | parcelData.groupPrims = this.groupPrims; | ||
46 | parcelData.isGroupOwned = this.isGroupOwned; | ||
47 | parcelData.localID = this.localID; | ||
48 | parcelData.ownerID = this.ownerID; | ||
49 | parcelData.parcelBitmapByteArray = (byte[])this.parcelBitmapByteArray.Clone(); | ||
50 | parcelData.parcelDesc = this.parcelDesc; | ||
51 | parcelData.parcelFlags = this.parcelFlags; | ||
52 | parcelData.parcelName = this.parcelName; | ||
53 | parcelData.parcelStatus = this.parcelStatus; | ||
54 | parcelData.salePrice = this.salePrice; | ||
55 | |||
56 | return parcelData; | ||
57 | |||
58 | } | ||
31 | } | 59 | } |
32 | 60 | ||
33 | } | 61 | } |
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 | |||
133 | newprofile.UUID = LLUUID.Random(); | 133 | newprofile.UUID = LLUUID.Random(); |
134 | newprofile.Inventory.CreateRootFolder(newprofile.UUID, true); | 134 | newprofile.Inventory.CreateRootFolder(newprofile.UUID, true); |
135 | this.UserProfiles.Add(newprofile.UUID, newprofile); | 135 | this.UserProfiles.Add(newprofile.UUID, newprofile); |
136 | SaveUserProfiles(); | ||
136 | return newprofile; | 137 | return newprofile; |
137 | } | 138 | } |
138 | 139 | ||
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 | |||
64 | 64 | ||
65 | public override void InitUserProfiles() | 65 | public override void InitUserProfiles() |
66 | { | 66 | { |
67 | // TODO: need to load from database | 67 | base.InitUserProfiles(); |
68 | } | 68 | } |
69 | 69 | ||
70 | public override void CustomiseResponse(ref System.Collections.Hashtable response, UserProfile theUser) | 70 | 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 | |||
98 | this._mpasswd = EncodePassword("testpass"); | 98 | this._mpasswd = EncodePassword("testpass"); |
99 | 99 | ||
100 | userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr, regionX, regionY); | 100 | userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr, regionX, regionY); |
101 | //userManager.InitUserProfiles(); | 101 | userManager.InitUserProfiles(); |
102 | userManager.SetKeys("", "", "", "Welcome to OpenSim"); | 102 | userManager.SetKeys("", "", "", "Welcome to OpenSim"); |
103 | } | 103 | } |
104 | 104 | ||