aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-03-02 02:30:28 +0000
committerCharles Krinke2008-03-02 02:30:28 +0000
commit18a058eb84d68cd89fcd249cbc9f6c55a10c10c8 (patch)
treeb620937bc00efa4c8608bf541d7fa920a4c6f90a
parentRename handler050 through handler059 with more (diff)
downloadopensim-SC_OLD-18a058eb84d68cd89fcd249cbc9f6c55a10c10c8.zip
opensim-SC_OLD-18a058eb84d68cd89fcd249cbc9f6c55a10c10c8.tar.gz
opensim-SC_OLD-18a058eb84d68cd89fcd249cbc9f6c55a10c10c8.tar.bz2
opensim-SC_OLD-18a058eb84d68cd89fcd249cbc9f6c55a10c10c8.tar.xz
Rename handler040 through handler049 with more
appropriate names consistent with their user.
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs84
1 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 4e29174..407f424 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -161,16 +161,16 @@ namespace OpenSim.Region.ClientStack
161 private UpdatePrimTexture handler037 = null; 161 private UpdatePrimTexture handler037 = null;
162 private UpdateVector handler038 = null; //OnGrabObject; 162 private UpdateVector handler038 = null; //OnGrabObject;
163 private MoveObject handler039 = null; //OnGrabUpdate; 163 private MoveObject handler039 = null; //OnGrabUpdate;
164 private ObjectSelect handler040 = null; //OnDeGrabObject; 164 private ObjectSelect handlerDeGrabObject = null; //OnDeGrabObject;
165 private GenericCall7 handler041 = null; 165 private GenericCall7 handlerObjectDescription = null;
166 private GenericCall7 handler042 = null; 166 private GenericCall7 handlerObjectName = null;
167 private ObjectPermissions handler043 = null; 167 private ObjectPermissions handlerObjectPermissions = null;
168 private RequestObjectPropertiesFamily handler044 = null; //OnRequestObjectPropertiesFamily; 168 private RequestObjectPropertiesFamily handlerRequestObjectPropertiesFamily = null; //OnRequestObjectPropertiesFamily;
169 private TextureRequest handler045 = null; 169 private TextureRequest handlerTextureRequest = null;
170 private UDPAssetUploadRequest handler046 = null; //OnAssetUploadRequest; 170 private UDPAssetUploadRequest handlerAssetUploadRequest = null; //OnAssetUploadRequest;
171 private RequestXfer handler047 = null; //OnRequestXfer; 171 private RequestXfer handlerRequestXfer = null; //OnRequestXfer;
172 private XferReceive handler048 = null; //OnXferReceive; 172 private XferReceive handlerXferReceive = null; //OnXferReceive;
173 private ConfirmXfer handler049 = null; //OnConfirmXfer; 173 private ConfirmXfer handlerConfirmXfer = null; //OnConfirmXfer;
174 private CreateInventoryFolder handlerCreateInventoryFolder = null; //OnCreateNewInventoryFolder; 174 private CreateInventoryFolder handlerCreateInventoryFolder = null; //OnCreateNewInventoryFolder;
175 private UpdateInventoryFolder handlerUpdateInventoryFolder = null; 175 private UpdateInventoryFolder handlerUpdateInventoryFolder = null;
176 private MoveInventoryFolder handlerMoveInventoryFolder = null; 176 private MoveInventoryFolder handlerMoveInventoryFolder = null;
@@ -3439,23 +3439,23 @@ namespace OpenSim.Region.ClientStack
3439 case PacketType.ObjectDeGrab: 3439 case PacketType.ObjectDeGrab:
3440 ObjectDeGrabPacket deGrab = (ObjectDeGrabPacket)Pack; 3440 ObjectDeGrabPacket deGrab = (ObjectDeGrabPacket)Pack;
3441 3441
3442 handler040 = OnDeGrabObject; 3442 handlerDeGrabObject = OnDeGrabObject;
3443 if (handler040 != null) 3443 if (handlerDeGrabObject != null)
3444 { 3444 {
3445 handler040(deGrab.ObjectData.LocalID, this); 3445 handlerDeGrabObject(deGrab.ObjectData.LocalID, this);
3446 } 3446 }
3447 break; 3447 break;
3448 case PacketType.ObjectDescription: 3448 case PacketType.ObjectDescription:
3449 ObjectDescriptionPacket objDes = (ObjectDescriptionPacket)Pack; 3449 ObjectDescriptionPacket objDes = (ObjectDescriptionPacket)Pack;
3450 3450
3451 handler041 = null; 3451 handlerObjectDescription = null;
3452 3452
3453 for (int i = 0; i < objDes.ObjectData.Length; i++) 3453 for (int i = 0; i < objDes.ObjectData.Length; i++)
3454 { 3454 {
3455 handler041 = OnObjectDescription; 3455 handlerObjectDescription = OnObjectDescription;
3456 if (handler041 != null) 3456 if (handlerObjectDescription != null)
3457 { 3457 {
3458 handler041(this, objDes.ObjectData[i].LocalID, 3458 handlerObjectDescription(this, objDes.ObjectData[i].LocalID,
3459 m_encoding.GetString(objDes.ObjectData[i].Description)); 3459 m_encoding.GetString(objDes.ObjectData[i].Description));
3460 } 3460 }
3461 } 3461 }
@@ -3463,13 +3463,13 @@ namespace OpenSim.Region.ClientStack
3463 case PacketType.ObjectName: 3463 case PacketType.ObjectName:
3464 ObjectNamePacket objName = (ObjectNamePacket)Pack; 3464 ObjectNamePacket objName = (ObjectNamePacket)Pack;
3465 3465
3466 handler042 = null; 3466 handlerObjectName = null;
3467 for (int i = 0; i < objName.ObjectData.Length; i++) 3467 for (int i = 0; i < objName.ObjectData.Length; i++)
3468 { 3468 {
3469 handler042 = OnObjectName; 3469 handlerObjectName = OnObjectName;
3470 if (handler042 != null) 3470 if (handlerObjectName != null)
3471 { 3471 {
3472 handler042(this, objName.ObjectData[i].LocalID, 3472 handlerObjectName(this, objName.ObjectData[i].LocalID,
3473 m_encoding.GetString(objName.ObjectData[i].Name)); 3473 m_encoding.GetString(objName.ObjectData[i].Name));
3474 } 3474 }
3475 } 3475 }
@@ -3482,7 +3482,7 @@ namespace OpenSim.Region.ClientStack
3482 LLUUID AgentID = newobjPerms.AgentData.AgentID; 3482 LLUUID AgentID = newobjPerms.AgentData.AgentID;
3483 LLUUID SessionID = newobjPerms.AgentData.SessionID; 3483 LLUUID SessionID = newobjPerms.AgentData.SessionID;
3484 3484
3485 handler043 = null; 3485 handlerObjectPermissions = null;
3486 3486
3487 for (int i = 0; i < newobjPerms.ObjectData.Length; i++) 3487 for (int i = 0; i < newobjPerms.ObjectData.Length; i++)
3488 { 3488 {
@@ -3494,9 +3494,9 @@ namespace OpenSim.Region.ClientStack
3494 uint mask = permChanges.Mask; 3494 uint mask = permChanges.Mask;
3495 byte set = permChanges.Set; 3495 byte set = permChanges.Set;
3496 3496
3497 handler043 = OnObjectPermissions; 3497 handlerObjectPermissions = OnObjectPermissions;
3498 3498
3499 if (handler043 != null) 3499 if (handlerObjectPermissions != null)
3500 OnObjectPermissions(this, AgentID, SessionID, field, localID, mask, set); 3500 OnObjectPermissions(this, AgentID, SessionID, field, localID, mask, set);
3501 } 3501 }
3502 } 3502 }
@@ -3523,11 +3523,11 @@ namespace OpenSim.Region.ClientStack
3523 3523
3524 RequestObjectPropertiesFamilyPacket.ObjectDataBlock packObjBlock = packToolTip.ObjectData; 3524 RequestObjectPropertiesFamilyPacket.ObjectDataBlock packObjBlock = packToolTip.ObjectData;
3525 3525
3526 handler044 = OnRequestObjectPropertiesFamily; 3526 handlerRequestObjectPropertiesFamily = OnRequestObjectPropertiesFamily;
3527 3527
3528 if (handler044 != null) 3528 if (handlerRequestObjectPropertiesFamily != null)
3529 { 3529 {
3530 handler044(this, m_agentId, packObjBlock.RequestFlags, 3530 handlerRequestObjectPropertiesFamily(this, m_agentId, packObjBlock.RequestFlags,
3531 packObjBlock.ObjectID); 3531 packObjBlock.ObjectID);
3532 } 3532 }
3533 3533
@@ -3541,7 +3541,7 @@ namespace OpenSim.Region.ClientStack
3541 RequestImagePacket imageRequest = (RequestImagePacket)Pack; 3541 RequestImagePacket imageRequest = (RequestImagePacket)Pack;
3542 //Console.WriteLine("image request: " + Pack.ToString()); 3542 //Console.WriteLine("image request: " + Pack.ToString());
3543 3543
3544 handler045 = null; 3544 handlerTextureRequest = null;
3545 3545
3546 for (int i = 0; i < imageRequest.RequestImage.Length; i++) 3546 for (int i = 0; i < imageRequest.RequestImage.Length; i++)
3547 { 3547 {
@@ -3553,9 +3553,9 @@ namespace OpenSim.Region.ClientStack
3553 args.PacketNumber = imageRequest.RequestImage[i].Packet; 3553 args.PacketNumber = imageRequest.RequestImage[i].Packet;
3554 args.Priority = imageRequest.RequestImage[i].DownloadPriority; 3554 args.Priority = imageRequest.RequestImage[i].DownloadPriority;
3555 3555
3556 handler045 = OnRequestTexture; 3556 handlerTextureRequest = OnRequestTexture;
3557 3557
3558 if (handler045 != null) 3558 if (handlerTextureRequest != null)
3559 OnRequestTexture(this, args); 3559 OnRequestTexture(this, args);
3560 } 3560 }
3561 } 3561 }
@@ -3576,12 +3576,12 @@ namespace OpenSim.Region.ClientStack
3576 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString()); 3576 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString());
3577 LLUUID temp = LLUUID.Combine(request.AssetBlock.TransactionID, SecureSessionId); 3577 LLUUID temp = LLUUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);
3578 3578
3579 handler046 = OnAssetUploadRequest; 3579 handlerAssetUploadRequest = OnAssetUploadRequest;
3580 3580
3581 if (handler046 != null) 3581 if (handlerAssetUploadRequest != null)
3582 { 3582 {
3583 3583
3584 handler046(this, temp, 3584 handlerAssetUploadRequest(this, temp,
3585 request.AssetBlock.TransactionID, request.AssetBlock.Type, 3585 request.AssetBlock.TransactionID, request.AssetBlock.Type,
3586 request.AssetBlock.AssetData, request.AssetBlock.StoreLocal, 3586 request.AssetBlock.AssetData, request.AssetBlock.StoreLocal,
3587 request.AssetBlock.Tempfile); 3587 request.AssetBlock.Tempfile);
@@ -3590,29 +3590,29 @@ namespace OpenSim.Region.ClientStack
3590 case PacketType.RequestXfer: 3590 case PacketType.RequestXfer:
3591 RequestXferPacket xferReq = (RequestXferPacket)Pack; 3591 RequestXferPacket xferReq = (RequestXferPacket)Pack;
3592 3592
3593 handler047 = OnRequestXfer; 3593 handlerRequestXfer = OnRequestXfer;
3594 3594
3595 if (handler047 != null) 3595 if (handlerRequestXfer != null)
3596 { 3596 {
3597 handler047(this, xferReq.XferID.ID, Util.FieldToString(xferReq.XferID.Filename)); 3597 handlerRequestXfer(this, xferReq.XferID.ID, Util.FieldToString(xferReq.XferID.Filename));
3598 } 3598 }
3599 break; 3599 break;
3600 case PacketType.SendXferPacket: 3600 case PacketType.SendXferPacket:
3601 SendXferPacketPacket xferRec = (SendXferPacketPacket)Pack; 3601 SendXferPacketPacket xferRec = (SendXferPacketPacket)Pack;
3602 3602
3603 handler048 = OnXferReceive; 3603 handlerXferReceive = OnXferReceive;
3604 if (handler048 != null) 3604 if (handlerXferReceive != null)
3605 { 3605 {
3606 handler048(this, xferRec.XferID.ID, xferRec.XferID.Packet, xferRec.DataPacket.Data); 3606 handlerXferReceive(this, xferRec.XferID.ID, xferRec.XferID.Packet, xferRec.DataPacket.Data);
3607 } 3607 }
3608 break; 3608 break;
3609 case PacketType.ConfirmXferPacket: 3609 case PacketType.ConfirmXferPacket:
3610 ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack; 3610 ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack;
3611 3611
3612 handler049 = OnConfirmXfer; 3612 handlerConfirmXfer = OnConfirmXfer;
3613 if (handler049 != null) 3613 if (handlerConfirmXfer != null)
3614 { 3614 {
3615 handler049(this, confirmXfer.XferID.ID, confirmXfer.XferID.Packet); 3615 handlerConfirmXfer(this, confirmXfer.XferID.ID, confirmXfer.XferID.Packet);
3616 } 3616 }
3617 break; 3617 break;
3618 case PacketType.CreateInventoryFolder: 3618 case PacketType.CreateInventoryFolder: