diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs index 73c913754d..254e903a77 100644 --- a/OpenSim/Framework/UserProfileData.cs +++ b/OpenSim/Framework/UserProfileData.cs @@ -65,6 +65,76 @@ namespace OpenSim.Framework /// private string _passwordSalt; + private uint _homeRegionX; + private uint _homeRegionY; + + /// + /// The coordinates inside the region of the home location + /// + private LLVector3 _homeLocation; + + /// + /// Where the user will be looking when they rez. + /// + private LLVector3 _homeLookAt; + + /// + /// A UNIX Timestamp (seconds since epoch) for the users creation + /// + private int _created; + + /// + /// A UNIX Timestamp for the users last login date / time + /// + private int _lastLogin; + + private LLUUID _rootInventoryFolderID; + + /// + /// A URI to the users inventory server, used for foreigners and large grids + /// + private string _userInventoryURI = String.Empty; + + /// + /// A URI to the users asset server, used for foreigners and large grids. + /// + private string _userAssetURI = String.Empty; + + /// + /// A uint mask containing the "I can do" fields of the users profile + /// + private uint _profileCanDoMask; + + /// + /// A uint mask containing the "I want to do" part of the users profile + /// + private uint _profileWantDoMask; // Profile window "I want to" mask + + /// + /// The about text listed in a users profile. + /// + private string _profileAboutText = String.Empty; + + /// + /// The first life about text listed in a users profile + /// + private string _profileFirstText = String.Empty; + + /// + /// The profile image for an avatar stored on the asset server + /// + private LLUUID _profileImage; + + /// + /// The profile image for the users first life tab + /// + private LLUUID _profileFirstImage; + + /// + /// The users last registered agent (filled in on the user server) + /// + private UserAgentData _currentAgent; + /// /// 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 /// @@ -78,6 +148,7 @@ namespace OpenSim.Framework } } + // Property wrappers public LLUUID ID { get { return _id; @@ -159,6 +230,21 @@ namespace OpenSim.Framework } } + // for handy serialization + public float HomeLocationX { + get { return _homeLocation.X; } + set { _homeLocation.X = value; } + } + public float HomeLocationY { + get { return _homeLocation.Y; } + set { _homeLocation.Y = value; } + } + public float HomeLocationZ { + get { return _homeLocation.Z; } + set { _homeLocation.Z = value; } + } + + public LLVector3 HomeLookAt { get { return _homeLookAt; @@ -167,6 +253,20 @@ namespace OpenSim.Framework _homeLookAt = value; } } + + // for handy serialization + public float HomeLookAtX { + get { return _homeLookAt.X; } + set { _homeLookAt.X = value; } + } + public float HomeLookAtY { + get { return _homeLookAt.Y; } + set { _homeLookAt.Y = value; } + } + public float HomeLookAtZ { + get { return _homeLookAt.Z; } + set { _homeLookAt.Z = value; } + } public int Created { get { @@ -276,74 +376,5 @@ namespace OpenSim.Framework } } - private uint _homeRegionX; - private uint _homeRegionY; - - /// - /// The coordinates inside the region of the home location - /// - private LLVector3 _homeLocation; - - /// - /// Where the user will be looking when they rez. - /// - private LLVector3 _homeLookAt; - - /// - /// A UNIX Timestamp (seconds since epoch) for the users creation - /// - private int _created; - - /// - /// A UNIX Timestamp for the users last login date / time - /// - private int _lastLogin; - - private LLUUID _rootInventoryFolderID; - - /// - /// A URI to the users inventory server, used for foreigners and large grids - /// - private string _userInventoryURI = String.Empty; - - /// - /// A URI to the users asset server, used for foreigners and large grids. - /// - private string _userAssetURI = String.Empty; - - /// - /// A uint mask containing the "I can do" fields of the users profile - /// - private uint _profileCanDoMask; - - /// - /// A uint mask containing the "I want to do" part of the users profile - /// - private uint _profileWantDoMask; // Profile window "I want to" mask - - /// - /// The about text listed in a users profile. - /// - private string _profileAboutText = String.Empty; - - /// - /// The first life about text listed in a users profile - /// - private string _profileFirstText = String.Empty; - - /// - /// The profile image for an avatar stored on the asset server - /// - private LLUUID _profileImage; - - /// - /// The profile image for the users first life tab - /// - private LLUUID _profileFirstImage; - - /// - /// The users last registered agent (filled in on the user server) - /// - private UserAgentData _currentAgent; } }