diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index d20a84f..6c1d14a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -823,7 +823,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
823 | // Column | 823 | // Column |
824 | for (int j = y1 + 1; j <= y2; j++) | 824 | for (int j = y1 + 1; j <= y2; j++) |
825 | SendLayerData(x2, j, map); | 825 | SendLayerData(x2, j, map); |
826 | 826 | ||
827 | if (x2 - x1 > 0) | 827 | if (x2 - x1 > 0) |
828 | SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2); | 828 | SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2); |
829 | } | 829 | } |
@@ -1281,10 +1281,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1281 | // | 1281 | // |
1282 | if (totalItems == 0 && totalFolders == 0) | 1282 | if (totalItems == 0 && totalFolders == 0) |
1283 | currentPacket = CreateInventoryDescendentsPacket(ownerID, folderID, version, items.Count + folders.Count, 0, 0); | 1283 | currentPacket = CreateInventoryDescendentsPacket(ownerID, folderID, version, items.Count + folders.Count, 0, 0); |
1284 | 1284 | ||
1285 | // To preserve SL compatibility, we will NOT combine folders and items in one packet | 1285 | // To preserve SL compatibility, we will NOT combine folders and items in one packet |
1286 | // | 1286 | // |
1287 | while(itemsSent < totalItems || foldersSent < totalFolders) | 1287 | while (itemsSent < totalItems || foldersSent < totalFolders) |
1288 | { | 1288 | { |
1289 | if (currentPacket == null) // Start a new packet | 1289 | if (currentPacket == null) // Start a new packet |
1290 | { | 1290 | { |
@@ -1304,7 +1304,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1304 | 1304 | ||
1305 | if (foldersToSend-- > 0) | 1305 | if (foldersToSend-- > 0) |
1306 | currentPacket.FolderData[foldersSent % MAX_FOLDERS_PER_PACKET] = CreateFolderDataBlock(folders[foldersSent++]); | 1306 | currentPacket.FolderData[foldersSent % MAX_FOLDERS_PER_PACKET] = CreateFolderDataBlock(folders[foldersSent++]); |
1307 | else if(itemsToSend-- > 0) | 1307 | else if (itemsToSend-- > 0) |
1308 | currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]); | 1308 | currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]); |
1309 | else | 1309 | else |
1310 | { | 1310 | { |
@@ -2058,7 +2058,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2058 | packet.AgentData.SessionID = SessionId; | 2058 | packet.AgentData.SessionID = SessionId; |
2059 | 2059 | ||
2060 | packet.Effect = effectBlocks; | 2060 | packet.Effect = effectBlocks; |
2061 | 2061 | ||
2062 | OutPacket(packet, ThrottleOutPacketType.State); | 2062 | OutPacket(packet, ThrottleOutPacketType.State); |
2063 | } | 2063 | } |
2064 | 2064 | ||
@@ -2757,7 +2757,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2757 | } | 2757 | } |
2758 | llsd.Add("GroupData", GroupData); | 2758 | llsd.Add("GroupData", GroupData); |
2759 | llsd.Add("NewGroupData", NewGroupData); | 2759 | llsd.Add("NewGroupData", NewGroupData); |
2760 | 2760 | ||
2761 | IEventQueue eq = this.Scene.RequestModuleInterface<IEventQueue>(); | 2761 | IEventQueue eq = this.Scene.RequestModuleInterface<IEventQueue>(); |
2762 | if (eq != null) | 2762 | if (eq != null) |
2763 | { | 2763 | { |
@@ -5752,8 +5752,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5752 | return; | 5752 | return; |
5753 | } | 5753 | } |
5754 | 5754 | ||
5755 | |||
5756 | |||
5757 | // Main packet processing conditional | 5755 | // Main packet processing conditional |
5758 | switch (Pack.Type) | 5756 | switch (Pack.Type) |
5759 | { | 5757 | { |
@@ -5779,7 +5777,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5779 | } | 5777 | } |
5780 | 5778 | ||
5781 | break; | 5779 | break; |
5782 | 5780 | ||
5783 | case PacketType.ChatFromViewer: | 5781 | case PacketType.ChatFromViewer: |
5784 | ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; | 5782 | ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; |
5785 | 5783 | ||
@@ -5818,7 +5816,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5818 | handlerChatFromClient(this, args); | 5816 | handlerChatFromClient(this, args); |
5819 | } | 5817 | } |
5820 | break; | 5818 | break; |
5821 | 5819 | ||
5822 | case PacketType.AvatarPropertiesUpdate: | 5820 | case PacketType.AvatarPropertiesUpdate: |
5823 | AvatarPropertiesUpdatePacket avatarProps = (AvatarPropertiesUpdatePacket)Pack; | 5821 | AvatarPropertiesUpdatePacket avatarProps = (AvatarPropertiesUpdatePacket)Pack; |
5824 | 5822 | ||
@@ -5846,7 +5844,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5846 | handlerUpdateAvatarProperties(this, UserProfile); | 5844 | handlerUpdateAvatarProperties(this, UserProfile); |
5847 | } | 5845 | } |
5848 | break; | 5846 | break; |
5849 | 5847 | ||
5850 | case PacketType.ScriptDialogReply: | 5848 | case PacketType.ScriptDialogReply: |
5851 | ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; | 5849 | ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; |
5852 | 5850 | ||
@@ -5877,7 +5875,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5877 | } | 5875 | } |
5878 | 5876 | ||
5879 | break; | 5877 | break; |
5880 | 5878 | ||
5881 | case PacketType.ImprovedInstantMessage: | 5879 | case PacketType.ImprovedInstantMessage: |
5882 | ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack; | 5880 | ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack; |
5883 | 5881 | ||
@@ -5911,7 +5909,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5911 | handlerInstantMessage(this, im); | 5909 | handlerInstantMessage(this, im); |
5912 | } | 5910 | } |
5913 | break; | 5911 | break; |
5914 | 5912 | ||
5915 | case PacketType.AcceptFriendship: | 5913 | case PacketType.AcceptFriendship: |
5916 | AcceptFriendshipPacket afriendpack = (AcceptFriendshipPacket)Pack; | 5914 | AcceptFriendshipPacket afriendpack = (AcceptFriendshipPacket)Pack; |
5917 | 5915 | ||
@@ -5984,7 +5982,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5984 | handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); | 5982 | handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); |
5985 | } | 5983 | } |
5986 | break; | 5984 | break; |
5987 | 5985 | ||
5988 | case PacketType.RezObject: | 5986 | case PacketType.RezObject: |
5989 | RezObjectPacket rezPacket = (RezObjectPacket)Pack; | 5987 | RezObjectPacket rezPacket = (RezObjectPacket)Pack; |
5990 | 5988 | ||
@@ -6039,7 +6037,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6039 | 6037 | ||
6040 | } | 6038 | } |
6041 | break; | 6039 | break; |
6042 | 6040 | ||
6043 | case PacketType.ModifyLand: | 6041 | case PacketType.ModifyLand: |
6044 | ModifyLandPacket modify = (ModifyLandPacket)Pack; | 6042 | ModifyLandPacket modify = (ModifyLandPacket)Pack; |
6045 | 6043 | ||
@@ -6203,7 +6201,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6203 | } | 6201 | } |
6204 | 6202 | ||
6205 | break; | 6203 | break; |
6206 | 6204 | ||
6207 | case PacketType.DetachAttachmentIntoInv: | 6205 | case PacketType.DetachAttachmentIntoInv: |
6208 | UUIDNameRequest handlerDetachAttachmentIntoInv = OnDetachAttachmentIntoInv; | 6206 | UUIDNameRequest handlerDetachAttachmentIntoInv = OnDetachAttachmentIntoInv; |
6209 | if (handlerDetachAttachmentIntoInv != null) | 6207 | if (handlerDetachAttachmentIntoInv != null) |
@@ -6311,7 +6309,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6311 | handlerSetAlwaysRun(this, run.AgentData.AlwaysRun); | 6309 | handlerSetAlwaysRun(this, run.AgentData.AlwaysRun); |
6312 | 6310 | ||
6313 | break; | 6311 | break; |
6314 | 6312 | ||
6315 | case PacketType.CompleteAgentMovement: | 6313 | case PacketType.CompleteAgentMovement: |
6316 | GenericCall2 handlerCompleteMovementToRegion = OnCompleteMovementToRegion; | 6314 | GenericCall2 handlerCompleteMovementToRegion = OnCompleteMovementToRegion; |
6317 | if (handlerCompleteMovementToRegion != null) | 6315 | if (handlerCompleteMovementToRegion != null) |
@@ -10479,7 +10477,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10479 | Utils.BytesToString(avatarInterestUpdate.PropertiesData.SkillsText), | 10477 | Utils.BytesToString(avatarInterestUpdate.PropertiesData.SkillsText), |
10480 | Utils.BytesToString(avatarInterestUpdate.PropertiesData.LanguagesText)); | 10478 | Utils.BytesToString(avatarInterestUpdate.PropertiesData.LanguagesText)); |
10481 | break; | 10479 | break; |
10482 | 10480 | ||
10483 | case PacketType.GrantUserRights: | 10481 | case PacketType.GrantUserRights: |
10484 | GrantUserRightsPacket GrantUserRights = | 10482 | GrantUserRightsPacket GrantUserRights = |
10485 | (GrantUserRightsPacket)Pack; | 10483 | (GrantUserRightsPacket)Pack; |
@@ -10498,7 +10496,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10498 | GrantUserRights.Rights[0].AgentRelated, | 10496 | GrantUserRights.Rights[0].AgentRelated, |
10499 | GrantUserRights.Rights[0].RelatedRights); | 10497 | GrantUserRights.Rights[0].RelatedRights); |
10500 | break; | 10498 | break; |
10501 | 10499 | ||
10502 | case PacketType.PlacesQuery: | 10500 | case PacketType.PlacesQuery: |
10503 | PlacesQueryPacket placesQueryPacket = | 10501 | PlacesQueryPacket placesQueryPacket = |
10504 | (PlacesQueryPacket)Pack; | 10502 | (PlacesQueryPacket)Pack; |