diff options
as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace.
Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/UserProfileData.cs (renamed from OpenSim/Framework/General/Types/UserProfileData.cs) | 380 |
1 files changed, 190 insertions, 190 deletions
diff --git a/OpenSim/Framework/General/Types/UserProfileData.cs b/OpenSim/Framework/General/UserProfileData.cs index 20d8224..444d811 100644 --- a/OpenSim/Framework/General/Types/UserProfileData.cs +++ b/OpenSim/Framework/General/UserProfileData.cs | |||
@@ -1,191 +1,191 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Types | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Information about a particular user known to the userserver | 34 | /// Information about a particular user known to the userserver |
35 | /// </summary> | 35 | /// </summary> |
36 | public class UserProfileData | 36 | public class UserProfileData |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// The ID value for this user | 39 | /// The ID value for this user |
40 | /// </summary> | 40 | /// </summary> |
41 | public LLUUID UUID; | 41 | public LLUUID UUID; |
42 | 42 | ||
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 username; | 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 surname; | 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> |
137 | /// Information about a users session | 137 | /// Information about a users session |
138 | /// </summary> | 138 | /// </summary> |
139 | public class UserAgentData | 139 | public class UserAgentData |
140 | { | 140 | { |
141 | /// <summary> | 141 | /// <summary> |
142 | /// The UUID of the users avatar (not the agent!) | 142 | /// The UUID of the users avatar (not the agent!) |
143 | /// </summary> | 143 | /// </summary> |
144 | public LLUUID UUID; | 144 | public LLUUID UUID; |
145 | /// <summary> | 145 | /// <summary> |
146 | /// The IP address of the user | 146 | /// The IP address of the user |
147 | /// </summary> | 147 | /// </summary> |
148 | public string agentIP = String.Empty; | 148 | public string agentIP = String.Empty; |
149 | /// <summary> | 149 | /// <summary> |
150 | /// The port of the user | 150 | /// The port of the user |
151 | /// </summary> | 151 | /// </summary> |
152 | public uint agentPort; | 152 | public uint agentPort; |
153 | /// <summary> | 153 | /// <summary> |
154 | /// Is the user online? | 154 | /// Is the user online? |
155 | /// </summary> | 155 | /// </summary> |
156 | public bool agentOnline; | 156 | public bool agentOnline; |
157 | /// <summary> | 157 | /// <summary> |
158 | /// The session ID for the user (also the agent ID) | 158 | /// The session ID for the user (also the agent ID) |
159 | /// </summary> | 159 | /// </summary> |
160 | public LLUUID sessionID; | 160 | public LLUUID sessionID; |
161 | /// <summary> | 161 | /// <summary> |
162 | /// The "secure" session ID for the user | 162 | /// The "secure" session ID for the user |
163 | /// </summary> | 163 | /// </summary> |
164 | /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> | 164 | /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> |
165 | public LLUUID secureSessionID; | 165 | public LLUUID secureSessionID; |
166 | /// <summary> | 166 | /// <summary> |
167 | /// The region the user logged into initially | 167 | /// The region the user logged into initially |
168 | /// </summary> | 168 | /// </summary> |
169 | public LLUUID regionID; | 169 | public LLUUID regionID; |
170 | /// <summary> | 170 | /// <summary> |
171 | /// A unix timestamp from when the user logged in | 171 | /// A unix timestamp from when the user logged in |
172 | /// </summary> | 172 | /// </summary> |
173 | public int loginTime; | 173 | public int loginTime; |
174 | /// <summary> | 174 | /// <summary> |
175 | /// When this agent expired and logged out, 0 if still online | 175 | /// When this agent expired and logged out, 0 if still online |
176 | /// </summary> | 176 | /// </summary> |
177 | public int logoutTime; | 177 | public int logoutTime; |
178 | /// <summary> | 178 | /// <summary> |
179 | /// Current region the user is logged into | 179 | /// Current region the user is logged into |
180 | /// </summary> | 180 | /// </summary> |
181 | public LLUUID currentRegion; | 181 | public LLUUID currentRegion; |
182 | /// <summary> | 182 | /// <summary> |
183 | /// Region handle of the current region the user is in | 183 | /// Region handle of the current region the user is in |
184 | /// </summary> | 184 | /// </summary> |
185 | public ulong currentHandle; | 185 | public ulong currentHandle; |
186 | /// <summary> | 186 | /// <summary> |
187 | /// The position of the user within the region | 187 | /// The position of the user within the region |
188 | /// </summary> | 188 | /// </summary> |
189 | public LLVector3 currentPos; | 189 | public LLVector3 currentPos; |
190 | } | 190 | } |
191 | } \ No newline at end of file | 191 | } \ No newline at end of file |