From 2dadbc2f70313899f517c8d1e1c7da443fd4324a Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 4 Jul 2008 10:19:58 +0000
Subject: mini-warnings-safari, plus cleanup of IUserServices method naming.

---
 .../Region/ClientStack/LindenUDP/LLClientView.cs   | 22 +++++++++++-----------
 .../Region/Communications/OGS1/OGS1UserServices.cs |  2 +-
 .../Scenes/SceneCommunicationService.cs            |  2 +-
 .../DotNetEngine/Compiler/LSL/lsl.lexer.cs         |  2 +-
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs     |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Region')

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();
 
-- 
cgit v1.1