aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorCharles Krinke2008-03-02 20:29:59 +0000
committerCharles Krinke2008-03-02 20:29:59 +0000
commit30ebd15926fa5625b27bca783c13f007c593cbbd (patch)
tree0ac25573b0d125feb1919aa9e18a036f798d4105 /OpenSim/Region/ClientStack
parentApplying Ahzzmandius' second patch from bug 701. (diff)
downloadopensim-SC-30ebd15926fa5625b27bca783c13f007c593cbbd.zip
opensim-SC-30ebd15926fa5625b27bca783c13f007c593cbbd.tar.gz
opensim-SC-30ebd15926fa5625b27bca783c13f007c593cbbd.tar.bz2
opensim-SC-30ebd15926fa5625b27bca783c13f007c593cbbd.tar.xz
Update names of handler010 through handler019
to more appropriate names consistent with use.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs82
1 files changed, 41 insertions, 41 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index af5a8e5..eb50042 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -131,16 +131,16 @@ namespace OpenSim.Region.ClientStack
131 private RezObject handler007 = null; //OnRezObject; 131 private RezObject handler007 = null; //OnRezObject;
132 private GenericCall4 handler008 = null; //OnDeRezObject; 132 private GenericCall4 handler008 = null; //OnDeRezObject;
133 private ModifyTerrain handler009 = null; 133 private ModifyTerrain handler009 = null;
134 private Action<IClientAPI> handler010 = null; //OnRegionHandShakeReply; 134 private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply;
135 private GenericCall2 handler011 = null; //OnRequestWearables; 135 private GenericCall2 handlerRequestWearables = null; //OnRequestWearables;
136 private Action<IClientAPI> handler012 = null; //OnRequestAvatarsData; 136 private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData;
137 private SetAppearance handler013 = null; //OnSetAppearance; 137 private SetAppearance handlerSetAppearance = null; //OnSetAppearance;
138 private AvatarNowWearing handler014 = null; //OnAvatarNowWearing; 138 private AvatarNowWearing handlerAvatarNowWearing = null; //OnAvatarNowWearing;
139 private RezSingleAttachmentFromInv handler015 = null; //OnRezSingleAttachmentFromInv; 139 private RezSingleAttachmentFromInv handlerRezSingleAttachment = null; //OnRezSingleAttachmentFromInv;
140 private ObjectAttach handler016 = null; //OnObjectAttach; 140 private ObjectAttach handlerObjectAttach = null; //OnObjectAttach;
141 private SetAlwaysRun handler017 = null; //OnSetAlwaysRun; 141 private SetAlwaysRun handlerSetAlwaysRun = null; //OnSetAlwaysRun;
142 private GenericCall2 handler018 = null; //OnCompleteMovementToRegion; 142 private GenericCall2 handlerCompleteMovementToRegion = null; //OnCompleteMovementToRegion;
143 private UpdateAgent handler019 = null; //OnAgentUpdate; 143 private UpdateAgent handlerAgentUpdate = null; //OnAgentUpdate;
144 private StartAnim handlerStartAnim = null; 144 private StartAnim handlerStartAnim = null;
145 private StopAnim handlerStopAnim = null; 145 private StopAnim handlerStopAnim = null;
146 private AgentRequestSit handlerAgentRequestSit = null; //OnAgentRequestSit; 146 private AgentRequestSit handlerAgentRequestSit = null; //OnAgentRequestSit;
@@ -3042,27 +3042,27 @@ namespace OpenSim.Region.ClientStack
3042 break; 3042 break;
3043 case PacketType.RegionHandshakeReply: 3043 case PacketType.RegionHandshakeReply:
3044 3044
3045 handler010 = OnRegionHandShakeReply; 3045 handlerRegionHandShakeReply = OnRegionHandShakeReply;
3046 if (handler010 != null) 3046 if (handlerRegionHandShakeReply != null)
3047 { 3047 {
3048 handler010(this); 3048 handlerRegionHandShakeReply(this);
3049 } 3049 }
3050 3050
3051 break; 3051 break;
3052 case PacketType.AgentWearablesRequest: 3052 case PacketType.AgentWearablesRequest:
3053 handler011 = OnRequestWearables; 3053 handlerRequestWearables = OnRequestWearables;
3054 3054
3055 if (handler011 != null) 3055 if (handlerRequestWearables != null)
3056 { 3056 {
3057 handler011(); 3057 handlerRequestWearables();
3058 } 3058 }
3059 3059
3060 3060
3061 handler012 = OnRequestAvatarsData; 3061 handlerRequestAvatarsData = OnRequestAvatarsData;
3062 3062
3063 if (handler012 != null) 3063 if (handlerRequestAvatarsData != null)
3064 { 3064 {
3065 handler012(this); 3065 handlerRequestAvatarsData(this);
3066 } 3066 }
3067 3067
3068 3068
@@ -3070,10 +3070,10 @@ namespace OpenSim.Region.ClientStack
3070 case PacketType.AgentSetAppearance: 3070 case PacketType.AgentSetAppearance:
3071 AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack; 3071 AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
3072 3072
3073 handler013 = OnSetAppearance; 3073 handlerSetAppearance = OnSetAppearance;
3074 if (handler013 != null) 3074 if (handlerSetAppearance != null)
3075 { 3075 {
3076 handler013(appear.ObjectData.TextureEntry, appear.VisualParam); 3076 handlerSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
3077 } 3077 }
3078 3078
3079 break; 3079 break;
@@ -3090,10 +3090,10 @@ namespace OpenSim.Region.ClientStack
3090 wearingArgs.NowWearing.Add(wearable); 3090 wearingArgs.NowWearing.Add(wearable);
3091 } 3091 }
3092 3092
3093 handler014 = OnAvatarNowWearing; 3093 handlerAvatarNowWearing = OnAvatarNowWearing;
3094 if (handler014 != null) 3094 if (handlerAvatarNowWearing != null)
3095 { 3095 {
3096 handler014(this, wearingArgs); 3096 handlerAvatarNowWearing(this, wearingArgs);
3097 } 3097 }
3098 3098
3099 3099
@@ -3101,11 +3101,11 @@ namespace OpenSim.Region.ClientStack
3101 break; 3101 break;
3102 case PacketType.RezSingleAttachmentFromInv: 3102 case PacketType.RezSingleAttachmentFromInv:
3103 3103
3104 handler015 = OnRezSingleAttachmentFromInv; 3104 handlerRezSingleAttachment = OnRezSingleAttachmentFromInv;
3105 if (handler015 != null) 3105 if (handlerRezSingleAttachment != null)
3106 { 3106 {
3107 RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack; 3107 RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack;
3108 handler015(this, rez.ObjectData.ItemID, 3108 handlerRezSingleAttachment(this, rez.ObjectData.ItemID,
3109 rez.ObjectData.AttachmentPt, rez.ObjectData.ItemFlags, rez.ObjectData.NextOwnerMask); 3109 rez.ObjectData.AttachmentPt, rez.ObjectData.ItemFlags, rez.ObjectData.NextOwnerMask);
3110 } 3110 }
3111 3111
@@ -3117,11 +3117,11 @@ namespace OpenSim.Region.ClientStack
3117 { 3117 {
3118 ObjectAttachPacket att = (ObjectAttachPacket)Pack; 3118 ObjectAttachPacket att = (ObjectAttachPacket)Pack;
3119 3119
3120 handler016 = OnObjectAttach; 3120 handlerObjectAttach = OnObjectAttach;
3121 3121
3122 if (handler016 != null) 3122 if (handlerObjectAttach != null)
3123 { 3123 {
3124 handler016(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, att.ObjectData[0].Rotation); 3124 handlerObjectAttach(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, att.ObjectData[0].Rotation);
3125 } 3125 }
3126 } 3126 }
3127 3127
@@ -3129,21 +3129,21 @@ namespace OpenSim.Region.ClientStack
3129 case PacketType.SetAlwaysRun: 3129 case PacketType.SetAlwaysRun:
3130 SetAlwaysRunPacket run = (SetAlwaysRunPacket)Pack; 3130 SetAlwaysRunPacket run = (SetAlwaysRunPacket)Pack;
3131 3131
3132 handler017 = OnSetAlwaysRun; 3132 handlerSetAlwaysRun = OnSetAlwaysRun;
3133 if (handler017 != null) 3133 if (handlerSetAlwaysRun != null)
3134 handler017(this, run.AgentData.AlwaysRun); 3134 handlerSetAlwaysRun(this, run.AgentData.AlwaysRun);
3135 3135
3136 3136
3137 3137
3138 break; 3138 break;
3139 case PacketType.CompleteAgentMovement: 3139 case PacketType.CompleteAgentMovement:
3140 3140
3141 handler018 = OnCompleteMovementToRegion; 3141 handlerCompleteMovementToRegion = OnCompleteMovementToRegion;
3142 if (handler018 != null) 3142 if (handlerCompleteMovementToRegion != null)
3143 { 3143 {
3144 handler018(); 3144 handlerCompleteMovementToRegion();
3145 } 3145 }
3146 handler018 = null; 3146 handlerCompleteMovementToRegion = null;
3147 3147
3148 break; 3148 break;
3149 case PacketType.AgentUpdate: 3149 case PacketType.AgentUpdate:
@@ -3151,11 +3151,11 @@ namespace OpenSim.Region.ClientStack
3151 { 3151 {
3152 AgentUpdatePacket agenUpdate = (AgentUpdatePacket)Pack; 3152 AgentUpdatePacket agenUpdate = (AgentUpdatePacket)Pack;
3153 3153
3154 handler019 = OnAgentUpdate; 3154 handlerAgentUpdate = OnAgentUpdate;
3155 if (handler019 != null) 3155 if (handlerAgentUpdate != null)
3156 OnAgentUpdate(this, agenUpdate); 3156 OnAgentUpdate(this, agenUpdate);
3157 3157
3158 handler019 = null; 3158 handlerAgentUpdate = null;
3159 //agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotationa); 3159 //agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotationa);
3160 } 3160 }
3161 break; 3161 break;