aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs22
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
5 files changed, 15 insertions, 15 deletions
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
1139 /// <param name="map">heightmap</param> 1139 /// <param name="map">heightmap</param>
1140 /// <param name="px">X coordinate for patches 0..12</param> 1140 /// <param name="px">X coordinate for patches 0..12</param>
1141 /// <param name="py">Y coordinate for patches 0..15</param> 1141 /// <param name="py">Y coordinate for patches 0..15</param>
1142 private void SendLayerPacket(float[] map, int y, int x) 1142 // private void SendLayerPacket(float[] map, int y, int x)
1143 { 1143 // {
1144 int[] patches = new int[4]; 1144 // int[] patches = new int[4];
1145 patches[0] = x + 0 + y * 16; 1145 // patches[0] = x + 0 + y * 16;
1146 patches[1] = x + 1 + y * 16; 1146 // patches[1] = x + 1 + y * 16;
1147 patches[2] = x + 2 + y * 16; 1147 // patches[2] = x + 2 + y * 16;
1148 patches[3] = x + 3 + y * 16; 1148 // patches[3] = x + 3 + y * 16;
1149 1149
1150 Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); 1150 // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
1151 OutPacket(layerpack, ThrottleOutPacketType.Land); 1151 // OutPacket(layerpack, ThrottleOutPacketType.Land);
1152 } 1152 // }
1153 1153
1154 /// <summary> 1154 /// <summary>
1155 /// Sends a specified patch to a client 1155 /// 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
388 } 388 }
389 389
390 390
391 public void clearUserAgent(LLUUID avatarID) 391 public void ClearUserAgent(LLUUID avatarID)
392 { 392 {
393 // TODO: implement 393 // TODO: implement
394 } 394 }
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
664 664
665 public void ClearUserAgent(LLUUID avatarID) 665 public void ClearUserAgent(LLUUID avatarID)
666 { 666 {
667 m_commsProvider.UserService.clearUserAgent(avatarID); 667 m_commsProvider.UserService.ClearUserAgent(avatarID);
668 } 668 }
669 669
670 public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 670 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
18656 case 1020: { } 18656 case 1020: { }
18657 break; 18657 break;
18658 case 1064: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } 18658 case 1064: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
18659 break; 18659 // break;
18660 case 1069: ; 18660 case 1069: ;
18661 break; 18661 break;
18662 case 1073: ; 18662 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
1387 1387
1388 public void ApiResetScript() 1388 public void ApiResetScript()
1389 { 1389 {
1390 bool running = Running; 1390 // bool running = Running;
1391 1391
1392 RemoveState(); 1392 RemoveState();
1393 1393