8 files changed, 68 insertions, 67 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;
         }
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 949aa27..3dbce5b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1139,17 +1139,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="map">heightmap</param> 
         /// <param name="px">X coordinate for patches 0..12</param>
         /// <param name="py">Y coordinate for patches 0..15</param>
-        private void SendLayerPacket(float[] map, int y, int x)
-        {
-            int[] patches = new int[4];
-            patches[0] = x + 0 + y * 16;
-            patches[1] = x + 1 + y * 16;
-            patches[2] = x + 2 + y * 16;
-            patches[3] = x + 3 + y * 16;
-
-            Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
-            OutPacket(layerpack, ThrottleOutPacketType.Land);
-        }
+        // private void SendLayerPacket(float[] map, int y, int x)
+        // {
+        //     int[] patches = new int[4];
+        //     patches[0] = x + 0 + y * 16;
+        //     patches[1] = x + 1 + y * 16;
+        //     patches[2] = x + 2 + y * 16;
+        //     patches[3] = x + 3 + y * 16;
+
+        //     Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
+        //     OutPacket(layerpack, ThrottleOutPacketType.Land);
+        // }
 
         /// <summary>
         /// Sends a specified patch to a client
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 7afec37..307751e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -388,7 +388,7 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
 
-        public void clearUserAgent(LLUUID avatarID)
+        public void ClearUserAgent(LLUUID avatarID)
         {
             // TODO: implement
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index da93890..b9bf42b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -664,7 +664,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void ClearUserAgent(LLUUID avatarID)
         {
-            m_commsProvider.UserService.clearUserAgent(avatarID);
+            m_commsProvider.UserService.ClearUserAgent(avatarID);
         }
 
         public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs
index dfd802a..c7fda9c 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs
@@ -18656,7 +18656,7 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool
    case 1020: { }
       break;
    case 1064: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
-      break;
+      // break;
    case 1069: ;   
       break;
    case 1073: ;   
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index cbc5112..82d00a5 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1387,7 +1387,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void ApiResetScript()
         {
-            bool running = Running;
+            // bool running = Running;
 
             RemoveState();