aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.cs
diff options
context:
space:
mode:
authorCharles Krinke2008-03-02 22:28:48 +0000
committerCharles Krinke2008-03-02 22:28:48 +0000
commit7794fc3766a71f6c708b53674064f69279434d1e (patch)
tree0a0f8ec8f81f2afa68dfaaa8450c08f0b203d77c /OpenSim/Region/ClientStack/ClientView.cs
parentThank you kindly, Ahzzmandius for adding (diff)
downloadopensim-SC_OLD-7794fc3766a71f6c708b53674064f69279434d1e.zip
opensim-SC_OLD-7794fc3766a71f6c708b53674064f69279434d1e.tar.gz
opensim-SC_OLD-7794fc3766a71f6c708b53674064f69279434d1e.tar.bz2
opensim-SC_OLD-7794fc3766a71f6c708b53674064f69279434d1e.tar.xz
Change handler001 through handler009 to more
appropriate names consisten with their use. All done with all 94 handlers from handler001 through handler094. Hopefully we can move forward without numbered handlers.
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs72
1 files changed, 36 insertions, 36 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index eb50042..d032a2e 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -122,15 +122,15 @@ namespace OpenSim.Region.ClientStack
122 /* Instantiated Designated Event Delegates */ 122 /* Instantiated Designated Event Delegates */
123 //- used so we don't create new objects for each incoming packet and then toss it out later */ 123 //- used so we don't create new objects for each incoming packet and then toss it out later */
124 124
125 private RequestAvatarProperties handler001 = null; //OnRequestAvatarProperties; 125 private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties;
126 private ChatFromViewer handler002 = null; //OnChatFromViewer; 126 private ChatFromViewer handlerChatFromViewer = null; //OnChatFromViewer;
127 private ChatFromViewer handler003 = null; //OnChatFromViewer; 127 private ChatFromViewer handlerChatFromViewer2 = null; //OnChatFromViewer;
128 private ImprovedInstantMessage handler004 = null; //OnInstantMessage; 128 private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage;
129 private FriendActionDelegate handler005 = null; //OnApproveFriendRequest; 129 private FriendActionDelegate handlerApproveFriendRequest = null; //OnApproveFriendRequest;
130 private FriendshipTermination handler006 = null; //OnTerminateFriendship; 130 private FriendshipTermination handlerTerminateFriendship = null; //OnTerminateFriendship;
131 private RezObject handler007 = null; //OnRezObject; 131 private RezObject handlerRezObject = null; //OnRezObject;
132 private GenericCall4 handler008 = null; //OnDeRezObject; 132 private GenericCall4 handlerDeRezObject = null; //OnDeRezObject;
133 private ModifyTerrain handler009 = null; 133 private ModifyTerrain handlerModifyTerrain = null;
134 private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply; 134 private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply;
135 private GenericCall2 handlerRequestWearables = null; //OnRequestWearables; 135 private GenericCall2 handlerRequestWearables = null; //OnRequestWearables;
136 private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData; 136 private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData;
@@ -2866,10 +2866,10 @@ namespace OpenSim.Region.ClientStack
2866 case PacketType.AvatarPropertiesRequest: 2866 case PacketType.AvatarPropertiesRequest:
2867 AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; 2867 AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack;
2868 2868
2869 handler001 = OnRequestAvatarProperties; 2869 handlerRequestAvatarProperties = OnRequestAvatarProperties;
2870 if (handler001 != null) 2870 if (handlerRequestAvatarProperties != null)
2871 { 2871 {
2872 handler001(this, avatarProperties.AgentData.AvatarID); 2872 handlerRequestAvatarProperties(this, avatarProperties.AgentData.AvatarID);
2873 } 2873 }
2874 2874
2875 2875
@@ -2897,9 +2897,9 @@ namespace OpenSim.Region.ClientStack
2897 args.Scene = Scene; 2897 args.Scene = Scene;
2898 args.Sender = this; 2898 args.Sender = this;
2899 2899
2900 handler002 = OnChatFromViewer; 2900 handlerChatFromViewer = OnChatFromViewer;
2901 if (handler002 != null) 2901 if (handlerChatFromViewer != null)
2902 handler002(this, args); 2902 handlerChatFromViewer(this, args);
2903 } 2903 }
2904 2904
2905 2905
@@ -2919,9 +2919,9 @@ namespace OpenSim.Region.ClientStack
2919 args.Position = new LLVector3(); 2919 args.Position = new LLVector3();
2920 args.Scene = Scene; 2920 args.Scene = Scene;
2921 args.Sender = this; 2921 args.Sender = this;
2922 handler003 = OnChatFromViewer; 2922 handlerChatFromViewer2 = OnChatFromViewer;
2923 if (handler003 != null) 2923 if (handlerChatFromViewer2 != null)
2924 handler003(this, args); 2924 handlerChatFromViewer2(this, args);
2925 } 2925 }
2926 2926
2927 break; 2927 break;
@@ -2929,11 +2929,11 @@ namespace OpenSim.Region.ClientStack
2929 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack; 2929 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;
2930 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); 2930 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
2931 string IMmessage = Helpers.FieldToUTF8String(msgpack.MessageBlock.Message); 2931 string IMmessage = Helpers.FieldToUTF8String(msgpack.MessageBlock.Message);
2932 handler004 = OnInstantMessage; 2932 handlerInstantMessage = OnInstantMessage;
2933 2933
2934 if (handler004 != null) 2934 if (handlerInstantMessage != null)
2935 { 2935 {
2936 handler004(this, msgpack.AgentData.AgentID, msgpack.AgentData.SessionID, 2936 handlerInstantMessage(this, msgpack.AgentData.AgentID, msgpack.AgentData.SessionID,
2937 msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID, 2937 msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID,
2938 msgpack.MessageBlock.Timestamp, IMfromName, IMmessage, 2938 msgpack.MessageBlock.Timestamp, IMfromName, IMmessage,
2939 msgpack.MessageBlock.Dialog, msgpack.MessageBlock.FromGroup, 2939 msgpack.MessageBlock.Dialog, msgpack.MessageBlock.FromGroup,
@@ -2959,10 +2959,10 @@ namespace OpenSim.Region.ClientStack
2959 callingCardFolders.Add(afriendpack.FolderData[fi].FolderID); 2959 callingCardFolders.Add(afriendpack.FolderData[fi].FolderID);
2960 } 2960 }
2961 2961
2962 handler005 = OnApproveFriendRequest; 2962 handlerApproveFriendRequest = OnApproveFriendRequest;
2963 if (handler005 != null) 2963 if (handlerApproveFriendRequest != null)
2964 { 2964 {
2965 handler005(this, agentID, transactionID, callingCardFolders); 2965 handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders);
2966 } 2966 }
2967 2967
2968 2968
@@ -2974,10 +2974,10 @@ namespace OpenSim.Region.ClientStack
2974 LLUUID listOwnerAgentID = tfriendpack.AgentData.AgentID; 2974 LLUUID listOwnerAgentID = tfriendpack.AgentData.AgentID;
2975 LLUUID exFriendID = tfriendpack.ExBlock.OtherID; 2975 LLUUID exFriendID = tfriendpack.ExBlock.OtherID;
2976 2976
2977 handler006 = OnTerminateFriendship; 2977 handlerTerminateFriendship = OnTerminateFriendship;
2978 if (handler006 != null) 2978 if (handlerTerminateFriendship != null)
2979 { 2979 {
2980 handler006(this, listOwnerAgentID, exFriendID); 2980 handlerTerminateFriendship(this, listOwnerAgentID, exFriendID);
2981 } 2981 }
2982 2982
2983 2983
@@ -2985,8 +2985,8 @@ namespace OpenSim.Region.ClientStack
2985 case PacketType.RezObject: 2985 case PacketType.RezObject:
2986 RezObjectPacket rezPacket = (RezObjectPacket)Pack; 2986 RezObjectPacket rezPacket = (RezObjectPacket)Pack;
2987 2987
2988 handler007 = OnRezObject; 2988 handlerRezObject = OnRezObject;
2989 if (handler007 != null) 2989 if (handlerRezObject != null)
2990 { 2990 {
2991 //rezPacket.RezData.BypassRaycast; 2991 //rezPacket.RezData.BypassRaycast;
2992 //rezPacket.RezData.RayEnd; 2992 //rezPacket.RezData.RayEnd;
@@ -2998,7 +2998,7 @@ namespace OpenSim.Region.ClientStack
2998 //rezPacket.RezData.FromTaskID; 2998 //rezPacket.RezData.FromTaskID;
2999 //m_log.Info("[REZData]: " + rezPacket.ToString()); 2999 //m_log.Info("[REZData]: " + rezPacket.ToString());
3000 3000
3001 handler007(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, 3001 handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
3002 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID, 3002 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
3003 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection, 3003 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection,
3004 rezPacket.RezData.EveryoneMask, rezPacket.RezData.GroupMask, 3004 rezPacket.RezData.EveryoneMask, rezPacket.RezData.GroupMask,
@@ -3009,10 +3009,10 @@ namespace OpenSim.Region.ClientStack
3009 3009
3010 break; 3010 break;
3011 case PacketType.DeRezObject: 3011 case PacketType.DeRezObject:
3012 handler008 = OnDeRezObject; 3012 handlerDeRezObject = OnDeRezObject;
3013 if (handler008 != null) 3013 if (handlerDeRezObject != null)
3014 { 3014 {
3015 handler008(Pack, this); 3015 handlerDeRezObject(Pack, this);
3016 } 3016 }
3017 3017
3018 break; 3018 break;
@@ -3026,10 +3026,10 @@ namespace OpenSim.Region.ClientStack
3026 3026
3027 for (int i = 0; i < modify.ParcelData.Length; i++) 3027 for (int i = 0; i < modify.ParcelData.Length; i++)
3028 { 3028 {
3029 handler009 = OnModifyTerrain; 3029 handlerModifyTerrain = OnModifyTerrain;
3030 if (handler009 != null) 3030 if (handlerModifyTerrain != null)
3031 { 3031 {
3032 OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, 3032 handlerModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds,
3033 modify.ModifyBlock.BrushSize, 3033 modify.ModifyBlock.BrushSize,
3034 modify.ModifyBlock.Action, modify.ParcelData[i].North, 3034 modify.ModifyBlock.Action, modify.ParcelData[i].North,
3035 modify.ParcelData[i].West, modify.ParcelData[i].South, 3035 modify.ParcelData[i].West, modify.ParcelData[i].South,