* Renamed methods on IUserData

2 files changed, 16 insertions, 13 deletions

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 0105b9d..1f54310 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -44,8 +44,14 @@ namespace OpenSim.Region.Communications.Local
         public LocalUserServices UserServices;
         public LocalLoginService LoginServices;
         public LocalInventoryService InvenServices;
-        // public CAPSService CapsServices;
-        private readonly LocalSettings m_settings;
+        
+        protected LocalSettings m_settings;
+
+        protected CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache )
+            : base(serversInfo, httpServer, assetCache)
+        {
+            
+        }
 
         public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings)
             : base(serversInfo, httpServer, assetCache)
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 612f654..a7cefcb 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -1,10 +1,8 @@
 using System;
-using libsecondlife;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.UserManagement;
-using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Region.Communications.Local
 {
@@ -13,7 +11,7 @@ namespace OpenSim.Region.Communications.Local
         private readonly CommunicationsLocal m_parent;
 
         private readonly NetworkServersInfo m_serversInfo;
-        private readonly uint m_defaultHomeX ;
+        private readonly uint m_defaultHomeX;
         private readonly uint m_defaultHomeY;
 
 
@@ -22,8 +20,8 @@ namespace OpenSim.Region.Communications.Local
             m_parent = parent;
             m_serversInfo = serversInfo;
 
-            m_defaultHomeX = this.m_serversInfo.DefaultHomeLocX;
-            m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY;
+            m_defaultHomeX = m_serversInfo.DefaultHomeLocX;
+            m_defaultHomeY = m_serversInfo.DefaultHomeLocY;
         }
 
         public UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -33,17 +31,16 @@ namespace OpenSim.Region.Communications.Local
 
         public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
         {
-            UserProfileData profile = base.GetUserProfile(firstName, lastName);
+            UserProfileData profile = GetUserProfile(firstName, lastName);
             if (profile != null)
             {
-
                 return profile;
             }
 
             Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account");
-            this.AddUserProfile(firstName, lastName, password, m_defaultHomeX, m_defaultHomeY);
+            AddUserProfile(firstName, lastName, password, m_defaultHomeX, m_defaultHomeY);
 
-            profile = base.GetUserProfile(firstName, lastName);
+            profile = GetUserProfile(firstName, lastName);
 
             if (profile == null)
             {
@@ -51,10 +48,10 @@ namespace OpenSim.Region.Communications.Local
             }
             else
             {
-                 m_parent.InvenServices.CreateNewUserInventory(profile.UUID);
+                m_parent.InvenServices.CreateNewUserInventory(profile.UUID);
             }
 
             return profile;
         }
     }
-}
+}
\ No newline at end of file