mini-warnings-safari, plus cleanup of IUserServices method naming.

3 files changed, 53 insertions, 52 deletions

diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index c3e4095..6296067 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Framework
         private byte[] _data;
         private string _description = String.Empty;
         private LLUUID _fullid;
-        private sbyte _invtype;
         private bool _local = false;
         private string _name = String.Empty;
         private bool _temporary = false;
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 4bd2ad1..6ad72c0 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications
 
         UserAgentData GetAgentByUUID(LLUUID userId);
 
-        void clearUserAgent(LLUUID avatarID);
+        void ClearUserAgent(LLUUID avatarID);
         List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID QueryID, string Query);
 
         UserProfileData SetupMasterUser(string firstName, string lastName);
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 1e059fe..d5b1e74 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Communications
 
                 if (profile != null)
                 {
-                    profile.CurrentAgent = getUserAgent(profile.ID);
+                    profile.CurrentAgent = GetUserAgent(profile.ID);
                     return profile;
                 }
             }
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Communications
 
                 if (null != profile)
                 {
-                    profile.CurrentAgent = getUserAgent(profile.ID);
+                    profile.CurrentAgent = GetUserAgent(profile.ID);
                     return profile;
                 }
             }
@@ -157,7 +157,7 @@ namespace OpenSim.Framework.Communications
         /// </summary>
         /// <param name="data"></param>
         /// <returns></returns>
-        public bool setUserProfile(UserProfileData data)
+        public bool SetUserProfile(UserProfileData data)
         {
             foreach (KeyValuePair<string, IUserData> plugin in _plugins)
             {
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Communications
         /// </summary>
         /// <param name="uuid">The agent's UUID</param>
         /// <returns>Agent profiles</returns>
-        public UserAgentData getUserAgent(LLUUID uuid)
+        public UserAgentData GetUserAgent(LLUUID uuid)
         {
             foreach (KeyValuePair<string, IUserData> plugin in _plugins)
             {
@@ -200,6 +200,51 @@ namespace OpenSim.Framework.Communications
             return null;
         }
 
+        /// <summary>
+        /// Loads a user agent by name (not called directly)
+        /// </summary>
+        /// <param name="name">The agent's name</param>
+        /// <returns>A user agent</returns>
+        public UserAgentData GetUserAgent(string name)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    return plugin.Value.GetAgentByName(name);
+                }
+                catch (Exception e)
+                {
+                    m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Loads a user agent by name (not called directly)
+        /// </summary>
+        /// <param name="fname">The agent's firstname</param>
+        /// <param name="lname">The agent's lastname</param>
+        /// <returns>A user agent</returns>
+        public UserAgentData GetUserAgent(string fname, string lname)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                try
+                {
+                    return plugin.Value.GetAgentByName(fname, lname);
+                }
+                catch (Exception e)
+                {
+                    m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+                }
+            }
+
+            return null;
+        }
+
         public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle)
         {
             foreach (KeyValuePair<string, IUserData> plugin in _plugins)
@@ -297,62 +342,19 @@ namespace OpenSim.Framework.Communications
             }
         }
 
-        /// <summary>
-        /// Loads a user agent by name (not called directly)
-        /// </summary>
-        /// <param name="name">The agent's name</param>
-        /// <returns>A user agent</returns>
-        public UserAgentData getUserAgent(string name)
-        {
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                try
-                {
-                    return plugin.Value.GetAgentByName(name);
-                }
-                catch (Exception e)
-                {
-                    m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-
-            return null;
-        }
 
         /// <summary>
         /// Resets the currentAgent in the user profile
         /// </summary>
         /// <param name="agentID">The agent's ID</param>
-        public void clearUserAgent(LLUUID agentID)
+        public void ClearUserAgent(LLUUID agentID)
         {
             UserProfileData profile = GetUserProfile(agentID);
             profile.CurrentAgent = null;
 
-            setUserProfile(profile);
+            SetUserProfile(profile);
         }
 
-        /// <summary>
-        /// Loads a user agent by name (not called directly)
-        /// </summary>
-        /// <param name="fname">The agent's firstname</param>
-        /// <param name="lname">The agent's lastname</param>
-        /// <returns>A user agent</returns>
-        public UserAgentData getUserAgent(string fname, string lname)
-        {
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                try
-                {
-                    return plugin.Value.GetAgentByName(fname, lname);
-                }
-                catch (Exception e)
-                {
-                    m_log.Info("[USERSTORAGE]: Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
-                }
-            }
-
-            return null;
-        }
 
         #endregion
 
@@ -537,7 +539,7 @@ namespace OpenSim.Framework.Communications
             // TODO: what is the logic should be?
             bool ret = false;
             ret = AddUserAgent(profile.CurrentAgent);
-            ret = ret & setUserProfile(profile);
+            ret = ret & SetUserProfile(profile);
             return ret;
         }