diff options
author | lbsa71 | 2007-10-05 13:54:16 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-05 13:54:16 +0000 |
commit | d4a4aafaf15360c0f5db22145a60bae87e6bb9c6 (patch) | |
tree | 72915aa8a9f3777a52fe8677c764a192d448e492 /OpenSim/Framework/General | |
parent | * minor refactoring (diff) | |
download | opensim-SC_OLD-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.zip opensim-SC_OLD-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.gz opensim-SC_OLD-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.bz2 opensim-SC_OLD-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.xz |
* So, ok, maybe renaming serialized fields on a friday wasn't the smartest of things. Reverting 2056.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r-- | OpenSim/Framework/General/Types/UserProfileData.cs | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Framework/General/Types/UserProfileData.cs b/OpenSim/Framework/General/Types/UserProfileData.cs index 7996975..20d8224 100644 --- a/OpenSim/Framework/General/Types/UserProfileData.cs +++ b/OpenSim/Framework/General/Types/UserProfileData.cs | |||
@@ -43,94 +43,94 @@ namespace OpenSim.Framework.Types | |||
43 | /// <summary> | 43 | /// <summary> |
44 | /// The first component of a users account name | 44 | /// The first component of a users account name |
45 | /// </summary> | 45 | /// </summary> |
46 | public string Firstname; | 46 | public string username; |
47 | /// <summary> | 47 | /// <summary> |
48 | /// The second component of a users account name | 48 | /// The second component of a users account name |
49 | /// </summary> | 49 | /// </summary> |
50 | public string Lastname; | 50 | public string surname; |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
53 | /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt) | 53 | /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt) |
54 | /// </summary> | 54 | /// </summary> |
55 | /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> | 55 | /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> |
56 | public string PasswordHash; | 56 | public string passwordHash; |
57 | /// <summary> | 57 | /// <summary> |
58 | /// The salt used for the users hash, should be 32 bytes or longer | 58 | /// The salt used for the users hash, should be 32 bytes or longer |
59 | /// </summary> | 59 | /// </summary> |
60 | public string PasswordSalt; | 60 | public string passwordSalt; |
61 | 61 | ||
62 | /// <summary> | 62 | /// <summary> |
63 | /// 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 | 63 | /// 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 |
64 | /// </summary> | 64 | /// </summary> |
65 | public ulong HomeRegion | 65 | public ulong homeRegion |
66 | { | 66 | { |
67 | get { return Helpers.UIntsToLong((HomeRegionX * 256), (HomeRegionY * 256)); } | 67 | get { return Helpers.UIntsToLong((homeRegionX * 256), (homeRegionY * 256)); } |
68 | set { | 68 | set { |
69 | HomeRegionX = (uint)(value >> 40); | 69 | homeRegionX = (uint)(value >> 40); |
70 | HomeRegionY = (((uint)(value)) >> 8); | 70 | homeRegionY = (((uint)(value)) >> 8); |
71 | } | 71 | } |
72 | } | 72 | } |
73 | public uint HomeRegionX; | 73 | public uint homeRegionX; |
74 | public uint HomeRegionY; | 74 | public uint homeRegionY; |
75 | /// <summary> | 75 | /// <summary> |
76 | /// The coordinates inside the region of the home location | 76 | /// The coordinates inside the region of the home location |
77 | /// </summary> | 77 | /// </summary> |
78 | public LLVector3 HomeLocation; | 78 | public LLVector3 homeLocation; |
79 | /// <summary> | 79 | /// <summary> |
80 | /// Where the user will be looking when they rez. | 80 | /// Where the user will be looking when they rez. |
81 | /// </summary> | 81 | /// </summary> |
82 | public LLVector3 HomeLookAt; | 82 | public LLVector3 homeLookAt; |
83 | 83 | ||
84 | /// <summary> | 84 | /// <summary> |
85 | /// A UNIX Timestamp (seconds since epoch) for the users creation | 85 | /// A UNIX Timestamp (seconds since epoch) for the users creation |
86 | /// </summary> | 86 | /// </summary> |
87 | public int Created; | 87 | public int created; |
88 | /// <summary> | 88 | /// <summary> |
89 | /// A UNIX Timestamp for the users last login date / time | 89 | /// A UNIX Timestamp for the users last login date / time |
90 | /// </summary> | 90 | /// </summary> |
91 | public int LastLogin; | 91 | public int lastLogin; |
92 | 92 | ||
93 | public LLUUID RootInventoryFolderId; | 93 | public LLUUID rootInventoryFolderID; |
94 | 94 | ||
95 | /// <summary> | 95 | /// <summary> |
96 | /// A URI to the users inventory server, used for foreigners and large grids | 96 | /// A URI to the users inventory server, used for foreigners and large grids |
97 | /// </summary> | 97 | /// </summary> |
98 | public string UserInventoryUri = String.Empty; | 98 | public string userInventoryURI = String.Empty; |
99 | /// <summary> | 99 | /// <summary> |
100 | /// A URI to the users asset server, used for foreigners and large grids. | 100 | /// A URI to the users asset server, used for foreigners and large grids. |
101 | /// </summary> | 101 | /// </summary> |
102 | public string UserAssetUri = String.Empty; | 102 | public string userAssetURI = String.Empty; |
103 | 103 | ||
104 | /// <summary> | 104 | /// <summary> |
105 | /// A uint mask containing the "I can do" fields of the users profile | 105 | /// A uint mask containing the "I can do" fields of the users profile |
106 | /// </summary> | 106 | /// </summary> |
107 | public uint ProfileCanDoMask; | 107 | public uint profileCanDoMask; |
108 | /// <summary> | 108 | /// <summary> |
109 | /// A uint mask containing the "I want to do" part of the users profile | 109 | /// A uint mask containing the "I want to do" part of the users profile |
110 | /// </summary> | 110 | /// </summary> |
111 | public uint ProfileWantDoMask; // Profile window "I want to" mask | 111 | public uint profileWantDoMask; // Profile window "I want to" mask |
112 | 112 | ||
113 | /// <summary> | 113 | /// <summary> |
114 | /// The about text listed in a users profile. | 114 | /// The about text listed in a users profile. |
115 | /// </summary> | 115 | /// </summary> |
116 | public string ProfileAboutText = String.Empty; | 116 | public string profileAboutText = String.Empty; |
117 | /// <summary> | 117 | /// <summary> |
118 | /// The first life about text listed in a users profile | 118 | /// The first life about text listed in a users profile |
119 | /// </summary> | 119 | /// </summary> |
120 | public string ProfileFirstText = String.Empty; | 120 | public string profileFirstText = String.Empty; |
121 | 121 | ||
122 | /// <summary> | 122 | /// <summary> |
123 | /// The profile image for an avatar stored on the asset server | 123 | /// The profile image for an avatar stored on the asset server |
124 | /// </summary> | 124 | /// </summary> |
125 | public LLUUID ProfileImage; | 125 | public LLUUID profileImage; |
126 | /// <summary> | 126 | /// <summary> |
127 | /// The profile image for the users first life tab | 127 | /// The profile image for the users first life tab |
128 | /// </summary> | 128 | /// </summary> |
129 | public LLUUID ProfileFirstImage; | 129 | public LLUUID profileFirstImage; |
130 | /// <summary> | 130 | /// <summary> |
131 | /// The users last registered agent (filled in on the user server) | 131 | /// The users last registered agent (filled in on the user server) |
132 | /// </summary> | 132 | /// </summary> |
133 | public UserAgentData CurrentAgent; | 133 | public UserAgentData currentAgent; |
134 | } | 134 | } |
135 | 135 | ||
136 | /// <summary> | 136 | /// <summary> |