* Spring cleaning.

* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.

1 files changed, 149 insertions, 205 deletions

diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 254e903..b704682 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -36,39 +36,21 @@ namespace OpenSim.Framework
     public class UserProfileData
     {
         /// <summary>
-        /// The ID value for this user
+        /// A UNIX Timestamp (seconds since epoch) for the users creation
         /// </summary>
-        private LLUUID _id;
+        private int _created;
 
         /// <summary>
-        /// The last used Web_login_key
+        /// The users last registered agent (filled in on the user server)
         /// </summary>
-        private LLUUID _webLoginKey;
+        private UserAgentData _currentAgent;
+
         /// <summary>
         /// The first component of a users account name
         /// </summary>
         private string _firstname;
 
         /// <summary>
-        /// The second component of a users account name
-        /// </summary>
-        private string _surname;
-
-        /// <summary>
-        /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
-        /// </summary>
-        /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
-        private string _passwordHash;
-
-        /// <summary>
-        /// The salt used for the users hash, should be 32 bytes or longer
-        /// </summary>
-        private string _passwordSalt;
-
-        private uint _homeRegionX;
-        private uint _homeRegionY;
-
-        /// <summary>
         /// The coordinates inside the region of the home location
         /// </summary>
         private LLVector3 _homeLocation;
@@ -78,42 +60,44 @@ namespace OpenSim.Framework
         /// </summary>
         private LLVector3 _homeLookAt;
 
+        private uint _homeRegionX;
+        private uint _homeRegionY;
+
         /// <summary>
-        /// A UNIX Timestamp (seconds since epoch) for the users creation
+        /// The ID value for this user
         /// </summary>
-        private int _created;
+        private LLUUID _id;
 
         /// <summary>
         /// A UNIX Timestamp for the users last login date / time
         /// </summary>
         private int _lastLogin;
 
-        private LLUUID _rootInventoryFolderID;
-
         /// <summary>
-        /// A URI to the users inventory server, used for foreigners and large grids
+        /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
         /// </summary>
-        private string _userInventoryURI = String.Empty;
+        /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
+        private string _passwordHash;
 
         /// <summary>
-        /// A URI to the users asset server, used for foreigners and large grids.
+        /// The salt used for the users hash, should be 32 bytes or longer
         /// </summary>
-        private string _userAssetURI = String.Empty;
+        private string _passwordSalt;
 
         /// <summary>
-        /// A uint mask containing the "I can do" fields of the users profile
+        /// The about text listed in a users profile.
         /// </summary>
-        private uint _profileCanDoMask;
+        private string _profileAboutText = String.Empty;
 
         /// <summary>
-        /// A uint mask containing the "I want to do" part of the users profile
+        /// A uint mask containing the "I can do" fields of the users profile
         /// </summary>
-        private uint _profileWantDoMask; // Profile window "I want to" mask
+        private uint _profileCanDoMask;
 
         /// <summary>
-        /// The about text listed in a users profile.
+        /// The profile image for the users first life tab
         /// </summary>
-        private string _profileAboutText = String.Empty;
+        private LLUUID _profileFirstImage;
 
         /// <summary>
         /// The first life about text listed in a users profile
@@ -126,21 +110,38 @@ namespace OpenSim.Framework
         private LLUUID _profileImage;
 
         /// <summary>
-        /// The profile image for the users first life tab
+        /// A uint mask containing the "I want to do" part of the users profile
         /// </summary>
-        private LLUUID _profileFirstImage;
+        private uint _profileWantDoMask; // Profile window "I want to" mask
+
+        private LLUUID _rootInventoryFolderID;
 
         /// <summary>
-        /// The users last registered agent (filled in on the user server)
+        /// The second component of a users account name
         /// </summary>
-        private UserAgentData _currentAgent;
+        private string _surname;
+
+        /// <summary>
+        /// A URI to the users asset server, used for foreigners and large grids.
+        /// </summary>
+        private string _userAssetURI = String.Empty;
+
+        /// <summary>
+        /// A URI to the users inventory server, used for foreigners and large grids
+        /// </summary>
+        private string _userInventoryURI = String.Empty;
+
+        /// <summary>
+        /// The last used Web_login_key
+        /// </summary>
+        private LLUUID _webLoginKey;
 
         /// <summary>
         /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into
         /// </summary>
         public ulong HomeRegion
         {
-            get { return Helpers.UIntsToLong((_homeRegionX * (uint)Constants.RegionSize), (_homeRegionY * (uint)Constants.RegionSize)); }
+            get { return Helpers.UIntsToLong((_homeRegionX * (uint) Constants.RegionSize), (_homeRegionY * (uint) Constants.RegionSize)); }
             set
             {
                 _homeRegionX = (uint) (value >> 40);
@@ -149,232 +150,175 @@ namespace OpenSim.Framework
         }
 
         // Property wrappers
-        public LLUUID ID {
-            get {
-                return _id;
-            }
-            set {
-                _id = value;
-            }
+        public LLUUID ID
+        {
+            get { return _id; }
+            set { _id = value; }
         }
 
-        public LLUUID WebLoginKey {
-            get {
-                return _webLoginKey;
-            }
-            set {
-                _webLoginKey = value;
-            }
+        public LLUUID WebLoginKey
+        {
+            get { return _webLoginKey; }
+            set { _webLoginKey = value; }
         }
 
-        public string FirstName {
-            get {
-                return _firstname;
-            }
-            set {
-                _firstname = value;
-            }
+        public string FirstName
+        {
+            get { return _firstname; }
+            set { _firstname = value; }
         }
 
-        public string SurName {
-            get {
-                return _surname;
-            }
-            set {
-                _surname = value;
-            }
+        public string SurName
+        {
+            get { return _surname; }
+            set { _surname = value; }
         }
 
-        public string PasswordHash {
-            get {
-                return _passwordHash;
-            }
-            set {
-                _passwordHash = value;
-            }
+        public string PasswordHash
+        {
+            get { return _passwordHash; }
+            set { _passwordHash = value; }
         }
 
-        public string PasswordSalt {
-            get {
-                return _passwordSalt;
-            }
-            set {
-                _passwordSalt = value;
-            }
+        public string PasswordSalt
+        {
+            get { return _passwordSalt; }
+            set { _passwordSalt = value; }
         }
 
-        public uint HomeRegionX {
-            get {
-                return _homeRegionX;
-            }
-            set {
-                _homeRegionX = value;
-            }
+        public uint HomeRegionX
+        {
+            get { return _homeRegionX; }
+            set { _homeRegionX = value; }
         }
 
-        public uint HomeRegionY {
-            get {
-                return _homeRegionY;
-            }
-            set {
-                _homeRegionY = value;
-            }
+        public uint HomeRegionY
+        {
+            get { return _homeRegionY; }
+            set { _homeRegionY = value; }
         }
 
-        public LLVector3 HomeLocation {
-            get {
-                return _homeLocation;
-            }
-            set {
-                _homeLocation = value;
-            }
+        public LLVector3 HomeLocation
+        {
+            get { return _homeLocation; }
+            set { _homeLocation = value; }
         }
 
         // for handy serialization
-        public float HomeLocationX {
+        public float HomeLocationX
+        {
             get { return _homeLocation.X; }
             set { _homeLocation.X = value; }
         }
-        public float HomeLocationY {
+
+        public float HomeLocationY
+        {
             get { return _homeLocation.Y; }
             set { _homeLocation.Y = value; }
         }
-        public float HomeLocationZ {
+
+        public float HomeLocationZ
+        {
             get { return _homeLocation.Z; }
             set { _homeLocation.Z = value; }
         }
 
 
-        public LLVector3 HomeLookAt {
-            get {
-                return _homeLookAt;
-            }
-            set {
-                _homeLookAt = value;
-            }
+        public LLVector3 HomeLookAt
+        {
+            get { return _homeLookAt; }
+            set { _homeLookAt = value; }
         }
-        
+
         // for handy serialization
-        public float HomeLookAtX {
+        public float HomeLookAtX
+        {
             get { return _homeLookAt.X; }
             set { _homeLookAt.X = value; }
         }
-        public float HomeLookAtY {
+
+        public float HomeLookAtY
+        {
             get { return _homeLookAt.Y; }
             set { _homeLookAt.Y = value; }
         }
-        public float HomeLookAtZ {
+
+        public float HomeLookAtZ
+        {
             get { return _homeLookAt.Z; }
             set { _homeLookAt.Z = value; }
         }
 
-        public int Created {
-            get {
-                return _created;
-            }
-            set {
-                _created = value;
-            }
+        public int Created
+        {
+            get { return _created; }
+            set { _created = value; }
         }
 
-        public int LastLogin {
-            get {
-                return _lastLogin;
-            }
-            set {
-                _lastLogin = value;
-            }
+        public int LastLogin
+        {
+            get { return _lastLogin; }
+            set { _lastLogin = value; }
         }
 
-        public LLUUID RootInventoryFolderID {
-            get {
-                return _rootInventoryFolderID;
-            }
-            set {
-                _rootInventoryFolderID = value;
-            }
+        public LLUUID RootInventoryFolderID
+        {
+            get { return _rootInventoryFolderID; }
+            set { _rootInventoryFolderID = value; }
         }
 
-        public string UserInventoryURI {
-            get {
-                return _userInventoryURI;
-            }
-            set {
-                _userInventoryURI = value;
-            }
+        public string UserInventoryURI
+        {
+            get { return _userInventoryURI; }
+            set { _userInventoryURI = value; }
         }
 
-        public string UserAssetURI {
-            get {
-                return _userAssetURI;
-            }
-            set {
-                _userAssetURI = value;
-            }
+        public string UserAssetURI
+        {
+            get { return _userAssetURI; }
+            set { _userAssetURI = value; }
         }
 
-        public uint CanDoMask {
-            get {
-                return _profileCanDoMask;
-            }
-            set {
-                _profileCanDoMask = value;
-            }
+        public uint CanDoMask
+        {
+            get { return _profileCanDoMask; }
+            set { _profileCanDoMask = value; }
         }
 
-        public uint WantDoMask {
-            get {
-                return _profileWantDoMask;
-            }
-            set {
-                _profileWantDoMask = value;
-            }
+        public uint WantDoMask
+        {
+            get { return _profileWantDoMask; }
+            set { _profileWantDoMask = value; }
         }
 
-        public string AboutText {
-            get {
-                return _profileAboutText;
-            }
-            set {
-                _profileAboutText = value;
-            }
+        public string AboutText
+        {
+            get { return _profileAboutText; }
+            set { _profileAboutText = value; }
         }
 
-        public string FirstLifeAboutText {
-            get {
-                return _profileFirstText;
-            }
-            set {
-                _profileFirstText = value;
-            }
+        public string FirstLifeAboutText
+        {
+            get { return _profileFirstText; }
+            set { _profileFirstText = value; }
         }
 
-        public LLUUID Image {
-            get {
-                return _profileImage;
-            }
-            set {
-                _profileImage = value;
-            }
+        public LLUUID Image
+        {
+            get { return _profileImage; }
+            set { _profileImage = value; }
         }
 
-        public LLUUID FirstLifeImage {
-            get {
-                return _profileFirstImage;
-            }
-            set {
-                _profileFirstImage = value;
-            }
+        public LLUUID FirstLifeImage
+        {
+            get { return _profileFirstImage; }
+            set { _profileFirstImage = value; }
         }
 
-        public UserAgentData CurrentAgent {
-            get {
-                return _currentAgent;
-            }
-            set {
-                _currentAgent = value;
-            }
+        public UserAgentData CurrentAgent
+        {
+            get { return _currentAgent; }
+            set { _currentAgent = value; }
         }
-
     }
-}
+}
\ No newline at end of file