* 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, 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
     /// </summary>
     public class ACL
     {
-        private Dictionary<string, Role> Roles = new Dictionary<string, Role>();
         private Dictionary<string, Resource> Resources = new Dictionary<string, Resource>();
+        private Dictionary<string, Role> Roles = new Dictionary<string, Role>();
 
         public ACL AddRole(Role role)
         {
@@ -125,14 +125,14 @@ namespace OpenSim.Framework
     {
         protected Role m_role;
 
-        public Role ErrorRole
+        public AlreadyContainsRoleException(Role role)
         {
-            get { return m_role; }
+            m_role = role;
         }
 
-        public AlreadyContainsRoleException(Role role)
+        public Role ErrorRole
         {
-            m_role = role;
+            get { return m_role; }
         }
 
         public override string ToString()
@@ -164,6 +164,18 @@ namespace OpenSim.Framework
         private Role[] m_parents;
         private Dictionary<string, Permission> m_resources = new Dictionary<string, Permission>();
 
+        public Role(string name)
+        {
+            m_name = name;
+            m_parents = null;
+        }
+
+        public Role(string name, Role[] parents)
+        {
+            m_name = name;
+            m_parents = parents;
+        }
+
         public string Name
         {
             get { return m_name; }
@@ -201,32 +213,20 @@ namespace OpenSim.Framework
         {
             m_resources[resource] = perm;
         }
-
-        public Role(string name)
-        {
-            m_name = name;
-            m_parents = null;
-        }
-
-        public Role(string name, Role[] parents)
-        {
-            m_name = name;
-            m_parents = parents;
-        }
     }
 
     public class Resource
     {
         private string m_name;
 
-        public string Name
+        public Resource(string name)
         {
-            get { return m_name; }
+            m_name = name;
         }
 
-        public Resource(string name)
+        public string Name
         {
-            m_name = name;
+            get { return m_name; }
         }
     }