aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs5
2 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 42ca4b7..6148fc5 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -3476,11 +3476,11 @@ namespace OpenSim.Region.ClientStack
3476 // Send the client the ping response back 3476 // Send the client the ping response back
3477 // Pass the same PingID in the matching packet 3477 // Pass the same PingID in the matching packet
3478 // Handled In the packet processing 3478 // Handled In the packet processing
3479 MainLog.Instance.Debug("CLIENT", "possibly unhandled StartPingCheck packet"); 3479 //MainLog.Instance.Debug("CLIENT", "possibly unhandled StartPingCheck packet");
3480 break; 3480 break;
3481 case PacketType.CompletePingCheck: 3481 case PacketType.CompletePingCheck:
3482 // TODO: Perhaps this should be processed on the Sim to determine whether or not to drop a dead client 3482 // TODO: Perhaps this should be processed on the Sim to determine whether or not to drop a dead client
3483 MainLog.Instance.Warn("CLIENT", "unhandled CompletePingCheck packet"); 3483 //MainLog.Instance.Warn("CLIENT", "unhandled CompletePingCheck packet");
3484 break; 3484 break;
3485 case PacketType.ObjectScale: 3485 case PacketType.ObjectScale:
3486 // TODO: handle this packet 3486 // TODO: handle this packet
@@ -3530,7 +3530,7 @@ namespace OpenSim.Region.ClientStack
3530 break; 3530 break;
3531 case PacketType.UseCircuitCode: 3531 case PacketType.UseCircuitCode:
3532 // TODO: handle this packet 3532 // TODO: handle this packet
3533 MainLog.Instance.Warn("CLIENT", "unhandled UseCircuitCode packet"); 3533 //MainLog.Instance.Warn("CLIENT", "unhandled UseCircuitCode packet");
3534 break; 3534 break;
3535 case PacketType.EconomyDataRequest: 3535 case PacketType.EconomyDataRequest:
3536 // TODO: handle this packet 3536 // TODO: handle this packet
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 0a8df98..215d30d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1406,7 +1406,10 @@ namespace OpenSim.Region.Environment.Scenes
1406 "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + 1406 "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() +
1407 "/CAPS/" + agent.CapsPath + "0000/"); 1407 "/CAPS/" + agent.CapsPath + "0000/");
1408 cap.RegisterHandlers(); 1408 cap.RegisterHandlers();
1409 1409 if (agent.child)
1410 {
1411
1412 }
1410 cap.AddNewInventoryItem = AddInventoryItem; 1413 cap.AddNewInventoryItem = AddInventoryItem;
1411 cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset; 1414 cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset;
1412 cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset; 1415 cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset;