OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename handler040 through handler049 with more 

appropriate names consistent with their user.
0.6.0-stable
Charles Krinke 2008-03-02 02:30:28 +00:00
parent 21f3661077
commit 18a058eb84
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -161,16 +161,16 @@ namespace OpenSim.Region.ClientStack
private UpdatePrimTexture handler037 = null; private UpdatePrimTexture handler037 = null;
private UpdateVector handler038 = null; //OnGrabObject; private UpdateVector handler038 = null; //OnGrabObject;
private MoveObject handler039 = null; //OnGrabUpdate; private MoveObject handler039 = null; //OnGrabUpdate;
private ObjectSelect handler040 = null; //OnDeGrabObject; private ObjectSelect handlerDeGrabObject = null; //OnDeGrabObject;
private GenericCall7 handler041 = null; private GenericCall7 handlerObjectDescription = null;
private GenericCall7 handler042 = null; private GenericCall7 handlerObjectName = null;
private ObjectPermissions handler043 = null; private ObjectPermissions handlerObjectPermissions = null;
private RequestObjectPropertiesFamily handler044 = null; //OnRequestObjectPropertiesFamily; private RequestObjectPropertiesFamily handlerRequestObjectPropertiesFamily = null; //OnRequestObjectPropertiesFamily;
private TextureRequest handler045 = null; private TextureRequest handlerTextureRequest = null;
private UDPAssetUploadRequest handler046 = null; //OnAssetUploadRequest; private UDPAssetUploadRequest handlerAssetUploadRequest = null; //OnAssetUploadRequest;
private RequestXfer handler047 = null; //OnRequestXfer; private RequestXfer handlerRequestXfer = null; //OnRequestXfer;
private XferReceive handler048 = null; //OnXferReceive; private XferReceive handlerXferReceive = null; //OnXferReceive;
private ConfirmXfer handler049 = null; //OnConfirmXfer; private ConfirmXfer handlerConfirmXfer = null; //OnConfirmXfer;
private CreateInventoryFolder handlerCreateInventoryFolder = null; //OnCreateNewInventoryFolder; private CreateInventoryFolder handlerCreateInventoryFolder = null; //OnCreateNewInventoryFolder;
private UpdateInventoryFolder handlerUpdateInventoryFolder = null; private UpdateInventoryFolder handlerUpdateInventoryFolder = null;
private MoveInventoryFolder handlerMoveInventoryFolder = null; private MoveInventoryFolder handlerMoveInventoryFolder = null;
@ -3439,23 +3439,23 @@ namespace OpenSim.Region.ClientStack
case PacketType.ObjectDeGrab: case PacketType.ObjectDeGrab:
ObjectDeGrabPacket deGrab = (ObjectDeGrabPacket)Pack; ObjectDeGrabPacket deGrab = (ObjectDeGrabPacket)Pack;
handler040 = OnDeGrabObject; handlerDeGrabObject = OnDeGrabObject;
if (handler040 != null) if (handlerDeGrabObject != null)
{ {
handler040(deGrab.ObjectData.LocalID, this); handlerDeGrabObject(deGrab.ObjectData.LocalID, this);
} }
break; break;
case PacketType.ObjectDescription: case PacketType.ObjectDescription:
ObjectDescriptionPacket objDes = (ObjectDescriptionPacket)Pack; ObjectDescriptionPacket objDes = (ObjectDescriptionPacket)Pack;
handler041 = null; handlerObjectDescription = null;
for (int i = 0; i < objDes.ObjectData.Length; i++) for (int i = 0; i < objDes.ObjectData.Length; i++)
{ {
handler041 = OnObjectDescription; handlerObjectDescription = OnObjectDescription;
if (handler041 != null) if (handlerObjectDescription != null)
{ {
handler041(this, objDes.ObjectData[i].LocalID, handlerObjectDescription(this, objDes.ObjectData[i].LocalID,
m_encoding.GetString(objDes.ObjectData[i].Description)); m_encoding.GetString(objDes.ObjectData[i].Description));
} }
} }
@ -3463,13 +3463,13 @@ namespace OpenSim.Region.ClientStack
case PacketType.ObjectName: case PacketType.ObjectName:
ObjectNamePacket objName = (ObjectNamePacket)Pack; ObjectNamePacket objName = (ObjectNamePacket)Pack;
handler042 = null; handlerObjectName = null;
for (int i = 0; i < objName.ObjectData.Length; i++) for (int i = 0; i < objName.ObjectData.Length; i++)
{ {
handler042 = OnObjectName; handlerObjectName = OnObjectName;
if (handler042 != null) if (handlerObjectName != null)
{ {
handler042(this, objName.ObjectData[i].LocalID, handlerObjectName(this, objName.ObjectData[i].LocalID,
m_encoding.GetString(objName.ObjectData[i].Name)); m_encoding.GetString(objName.ObjectData[i].Name));
} }
} }
@ -3482,7 +3482,7 @@ namespace OpenSim.Region.ClientStack
LLUUID AgentID = newobjPerms.AgentData.AgentID; LLUUID AgentID = newobjPerms.AgentData.AgentID;
LLUUID SessionID = newobjPerms.AgentData.SessionID; LLUUID SessionID = newobjPerms.AgentData.SessionID;
handler043 = null; handlerObjectPermissions = null;
for (int i = 0; i < newobjPerms.ObjectData.Length; i++) for (int i = 0; i < newobjPerms.ObjectData.Length; i++)
{ {
@ -3494,9 +3494,9 @@ namespace OpenSim.Region.ClientStack
uint mask = permChanges.Mask; uint mask = permChanges.Mask;
byte set = permChanges.Set; byte set = permChanges.Set;
handler043 = OnObjectPermissions; handlerObjectPermissions = OnObjectPermissions;
if (handler043 != null) if (handlerObjectPermissions != null)
OnObjectPermissions(this, AgentID, SessionID, field, localID, mask, set); OnObjectPermissions(this, AgentID, SessionID, field, localID, mask, set);
} }
} }
@ -3523,11 +3523,11 @@ namespace OpenSim.Region.ClientStack
RequestObjectPropertiesFamilyPacket.ObjectDataBlock packObjBlock = packToolTip.ObjectData; RequestObjectPropertiesFamilyPacket.ObjectDataBlock packObjBlock = packToolTip.ObjectData;
handler044 = OnRequestObjectPropertiesFamily; handlerRequestObjectPropertiesFamily = OnRequestObjectPropertiesFamily;
if (handler044 != null) if (handlerRequestObjectPropertiesFamily != null)
{ {
handler044(this, m_agentId, packObjBlock.RequestFlags, handlerRequestObjectPropertiesFamily(this, m_agentId, packObjBlock.RequestFlags,
packObjBlock.ObjectID); packObjBlock.ObjectID);
} }
@ -3541,7 +3541,7 @@ namespace OpenSim.Region.ClientStack
RequestImagePacket imageRequest = (RequestImagePacket)Pack; RequestImagePacket imageRequest = (RequestImagePacket)Pack;
//Console.WriteLine("image request: " + Pack.ToString()); //Console.WriteLine("image request: " + Pack.ToString());
handler045 = null; handlerTextureRequest = null;
for (int i = 0; i < imageRequest.RequestImage.Length; i++) for (int i = 0; i < imageRequest.RequestImage.Length; i++)
{ {
@ -3553,9 +3553,9 @@ namespace OpenSim.Region.ClientStack
args.PacketNumber = imageRequest.RequestImage[i].Packet; args.PacketNumber = imageRequest.RequestImage[i].Packet;
args.Priority = imageRequest.RequestImage[i].DownloadPriority; args.Priority = imageRequest.RequestImage[i].DownloadPriority;
handler045 = OnRequestTexture; handlerTextureRequest = OnRequestTexture;
if (handler045 != null) if (handlerTextureRequest != null)
OnRequestTexture(this, args); OnRequestTexture(this, args);
} }
} }
@ -3576,12 +3576,12 @@ namespace OpenSim.Region.ClientStack
// Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString()); // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString());
LLUUID temp = LLUUID.Combine(request.AssetBlock.TransactionID, SecureSessionId); LLUUID temp = LLUUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);
handler046 = OnAssetUploadRequest; handlerAssetUploadRequest = OnAssetUploadRequest;
if (handler046 != null) if (handlerAssetUploadRequest != null)
{ {
handler046(this, temp, handlerAssetUploadRequest(this, temp,
request.AssetBlock.TransactionID, request.AssetBlock.Type, request.AssetBlock.TransactionID, request.AssetBlock.Type,
request.AssetBlock.AssetData, request.AssetBlock.StoreLocal, request.AssetBlock.AssetData, request.AssetBlock.StoreLocal,
request.AssetBlock.Tempfile); request.AssetBlock.Tempfile);
@ -3590,29 +3590,29 @@ namespace OpenSim.Region.ClientStack
case PacketType.RequestXfer: case PacketType.RequestXfer:
RequestXferPacket xferReq = (RequestXferPacket)Pack; RequestXferPacket xferReq = (RequestXferPacket)Pack;
handler047 = OnRequestXfer; handlerRequestXfer = OnRequestXfer;
if (handler047 != null) if (handlerRequestXfer != null)
{ {
handler047(this, xferReq.XferID.ID, Util.FieldToString(xferReq.XferID.Filename)); handlerRequestXfer(this, xferReq.XferID.ID, Util.FieldToString(xferReq.XferID.Filename));
} }
break; break;
case PacketType.SendXferPacket: case PacketType.SendXferPacket:
SendXferPacketPacket xferRec = (SendXferPacketPacket)Pack; SendXferPacketPacket xferRec = (SendXferPacketPacket)Pack;
handler048 = OnXferReceive; handlerXferReceive = OnXferReceive;
if (handler048 != null) if (handlerXferReceive != null)
{ {
handler048(this, xferRec.XferID.ID, xferRec.XferID.Packet, xferRec.DataPacket.Data); handlerXferReceive(this, xferRec.XferID.ID, xferRec.XferID.Packet, xferRec.DataPacket.Data);
} }
break; break;
case PacketType.ConfirmXferPacket: case PacketType.ConfirmXferPacket:
ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack; ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack;
handler049 = OnConfirmXfer; handlerConfirmXfer = OnConfirmXfer;
if (handler049 != null) if (handlerConfirmXfer != null)
{ {
handler049(this, confirmXfer.XferID.ID, confirmXfer.XferID.Packet); handlerConfirmXfer(this, confirmXfer.XferID.ID, confirmXfer.XferID.Packet);
} }
break; break;
case PacketType.CreateInventoryFolder: case PacketType.CreateInventoryFolder: