aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-07-15 12:34:10 -0700
committerDiva Canto2013-07-15 12:34:10 -0700
commit68fbf7eebb12bcd22c3e3308a838c5c2e9b1c47f (patch)
tree5551480ec07c8123ceb0feff21018cbed2bcba25 /OpenSim
parentGuard against null ref (diff)
downloadopensim-SC_OLD-68fbf7eebb12bcd22c3e3308a838c5c2e9b1c47f.zip
opensim-SC_OLD-68fbf7eebb12bcd22c3e3308a838c5c2e9b1c47f.tar.gz
opensim-SC_OLD-68fbf7eebb12bcd22c3e3308a838c5c2e9b1c47f.tar.bz2
opensim-SC_OLD-68fbf7eebb12bcd22c3e3308a838c5c2e9b1c47f.tar.xz
Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt"
This reverts commit b060ce96d93a33298b59392210af4d336e0d171b.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f57e069..79c80a7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5373,7 +5373,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5373 AddLocalPacketHandler(PacketType.ScriptAnswerYes, HandleScriptAnswerYes, false); 5373 AddLocalPacketHandler(PacketType.ScriptAnswerYes, HandleScriptAnswerYes, false);
5374 AddLocalPacketHandler(PacketType.ObjectClickAction, HandleObjectClickAction, false); 5374 AddLocalPacketHandler(PacketType.ObjectClickAction, HandleObjectClickAction, false);
5375 AddLocalPacketHandler(PacketType.ObjectMaterial, HandleObjectMaterial, false); 5375 AddLocalPacketHandler(PacketType.ObjectMaterial, HandleObjectMaterial, false);
5376 AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage); 5376 AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage, false);
5377 AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest, false); 5377 AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest, false);
5378 AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest); 5378 AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest);
5379 AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer); 5379 AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer);