diff options
| author | Melanie | 2012-10-31 21:42:06 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-31 21:42:06 +0000 |
| commit | a2c60943240ad9af8fe2bd86d990f36fc26930ee (patch) | |
| tree | 15585e94e32082d7ac74bb341d82ce6bcccb8a57 /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Also add the additional ScriptException constructor necessary to get [Seriali... (diff) | |
| download | opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.zip opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.gz opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.bz2 opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 3c65647..1f6af4a 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -5314,8 +5314,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 5314 | AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate, false); | 5314 | AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate, false); |
| 5315 | AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest, false); | 5315 | AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest, false); |
| 5316 | AddLocalPacketHandler(PacketType.ParcelBuy, HandleParcelBuyRequest, false); | 5316 | AddLocalPacketHandler(PacketType.ParcelBuy, HandleParcelBuyRequest, false); |
| 5317 | AddLocalPacketHandler(PacketType.UUIDGroupNameRequest, HandleUUIDGroupNameRequest, false); | 5317 | AddLocalPacketHandler(PacketType.UUIDGroupNameRequest, HandleUUIDGroupNameRequest); |
| 5318 | AddLocalPacketHandler(PacketType.ObjectGroup, HandleObjectGroupRequest, false); | 5318 | AddLocalPacketHandler(PacketType.ObjectGroup, HandleObjectGroupRequest); |
| 5319 | AddLocalPacketHandler(PacketType.GenericMessage, HandleGenericMessage); | 5319 | AddLocalPacketHandler(PacketType.GenericMessage, HandleGenericMessage); |
| 5320 | AddLocalPacketHandler(PacketType.AvatarPropertiesRequest, HandleAvatarPropertiesRequest); | 5320 | AddLocalPacketHandler(PacketType.AvatarPropertiesRequest, HandleAvatarPropertiesRequest); |
| 5321 | AddLocalPacketHandler(PacketType.ChatFromViewer, HandleChatFromViewer); | 5321 | AddLocalPacketHandler(PacketType.ChatFromViewer, HandleChatFromViewer); |