aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2008-03-18 03:41:05 +0000
committerJeff Ames2008-03-18 03:41:05 +0000
commit9f7639fd6d2d7fd37587223259303377ee15bab4 (patch)
tree686d6d493fda3dd2de2fa83221a1e5500ddcd37a /OpenSim/Region
parentBuilding on Joha's update... (diff)
downloadopensim-SC-9f7639fd6d2d7fd37587223259303377ee15bab4.zip
opensim-SC-9f7639fd6d2d7fd37587223259303377ee15bab4.tar.gz
opensim-SC-9f7639fd6d2d7fd37587223259303377ee15bab4.tar.bz2
opensim-SC-9f7639fd6d2d7fd37587223259303377ee15bab4.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs53
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs1
2 files changed, 6 insertions, 48 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 8e64137..588a8a1 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2705,11 +2705,10 @@ namespace OpenSim.Region.ClientStack
2705 } 2705 }
2706 else 2706 else
2707 { 2707 {
2708 //Need some extra space in case we need to add proxy information to the message later 2708 //Need some extra space in case we need to add proxy information to the message later
2709 Buffer.BlockCopy(sendbuffer, 0, ZeroOutBuffer, 0, sendbuffer.Length); 2709 Buffer.BlockCopy(sendbuffer, 0, ZeroOutBuffer, 0, sendbuffer.Length);
2710 m_networkServer.SendPacketTo(ZeroOutBuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode); 2710 m_networkServer.SendPacketTo(ZeroOutBuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode);
2711 } 2711 }
2712
2713 } 2712 }
2714 catch (Exception e) 2713 catch (Exception e)
2715 { 2714 {
@@ -2749,7 +2748,6 @@ namespace OpenSim.Region.ClientStack
2749 } 2748 }
2750 } 2749 }
2751 2750
2752
2753 // Handle PacketAck packets 2751 // Handle PacketAck packets
2754 if (NewPack.Type == PacketType.PacketAck) 2752 if (NewPack.Type == PacketType.PacketAck)
2755 { 2753 {
@@ -2958,7 +2956,6 @@ namespace OpenSim.Region.ClientStack
2958 handlerRequestAvatarProperties(this, avatarProperties.AgentData.AvatarID); 2956 handlerRequestAvatarProperties(this, avatarProperties.AgentData.AvatarID);
2959 } 2957 }
2960 2958
2961
2962 break; 2959 break;
2963 case PacketType.ChatFromViewer: 2960 case PacketType.ChatFromViewer:
2964 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; 2961 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
@@ -3003,8 +3000,8 @@ namespace OpenSim.Region.ClientStack
3003 UserProfile.profileImage = Properties.ImageID; 3000 UserProfile.profileImage = Properties.ImageID;
3004 3001
3005 handlerUpdateAvatarProperties(this, UserProfile); 3002 handlerUpdateAvatarProperties(this, UserProfile);
3006 } 3003 }
3007 break; 3004 break;
3008 3005
3009 case PacketType.ScriptDialogReply: 3006 case PacketType.ScriptDialogReply:
3010 ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; 3007 ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack;
@@ -3042,8 +3039,6 @@ namespace OpenSim.Region.ClientStack
3042 msgpack.MessageBlock.Position, msgpack.MessageBlock.RegionID, 3039 msgpack.MessageBlock.Position, msgpack.MessageBlock.RegionID,
3043 msgpack.MessageBlock.BinaryBucket); 3040 msgpack.MessageBlock.BinaryBucket);
3044 } 3041 }
3045
3046
3047 break; 3042 break;
3048 3043
3049 case PacketType.AcceptFriendship: 3044 case PacketType.AcceptFriendship:
@@ -3065,10 +3060,6 @@ namespace OpenSim.Region.ClientStack
3065 { 3060 {
3066 handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders); 3061 handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders);
3067 } 3062 }
3068
3069
3070
3071
3072 break; 3063 break;
3073 case PacketType.TerminateFriendship: 3064 case PacketType.TerminateFriendship:
3074 TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack; 3065 TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack;
@@ -3080,8 +3071,6 @@ namespace OpenSim.Region.ClientStack
3080 { 3071 {
3081 handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); 3072 handlerTerminateFriendship(this, listOwnerAgentID, exFriendID);
3082 } 3073 }
3083
3084
3085 break; 3074 break;
3086 case PacketType.RezObject: 3075 case PacketType.RezObject:
3087 RezObjectPacket rezPacket = (RezObjectPacket)Pack; 3076 RezObjectPacket rezPacket = (RezObjectPacket)Pack;
@@ -3107,7 +3096,6 @@ namespace OpenSim.Region.ClientStack
3107 rezPacket.RezData.RezSelected, rezPacket.RezData.RemoveItem, 3096 rezPacket.RezData.RezSelected, rezPacket.RezData.RemoveItem,
3108 rezPacket.RezData.FromTaskID); 3097 rezPacket.RezData.FromTaskID);
3109 } 3098 }
3110
3111 break; 3099 break;
3112 case PacketType.DeRezObject: 3100 case PacketType.DeRezObject:
3113 handlerDeRezObject = OnDeRezObject; 3101 handlerDeRezObject = OnDeRezObject;
@@ -3115,7 +3103,6 @@ namespace OpenSim.Region.ClientStack
3115 { 3103 {
3116 handlerDeRezObject(Pack, this); 3104 handlerDeRezObject(Pack, this);
3117 } 3105 }
3118
3119 break; 3106 break;
3120 case PacketType.ModifyLand: 3107 case PacketType.ModifyLand:
3121 ModifyLandPacket modify = (ModifyLandPacket)Pack; 3108 ModifyLandPacket modify = (ModifyLandPacket)Pack;
@@ -3124,7 +3111,6 @@ namespace OpenSim.Region.ClientStack
3124 { 3111 {
3125 if (OnModifyTerrain != null) 3112 if (OnModifyTerrain != null)
3126 { 3113 {
3127
3128 for (int i = 0; i < modify.ParcelData.Length; i++) 3114 for (int i = 0; i < modify.ParcelData.Length; i++)
3129 { 3115 {
3130 handlerModifyTerrain = OnModifyTerrain; 3116 handlerModifyTerrain = OnModifyTerrain;
@@ -3158,7 +3144,6 @@ namespace OpenSim.Region.ClientStack
3158 handlerRequestWearables(); 3144 handlerRequestWearables();
3159 } 3145 }
3160 3146
3161
3162 handlerRequestAvatarsData = OnRequestAvatarsData; 3147 handlerRequestAvatarsData = OnRequestAvatarsData;
3163 3148
3164 if (handlerRequestAvatarsData != null) 3149 if (handlerRequestAvatarsData != null)
@@ -3166,7 +3151,6 @@ namespace OpenSim.Region.ClientStack
3166 handlerRequestAvatarsData(this); 3151 handlerRequestAvatarsData(this);
3167 } 3152 }
3168 3153
3169
3170 break; 3154 break;
3171 case PacketType.AgentSetAppearance: 3155 case PacketType.AgentSetAppearance:
3172 AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack; 3156 AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
@@ -3196,12 +3180,9 @@ namespace OpenSim.Region.ClientStack
3196 { 3180 {
3197 handlerAvatarNowWearing(this, wearingArgs); 3181 handlerAvatarNowWearing(this, wearingArgs);
3198 } 3182 }
3199
3200
3201 } 3183 }
3202 break; 3184 break;
3203 case PacketType.RezSingleAttachmentFromInv: 3185 case PacketType.RezSingleAttachmentFromInv:
3204
3205 handlerRezSingleAttachment = OnRezSingleAttachmentFromInv; 3186 handlerRezSingleAttachment = OnRezSingleAttachmentFromInv;
3206 if (handlerRezSingleAttachment != null) 3187 if (handlerRezSingleAttachment != null)
3207 { 3188 {
@@ -3212,8 +3193,6 @@ namespace OpenSim.Region.ClientStack
3212 3193
3213 break; 3194 break;
3214 case PacketType.ObjectAttach: 3195 case PacketType.ObjectAttach:
3215
3216
3217 if (OnObjectAttach != null) 3196 if (OnObjectAttach != null)
3218 { 3197 {
3219 ObjectAttachPacket att = (ObjectAttachPacket)Pack; 3198 ObjectAttachPacket att = (ObjectAttachPacket)Pack;
@@ -3234,11 +3213,8 @@ namespace OpenSim.Region.ClientStack
3234 if (handlerSetAlwaysRun != null) 3213 if (handlerSetAlwaysRun != null)
3235 handlerSetAlwaysRun(this, run.AgentData.AlwaysRun); 3214 handlerSetAlwaysRun(this, run.AgentData.AlwaysRun);
3236 3215
3237
3238
3239 break; 3216 break;
3240 case PacketType.CompleteAgentMovement: 3217 case PacketType.CompleteAgentMovement:
3241
3242 handlerCompleteMovementToRegion = OnCompleteMovementToRegion; 3218 handlerCompleteMovementToRegion = OnCompleteMovementToRegion;
3243 if (handlerCompleteMovementToRegion != null) 3219 if (handlerCompleteMovementToRegion != null)
3244 { 3220 {
@@ -3294,7 +3270,7 @@ namespace OpenSim.Region.ClientStack
3294 handlerAgentRequestSit = OnAgentRequestSit; 3270 handlerAgentRequestSit = OnAgentRequestSit;
3295 if (handlerAgentRequestSit != null) 3271 if (handlerAgentRequestSit != null)
3296 handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID, 3272 handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
3297 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); 3273 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
3298 } 3274 }
3299 break; 3275 break;
3300 case PacketType.AgentSit: 3276 case PacketType.AgentSit:
@@ -3590,7 +3566,6 @@ namespace OpenSim.Region.ClientStack
3590 { 3566 {
3591 ObjectPermissionsPacket.ObjectDataBlock permChanges = newobjPerms.ObjectData[i]; 3567 ObjectPermissionsPacket.ObjectDataBlock permChanges = newobjPerms.ObjectData[i];
3592 3568
3593
3594 byte field = permChanges.Field; 3569 byte field = permChanges.Field;
3595 uint localID = permChanges.ObjectLocalID; 3570 uint localID = permChanges.ObjectLocalID;
3596 uint mask = permChanges.Mask; 3571 uint mask = permChanges.Mask;
@@ -3615,14 +3590,12 @@ namespace OpenSim.Region.ClientStack
3615 // Unfortunately, we have to pass the event the packet because objData is an array 3590 // Unfortunately, we have to pass the event the packet because objData is an array
3616 // That means multiple object perms may be updated in a single packet. 3591 // That means multiple object perms may be updated in a single packet.
3617 3592
3618
3619 break; 3593 break;
3620 3594
3621 case PacketType.RequestObjectPropertiesFamily: 3595 case PacketType.RequestObjectPropertiesFamily:
3622 //This powers the little tooltip that appears when you move your mouse over an object 3596 //This powers the little tooltip that appears when you move your mouse over an object
3623 RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack; 3597 RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack;
3624 3598
3625
3626 RequestObjectPropertiesFamilyPacket.ObjectDataBlock packObjBlock = packToolTip.ObjectData; 3599 RequestObjectPropertiesFamilyPacket.ObjectDataBlock packObjBlock = packToolTip.ObjectData;
3627 3600
3628 handlerRequestObjectPropertiesFamily = OnRequestObjectPropertiesFamily; 3601 handlerRequestObjectPropertiesFamily = OnRequestObjectPropertiesFamily;
@@ -3682,7 +3655,6 @@ namespace OpenSim.Region.ClientStack
3682 3655
3683 if (handlerAssetUploadRequest != null) 3656 if (handlerAssetUploadRequest != null)
3684 { 3657 {
3685
3686 handlerAssetUploadRequest(this, temp, 3658 handlerAssetUploadRequest(this, temp,
3687 request.AssetBlock.TransactionID, request.AssetBlock.Type, 3659 request.AssetBlock.TransactionID, request.AssetBlock.Type,
3688 request.AssetBlock.AssetData, request.AssetBlock.StoreLocal, 3660 request.AssetBlock.AssetData, request.AssetBlock.StoreLocal,
@@ -3723,7 +3695,6 @@ namespace OpenSim.Region.ClientStack
3723 handlerCreateInventoryFolder = OnCreateNewInventoryFolder; 3695 handlerCreateInventoryFolder = OnCreateNewInventoryFolder;
3724 if (handlerCreateInventoryFolder != null) 3696 if (handlerCreateInventoryFolder != null)
3725 { 3697 {
3726
3727 handlerCreateInventoryFolder(this, invFolder.FolderData.FolderID, 3698 handlerCreateInventoryFolder(this, invFolder.FolderData.FolderID,
3728 (ushort)invFolder.FolderData.Type, 3699 (ushort)invFolder.FolderData.Type,
3729 Util.FieldToString(invFolder.FolderData.Name), 3700 Util.FieldToString(invFolder.FolderData.Name),
@@ -3810,14 +3781,12 @@ namespace OpenSim.Region.ClientStack
3810 handlerFetchInventoryDescendents = OnFetchInventoryDescendents; 3781 handlerFetchInventoryDescendents = OnFetchInventoryDescendents;
3811 if (handlerFetchInventoryDescendents != null) 3782 if (handlerFetchInventoryDescendents != null)
3812 { 3783 {
3813
3814 handlerFetchInventoryDescendents(this, Fetch.InventoryData.FolderID, Fetch.InventoryData.OwnerID, 3784 handlerFetchInventoryDescendents(this, Fetch.InventoryData.FolderID, Fetch.InventoryData.OwnerID,
3815 Fetch.InventoryData.FetchFolders, Fetch.InventoryData.FetchItems, 3785 Fetch.InventoryData.FetchFolders, Fetch.InventoryData.FetchItems,
3816 Fetch.InventoryData.SortOrder); 3786 Fetch.InventoryData.SortOrder);
3817 } 3787 }
3818 break; 3788 break;
3819 case PacketType.PurgeInventoryDescendents: 3789 case PacketType.PurgeInventoryDescendents:
3820
3821 PurgeInventoryDescendentsPacket Purge = (PurgeInventoryDescendentsPacket)Pack; 3790 PurgeInventoryDescendentsPacket Purge = (PurgeInventoryDescendentsPacket)Pack;
3822 3791
3823 handlerPurgeInventoryDescendents = OnPurgeInventoryDescendents; 3792 handlerPurgeInventoryDescendents = OnPurgeInventoryDescendents;
@@ -4092,7 +4061,6 @@ namespace OpenSim.Region.ClientStack
4092 handlerMoneyBalanceRequest(this, moneybalancerequestpacket.AgentData.AgentID, moneybalancerequestpacket.AgentData.SessionID, moneybalancerequestpacket.MoneyData.TransactionID); 4061 handlerMoneyBalanceRequest(this, moneybalancerequestpacket.AgentData.AgentID, moneybalancerequestpacket.AgentData.SessionID, moneybalancerequestpacket.MoneyData.TransactionID);
4093 } 4062 }
4094 4063
4095
4096 break; 4064 break;
4097 case PacketType.UUIDNameRequest: 4065 case PacketType.UUIDNameRequest:
4098 UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack; 4066 UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
@@ -4249,7 +4217,6 @@ namespace OpenSim.Region.ClientStack
4249 } 4217 }
4250 break; 4218 break;
4251 4219
4252
4253 #endregion 4220 #endregion
4254 4221
4255 #region GodPackets 4222 #region GodPackets
@@ -4274,7 +4241,6 @@ namespace OpenSim.Region.ClientStack
4274 4241
4275 GodKickUserPacket gkupack = (GodKickUserPacket)Pack; 4242 GodKickUserPacket gkupack = (GodKickUserPacket)Pack;
4276 4243
4277
4278 if (gkupack.UserInfo.GodSessionID == SessionId && AgentId == gkupack.UserInfo.GodID) 4244 if (gkupack.UserInfo.GodSessionID == SessionId && AgentId == gkupack.UserInfo.GodID)
4279 { 4245 {
4280 handlerGodKickUser = OnGodKickUser; 4246 handlerGodKickUser = OnGodKickUser;
@@ -4301,12 +4267,10 @@ namespace OpenSim.Region.ClientStack
4301 //OutPacket(kupack, ThrottleOutPacketType.Task); 4267 //OutPacket(kupack, ThrottleOutPacketType.Task);
4302 break; 4268 break;
4303 4269
4304
4305 #endregion 4270 #endregion
4306 4271
4307 #region unimplemented handlers 4272 #region unimplemented handlers
4308 4273
4309
4310 case PacketType.StartPingCheck: 4274 case PacketType.StartPingCheck:
4311 // Send the client the ping response back 4275 // Send the client the ping response back
4312 // Pass the same PingID in the matching packet 4276 // Pass the same PingID in the matching packet
@@ -4354,11 +4318,6 @@ namespace OpenSim.Region.ClientStack
4354 // TODO: handle this packet 4318 // TODO: handle this packet
4355 m_log.Warn("[CLIENT]: unhandled MuteListRequest packet"); 4319 m_log.Warn("[CLIENT]: unhandled MuteListRequest packet");
4356 break; 4320 break;
4357 //case PacketType.AgentDataUpdateRequest:
4358 // TODO: handle this packet
4359 //m_log.Warn("[CLIENT]: unhandled AgentDataUpdateRequest packet");
4360 //break;
4361
4362 case PacketType.ParcelDwellRequest: 4321 case PacketType.ParcelDwellRequest:
4363 // TODO: handle this packet 4322 // TODO: handle this packet
4364 m_log.Warn("[CLIENT]: unhandled ParcelDwellRequest packet"); 4323 m_log.Warn("[CLIENT]: unhandled ParcelDwellRequest packet");
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 6088890..3a7e324 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -246,7 +246,6 @@ namespace OpenSim.Region.Communications.Local
246 246
247 return new InventoryData(AgentInventoryArray, userInventory.InventoryRoot.FolderID); 247 return new InventoryData(AgentInventoryArray, userInventory.InventoryRoot.FolderID);
248 } 248 }
249
250 } 249 }
251 } 250 }
252} 251}