diff options
author | Charles Krinke | 2008-03-02 02:47:34 +0000 |
---|---|---|
committer | Charles Krinke | 2008-03-02 02:47:34 +0000 |
commit | 7a0e1a8c344a71d0f8647abeaed07037b75d50db (patch) | |
tree | e6205e8b4737fecda38ebb640c50a1932cdcd87f /OpenSim/Region/ClientStack/ClientView.cs | |
parent | Rename handler040 through handler049 with more (diff) | |
download | opensim-SC-7a0e1a8c344a71d0f8647abeaed07037b75d50db.zip opensim-SC-7a0e1a8c344a71d0f8647abeaed07037b75d50db.tar.gz opensim-SC-7a0e1a8c344a71d0f8647abeaed07037b75d50db.tar.bz2 opensim-SC-7a0e1a8c344a71d0f8647abeaed07037b75d50db.tar.xz |
Rename handler030 through handler038 with more
appropriate names consisten with their use.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 407f424..5037557 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -151,16 +151,16 @@ namespace OpenSim.Region.ClientStack | |||
151 | private TeleportLocationRequest handler027 = null; //OnSetStartLocationRequest; | 151 | private TeleportLocationRequest handler027 = null; //OnSetStartLocationRequest; |
152 | private LinkObjects handler028 = null; //OnLinkObjects; | 152 | private LinkObjects handler028 = null; //OnLinkObjects; |
153 | private DelinkObjects handler029 = null; //OnDelinkObjects; | 153 | private DelinkObjects handler029 = null; //OnDelinkObjects; |
154 | private AddNewPrim handler030 = null; //OnAddPrim; | 154 | private AddNewPrim handlerAddPrim = null; //OnAddPrim; |
155 | private UpdateShape handler031 = null; //null; | 155 | private UpdateShape handlerUpdatePrimShape = null; //null; |
156 | private ObjectExtraParams handler032 = null; //OnUpdateExtraParams; | 156 | private ObjectExtraParams handlerUpdateExtraParams = null; //OnUpdateExtraParams; |
157 | private ObjectDuplicate handler033 = null; | 157 | private ObjectDuplicate handlerObjectDuplicate = null; |
158 | private ObjectSelect handler034 = null; | 158 | private ObjectSelect handlerObjectSelect = null; |
159 | private ObjectDeselect handler035 = null; | 159 | private ObjectDeselect handlerObjectDeselect = null; |
160 | private UpdatePrimFlags handler036 = null; //OnUpdatePrimFlags; | 160 | private UpdatePrimFlags handlerUpdatePrimFlags = null; //OnUpdatePrimFlags; |
161 | private UpdatePrimTexture handler037 = null; | 161 | private UpdatePrimTexture handlerUpdatePrimTexture = null; |
162 | private UpdateVector handler038 = null; //OnGrabObject; | 162 | private UpdateVector handlerGrabObject = null; //OnGrabObject; |
163 | private MoveObject handler039 = null; //OnGrabUpdate; | 163 | private MoveObject handlerGrabUpdate = null; //OnGrabUpdate; |
164 | private ObjectSelect handlerDeGrabObject = null; //OnDeGrabObject; | 164 | private ObjectSelect handlerDeGrabObject = null; //OnDeGrabObject; |
165 | private GenericCall7 handlerObjectDescription = null; | 165 | private GenericCall7 handlerObjectDescription = null; |
166 | private GenericCall7 handlerObjectName = null; | 166 | private GenericCall7 handlerObjectName = null; |
@@ -3315,20 +3315,20 @@ namespace OpenSim.Region.ClientStack | |||
3315 | //RayEnd: <61.97724, 141.995, 92.58341> | 3315 | //RayEnd: <61.97724, 141.995, 92.58341> |
3316 | //RayTargetID: 00000000-0000-0000-0000-000000000000 | 3316 | //RayTargetID: 00000000-0000-0000-0000-000000000000 |
3317 | 3317 | ||
3318 | handler030 = OnAddPrim; | 3318 | handlerAddPrim = OnAddPrim; |
3319 | if (handler030 != null) | 3319 | if (handlerAddPrim != null) |
3320 | handler030(AgentId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape, addPacket.ObjectData.BypassRaycast, addPacket.ObjectData.RayStart, addPacket.ObjectData.RayTargetID, addPacket.ObjectData.RayEndIsIntersection); | 3320 | handlerAddPrim(AgentId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape, addPacket.ObjectData.BypassRaycast, addPacket.ObjectData.RayStart, addPacket.ObjectData.RayTargetID, addPacket.ObjectData.RayEndIsIntersection); |
3321 | } | 3321 | } |
3322 | break; | 3322 | break; |
3323 | case PacketType.ObjectShape: | 3323 | case PacketType.ObjectShape: |
3324 | ObjectShapePacket shapePacket = (ObjectShapePacket)Pack; | 3324 | ObjectShapePacket shapePacket = (ObjectShapePacket)Pack; |
3325 | handler031 = null; | 3325 | handlerUpdatePrimShape = null; |
3326 | for (int i = 0; i < shapePacket.ObjectData.Length; i++) | 3326 | for (int i = 0; i < shapePacket.ObjectData.Length; i++) |
3327 | { | 3327 | { |
3328 | handler031 = OnUpdatePrimShape; | 3328 | handlerUpdatePrimShape = OnUpdatePrimShape; |
3329 | if (handler031 != null) | 3329 | if (handlerUpdatePrimShape != null) |
3330 | { | 3330 | { |
3331 | handler031(m_agentId, shapePacket.ObjectData[i].ObjectLocalID, | 3331 | handlerUpdatePrimShape(m_agentId, shapePacket.ObjectData[i].ObjectLocalID, |
3332 | shapePacket.ObjectData[i]); | 3332 | shapePacket.ObjectData[i]); |
3333 | } | 3333 | } |
3334 | } | 3334 | } |
@@ -3336,10 +3336,10 @@ namespace OpenSim.Region.ClientStack | |||
3336 | case PacketType.ObjectExtraParams: | 3336 | case PacketType.ObjectExtraParams: |
3337 | ObjectExtraParamsPacket extraPar = (ObjectExtraParamsPacket)Pack; | 3337 | ObjectExtraParamsPacket extraPar = (ObjectExtraParamsPacket)Pack; |
3338 | 3338 | ||
3339 | handler032 = OnUpdateExtraParams; | 3339 | handlerUpdateExtraParams = OnUpdateExtraParams; |
3340 | if (handler032 != null) | 3340 | if (handlerUpdateExtraParams != null) |
3341 | { | 3341 | { |
3342 | handler032(m_agentId, extraPar.ObjectData[0].ObjectLocalID, | 3342 | handlerUpdateExtraParams(m_agentId, extraPar.ObjectData[0].ObjectLocalID, |
3343 | extraPar.ObjectData[0].ParamType, | 3343 | extraPar.ObjectData[0].ParamType, |
3344 | extraPar.ObjectData[0].ParamInUse, extraPar.ObjectData[0].ParamData); | 3344 | extraPar.ObjectData[0].ParamInUse, extraPar.ObjectData[0].ParamData); |
3345 | } | 3345 | } |
@@ -3348,14 +3348,14 @@ namespace OpenSim.Region.ClientStack | |||
3348 | ObjectDuplicatePacket dupe = (ObjectDuplicatePacket)Pack; | 3348 | ObjectDuplicatePacket dupe = (ObjectDuplicatePacket)Pack; |
3349 | ObjectDuplicatePacket.AgentDataBlock AgentandGroupData = dupe.AgentData; | 3349 | ObjectDuplicatePacket.AgentDataBlock AgentandGroupData = dupe.AgentData; |
3350 | 3350 | ||
3351 | handler033 = null; | 3351 | handlerObjectDuplicate = null; |
3352 | 3352 | ||
3353 | for (int i = 0; i < dupe.ObjectData.Length; i++) | 3353 | for (int i = 0; i < dupe.ObjectData.Length; i++) |
3354 | { | 3354 | { |
3355 | handler033 = OnObjectDuplicate; | 3355 | handlerObjectDuplicate = OnObjectDuplicate; |
3356 | if (handler033 != null) | 3356 | if (handlerObjectDuplicate != null) |
3357 | { | 3357 | { |
3358 | handler033(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, | 3358 | handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, |
3359 | dupe.SharedData.DuplicateFlags, AgentandGroupData.AgentID, | 3359 | dupe.SharedData.DuplicateFlags, AgentandGroupData.AgentID, |
3360 | AgentandGroupData.GroupID); | 3360 | AgentandGroupData.GroupID); |
3361 | } | 3361 | } |
@@ -3366,26 +3366,26 @@ namespace OpenSim.Region.ClientStack | |||
3366 | case PacketType.ObjectSelect: | 3366 | case PacketType.ObjectSelect: |
3367 | ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack; | 3367 | ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack; |
3368 | 3368 | ||
3369 | handler034 = null; | 3369 | handlerObjectSelect = null; |
3370 | 3370 | ||
3371 | for (int i = 0; i < incomingselect.ObjectData.Length; i++) | 3371 | for (int i = 0; i < incomingselect.ObjectData.Length; i++) |
3372 | { | 3372 | { |
3373 | handler034 = OnObjectSelect; | 3373 | handlerObjectSelect = OnObjectSelect; |
3374 | if (handler034 != null) | 3374 | if (handlerObjectSelect != null) |
3375 | { | 3375 | { |
3376 | handler034(incomingselect.ObjectData[i].ObjectLocalID, this); | 3376 | handlerObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this); |
3377 | } | 3377 | } |
3378 | } | 3378 | } |
3379 | break; | 3379 | break; |
3380 | case PacketType.ObjectDeselect: | 3380 | case PacketType.ObjectDeselect: |
3381 | ObjectDeselectPacket incomingdeselect = (ObjectDeselectPacket)Pack; | 3381 | ObjectDeselectPacket incomingdeselect = (ObjectDeselectPacket)Pack; |
3382 | 3382 | ||
3383 | handler035 = null; | 3383 | handlerObjectDeselect = null; |
3384 | 3384 | ||
3385 | for (int i = 0; i < incomingdeselect.ObjectData.Length; i++) | 3385 | for (int i = 0; i < incomingdeselect.ObjectData.Length; i++) |
3386 | { | 3386 | { |
3387 | handler035 = OnObjectDeselect; | 3387 | handlerObjectDeselect = OnObjectDeselect; |
3388 | if (handler035 != null) | 3388 | if (handlerObjectDeselect != null) |
3389 | { | 3389 | { |
3390 | OnObjectDeselect(incomingdeselect.ObjectData[i].ObjectLocalID, this); | 3390 | OnObjectDeselect(incomingdeselect.ObjectData[i].ObjectLocalID, this); |
3391 | } | 3391 | } |
@@ -3394,23 +3394,23 @@ namespace OpenSim.Region.ClientStack | |||
3394 | case PacketType.ObjectFlagUpdate: | 3394 | case PacketType.ObjectFlagUpdate: |
3395 | ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack; | 3395 | ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack; |
3396 | 3396 | ||
3397 | handler036 = OnUpdatePrimFlags; | 3397 | handlerUpdatePrimFlags = OnUpdatePrimFlags; |
3398 | 3398 | ||
3399 | if (handler036 != null) | 3399 | if (handlerUpdatePrimFlags != null) |
3400 | { | 3400 | { |
3401 | handler036(flags.AgentData.ObjectLocalID, Pack, this); | 3401 | handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this); |
3402 | } | 3402 | } |
3403 | break; | 3403 | break; |
3404 | case PacketType.ObjectImage: | 3404 | case PacketType.ObjectImage: |
3405 | ObjectImagePacket imagePack = (ObjectImagePacket)Pack; | 3405 | ObjectImagePacket imagePack = (ObjectImagePacket)Pack; |
3406 | 3406 | ||
3407 | handler037 = null; | 3407 | handlerUpdatePrimTexture = null; |
3408 | for (int i = 0; i < imagePack.ObjectData.Length; i++) | 3408 | for (int i = 0; i < imagePack.ObjectData.Length; i++) |
3409 | { | 3409 | { |
3410 | handler037 = OnUpdatePrimTexture; | 3410 | handlerUpdatePrimTexture = OnUpdatePrimTexture; |
3411 | if (handler037 != null) | 3411 | if (handlerUpdatePrimTexture != null) |
3412 | { | 3412 | { |
3413 | handler037(imagePack.ObjectData[i].ObjectLocalID, | 3413 | handlerUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, |
3414 | imagePack.ObjectData[i].TextureEntry, this); | 3414 | imagePack.ObjectData[i].TextureEntry, this); |
3415 | } | 3415 | } |
3416 | } | 3416 | } |
@@ -3418,21 +3418,21 @@ namespace OpenSim.Region.ClientStack | |||
3418 | case PacketType.ObjectGrab: | 3418 | case PacketType.ObjectGrab: |
3419 | ObjectGrabPacket grab = (ObjectGrabPacket)Pack; | 3419 | ObjectGrabPacket grab = (ObjectGrabPacket)Pack; |
3420 | 3420 | ||
3421 | handler038 = OnGrabObject; | 3421 | handlerGrabObject = OnGrabObject; |
3422 | 3422 | ||
3423 | if (handler038 != null) | 3423 | if (handlerGrabObject != null) |
3424 | { | 3424 | { |
3425 | handler038(grab.ObjectData.LocalID, grab.ObjectData.GrabOffset, this); | 3425 | handlerGrabObject(grab.ObjectData.LocalID, grab.ObjectData.GrabOffset, this); |
3426 | } | 3426 | } |
3427 | break; | 3427 | break; |
3428 | case PacketType.ObjectGrabUpdate: | 3428 | case PacketType.ObjectGrabUpdate: |
3429 | ObjectGrabUpdatePacket grabUpdate = (ObjectGrabUpdatePacket)Pack; | 3429 | ObjectGrabUpdatePacket grabUpdate = (ObjectGrabUpdatePacket)Pack; |
3430 | 3430 | ||
3431 | handler039 = OnGrabUpdate; | 3431 | handlerGrabUpdate = OnGrabUpdate; |
3432 | 3432 | ||
3433 | if (handler039 != null) | 3433 | if (handlerGrabUpdate != null) |
3434 | { | 3434 | { |
3435 | handler039(grabUpdate.ObjectData.ObjectID, grabUpdate.ObjectData.GrabOffsetInitial, | 3435 | handlerGrabUpdate(grabUpdate.ObjectData.ObjectID, grabUpdate.ObjectData.GrabOffsetInitial, |
3436 | grabUpdate.ObjectData.GrabPosition, this); | 3436 | grabUpdate.ObjectData.GrabPosition, this); |
3437 | } | 3437 | } |
3438 | break; | 3438 | break; |