diff options
Diffstat (limited to 'OpenSim/Framework/ACL.cs')
-rw-r--r-- | OpenSim/Framework/ACL.cs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Framework/ACL.cs b/OpenSim/Framework/ACL.cs index 88a3034..29d7f7a 100644 --- a/OpenSim/Framework/ACL.cs +++ b/OpenSim/Framework/ACL.cs | |||
@@ -43,8 +43,8 @@ namespace OpenSim.Framework | |||
43 | /// </summary> | 43 | /// </summary> |
44 | public class ACL | 44 | public class ACL |
45 | { | 45 | { |
46 | private Dictionary<string, Role> Roles = new Dictionary<string, Role>(); | ||
47 | private Dictionary<string, Resource> Resources = new Dictionary<string, Resource>(); | 46 | private Dictionary<string, Resource> Resources = new Dictionary<string, Resource>(); |
47 | private Dictionary<string, Role> Roles = new Dictionary<string, Role>(); | ||
48 | 48 | ||
49 | public ACL AddRole(Role role) | 49 | public ACL AddRole(Role role) |
50 | { | 50 | { |
@@ -125,14 +125,14 @@ namespace OpenSim.Framework | |||
125 | { | 125 | { |
126 | protected Role m_role; | 126 | protected Role m_role; |
127 | 127 | ||
128 | public Role ErrorRole | 128 | public AlreadyContainsRoleException(Role role) |
129 | { | 129 | { |
130 | get { return m_role; } | 130 | m_role = role; |
131 | } | 131 | } |
132 | 132 | ||
133 | public AlreadyContainsRoleException(Role role) | 133 | public Role ErrorRole |
134 | { | 134 | { |
135 | m_role = role; | 135 | get { return m_role; } |
136 | } | 136 | } |
137 | 137 | ||
138 | public override string ToString() | 138 | public override string ToString() |
@@ -164,6 +164,18 @@ namespace OpenSim.Framework | |||
164 | private Role[] m_parents; | 164 | private Role[] m_parents; |
165 | private Dictionary<string, Permission> m_resources = new Dictionary<string, Permission>(); | 165 | private Dictionary<string, Permission> m_resources = new Dictionary<string, Permission>(); |
166 | 166 | ||
167 | public Role(string name) | ||
168 | { | ||
169 | m_name = name; | ||
170 | m_parents = null; | ||
171 | } | ||
172 | |||
173 | public Role(string name, Role[] parents) | ||
174 | { | ||
175 | m_name = name; | ||
176 | m_parents = parents; | ||
177 | } | ||
178 | |||
167 | public string Name | 179 | public string Name |
168 | { | 180 | { |
169 | get { return m_name; } | 181 | get { return m_name; } |
@@ -201,32 +213,20 @@ namespace OpenSim.Framework | |||
201 | { | 213 | { |
202 | m_resources[resource] = perm; | 214 | m_resources[resource] = perm; |
203 | } | 215 | } |
204 | |||
205 | public Role(string name) | ||
206 | { | ||
207 | m_name = name; | ||
208 | m_parents = null; | ||
209 | } | ||
210 | |||
211 | public Role(string name, Role[] parents) | ||
212 | { | ||
213 | m_name = name; | ||
214 | m_parents = parents; | ||
215 | } | ||
216 | } | 216 | } |
217 | 217 | ||
218 | public class Resource | 218 | public class Resource |
219 | { | 219 | { |
220 | private string m_name; | 220 | private string m_name; |
221 | 221 | ||
222 | public string Name | 222 | public Resource(string name) |
223 | { | 223 | { |
224 | get { return m_name; } | 224 | m_name = name; |
225 | } | 225 | } |
226 | 226 | ||
227 | public Resource(string name) | 227 | public string Name |
228 | { | 228 | { |
229 | m_name = name; | 229 | get { return m_name; } |
230 | } | 230 | } |
231 | } | 231 | } |
232 | 232 | ||