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

Rename handler020 through handler029 with more 

appropriate names consistent with their use.
0.6.0-stable
Charles Krinke 2008-03-02 03:50:33 +00:00
parent 7a0e1a8c34
commit d6039b40a4
2 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,16 +141,16 @@ namespace OpenSim.Region.ClientStack
private SetAlwaysRun handler017 = null; //OnSetAlwaysRun; private SetAlwaysRun handler017 = null; //OnSetAlwaysRun;
private GenericCall2 handler018 = null; //OnCompleteMovementToRegion; private GenericCall2 handler018 = null; //OnCompleteMovementToRegion;
private UpdateAgent handler019 = null; //OnAgentUpdate; private UpdateAgent handler019 = null; //OnAgentUpdate;
private StartAnim handler020 = null; private StartAnim handlerStartAnim = null;
private StopAnim handler021 = null; private StopAnim handlerStopAnim = null;
private AgentRequestSit handler022 = null; //OnAgentRequestSit; private AgentRequestSit handlerAgentRequestSit = null; //OnAgentRequestSit;
private AgentSit handler023 = null; //OnAgentSit; private AgentSit handlerAgentSit = null; //OnAgentSit;
private AvatarPickerRequest handler024 = null; //OnAvatarPickerRequest; private AvatarPickerRequest handlerAvatarPickerRequest = null; //OnAvatarPickerRequest;
private FetchInventory handler025 = null; //OnAgentDataUpdateRequest; private FetchInventory handlerAgentDataUpdateRequest = null; //OnAgentDataUpdateRequest;
private FetchInventory handler026 = null; //OnUserInfoRequest; private FetchInventory handlerUserInfoRequest = null; //OnUserInfoRequest;
private TeleportLocationRequest handler027 = null; //OnSetStartLocationRequest; private TeleportLocationRequest handlerSetStartLocationRequest = null; //OnSetStartLocationRequest;
private LinkObjects handler028 = null; //OnLinkObjects; private LinkObjects handlerLinkObjects = null; //OnLinkObjects;
private DelinkObjects handler029 = null; //OnDelinkObjects; private DelinkObjects handlerDelinkObjects = null; //OnDelinkObjects;
private AddNewPrim handlerAddPrim = null; //OnAddPrim; private AddNewPrim handlerAddPrim = null; //OnAddPrim;
private UpdateShape handlerUpdatePrimShape = null; //null; private UpdateShape handlerUpdatePrimShape = null; //null;
private ObjectExtraParams handlerUpdateExtraParams = null; //OnUpdateExtraParams; private ObjectExtraParams handlerUpdateExtraParams = null; //OnUpdateExtraParams;
@ -3161,25 +3161,25 @@ namespace OpenSim.Region.ClientStack
case PacketType.AgentAnimation: case PacketType.AgentAnimation:
AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack; AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
handler020 = null; handlerStartAnim = null;
handler021 = null; handlerStopAnim = null;
for (int i = 0; i < AgentAni.AnimationList.Length; i++) for (int i = 0; i < AgentAni.AnimationList.Length; i++)
{ {
if (AgentAni.AnimationList[i].StartAnim) if (AgentAni.AnimationList[i].StartAnim)
{ {
handler020 = OnStartAnim; handlerStartAnim = OnStartAnim;
if (handler020 != null) if (handlerStartAnim != null)
{ {
handler020(this, AgentAni.AnimationList[i].AnimID, 1); handlerStartAnim(this, AgentAni.AnimationList[i].AnimID, 1);
} }
} }
else else
{ {
handler021 = OnStopAnim; handlerStopAnim = OnStopAnim;
if (handler021 != null) if (handlerStopAnim != null)
{ {
handler021(this, AgentAni.AnimationList[i].AnimID); handlerStopAnim(this, AgentAni.AnimationList[i].AnimID);
} }
} }
} }
@ -3189,9 +3189,9 @@ namespace OpenSim.Region.ClientStack
{ {
AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack; AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack;
handler022 = OnAgentRequestSit; handlerAgentRequestSit = OnAgentRequestSit;
if (handler022 != null) if (handlerAgentRequestSit != null)
handler022(this, agentRequestSit.AgentData.AgentID, handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
} }
break; break;
@ -3200,8 +3200,8 @@ namespace OpenSim.Region.ClientStack
{ {
AgentSitPacket agentSit = (AgentSitPacket)Pack; AgentSitPacket agentSit = (AgentSitPacket)Pack;
handler023 = OnAgentSit; handlerAgentSit = OnAgentSit;
if (handler023 != null) if (handlerAgentSit != null)
{ {
OnAgentSit(this, agentSit.AgentData.AgentID); OnAgentSit(this, agentSit.AgentData.AgentID);
} }
@ -3213,31 +3213,31 @@ namespace OpenSim.Region.ClientStack
AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data; AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data;
//System.Console.WriteLine("Agent Sends:" + Helpers.FieldToUTF8String(querydata.Name)); //System.Console.WriteLine("Agent Sends:" + Helpers.FieldToUTF8String(querydata.Name));
handler024 = OnAvatarPickerRequest; handlerAvatarPickerRequest = OnAvatarPickerRequest;
if (handler024 != null) if (handlerAvatarPickerRequest != null)
{ {
handler024(this, Requestdata.AgentID, Requestdata.QueryID, handlerAvatarPickerRequest(this, Requestdata.AgentID, Requestdata.QueryID,
Helpers.FieldToUTF8String(querydata.Name)); Helpers.FieldToUTF8String(querydata.Name));
} }
break; break;
case PacketType.AgentDataUpdateRequest: case PacketType.AgentDataUpdateRequest:
AgentDataUpdateRequestPacket avRequestDataUpdatePacket = (AgentDataUpdateRequestPacket)Pack; AgentDataUpdateRequestPacket avRequestDataUpdatePacket = (AgentDataUpdateRequestPacket)Pack;
handler025 = OnAgentDataUpdateRequest; handlerAgentDataUpdateRequest = OnAgentDataUpdateRequest;
if (handler025 != null) if (handlerAgentDataUpdateRequest != null)
{ {
handler025(this, avRequestDataUpdatePacket.AgentData.AgentID, avRequestDataUpdatePacket.AgentData.SessionID); handlerAgentDataUpdateRequest(this, avRequestDataUpdatePacket.AgentData.AgentID, avRequestDataUpdatePacket.AgentData.SessionID);
} }
break; break;
case PacketType.UserInfoRequest: case PacketType.UserInfoRequest:
UserInfoRequestPacket avUserInfoRequestPacket = (UserInfoRequestPacket)Pack; UserInfoRequestPacket avUserInfoRequestPacket = (UserInfoRequestPacket)Pack;
handler026 = OnUserInfoRequest; handlerUserInfoRequest = OnUserInfoRequest;
if (handler026 != null) if (handlerUserInfoRequest != null)
{ {
handler026(this, avUserInfoRequestPacket.AgentData.AgentID, avUserInfoRequestPacket.AgentData.SessionID); handlerUserInfoRequest(this, avUserInfoRequestPacket.AgentData.AgentID, avUserInfoRequestPacket.AgentData.SessionID);
} }
break; break;
@ -3247,10 +3247,10 @@ namespace OpenSim.Region.ClientStack
if (avSetStartLocationRequestPacket.AgentData.AgentID == AgentId && avSetStartLocationRequestPacket.AgentData.SessionID == SessionId) if (avSetStartLocationRequestPacket.AgentData.AgentID == AgentId && avSetStartLocationRequestPacket.AgentData.SessionID == SessionId)
{ {
handler027 = OnSetStartLocationRequest; handlerSetStartLocationRequest = OnSetStartLocationRequest;
if (handler027 != null) if (handlerSetStartLocationRequest != null)
{ {
handler027(this, 0, avSetStartLocationRequestPacket.StartLocationData.LocationPos, handlerSetStartLocationRequest(this, 0, avSetStartLocationRequestPacket.StartLocationData.LocationPos,
avSetStartLocationRequestPacket.StartLocationData.LocationLookAt, avSetStartLocationRequestPacket.StartLocationData.LocationLookAt,
avSetStartLocationRequestPacket.StartLocationData.LocationID); avSetStartLocationRequestPacket.StartLocationData.LocationID);
} }
@ -3279,10 +3279,10 @@ namespace OpenSim.Region.ClientStack
childrenprims.Add(link.ObjectData[i].ObjectLocalID); childrenprims.Add(link.ObjectData[i].ObjectLocalID);
} }
} }
handler028 = OnLinkObjects; handlerLinkObjects = OnLinkObjects;
if (handler028 != null) if (handlerLinkObjects != null)
{ {
handler028(parentprimid, childrenprims); handlerLinkObjects(parentprimid, childrenprims);
} }
break; break;
case PacketType.ObjectDelink: case PacketType.ObjectDelink:
@ -3297,10 +3297,10 @@ namespace OpenSim.Region.ClientStack
{ {
prims.Add(delink.ObjectData[i].ObjectLocalID); prims.Add(delink.ObjectData[i].ObjectLocalID);
} }
handler029 = OnDelinkObjects; handlerDelinkObjects = OnDelinkObjects;
if (handler029 != null) if (handlerDelinkObjects != null)
{ {
handler029(prims); handlerDelinkObjects(prims);
} }
break; break;

56
OpenSim/Region/Environment/Scenes/SceneEvents.cs
View File

@ -182,13 +182,13 @@ namespace OpenSim.Region.Environment.Scenes
private RemoveScript handler016 = null; //OnRemoveScript; private RemoveScript handler016 = null; //OnRemoveScript;
private SceneGroupMoved handler017 = null; //OnSceneGroupMove; private SceneGroupMoved handler017 = null; //OnSceneGroupMove;
private SceneGroupGrabed handler018 = null; //OnSceneGroupGrab; private SceneGroupGrabed handler018 = null; //OnSceneGroupGrab;
private LandObjectAdded handler020 = null; //OnLandObjectAdded; private LandObjectAdded handlerLandObjectAdded = null; //OnLandObjectAdded;
private LandObjectRemoved handler021 = null; //OnLandObjectRemoved; private LandObjectRemoved handlerLandObjectRemoved = null; //OnLandObjectRemoved;
private AvatarEnteringNewParcel handler022 = null; //OnAvatarEnteringNewParcel; private AvatarEnteringNewParcel handlerAvatarEnteringNewParcel = null; //OnAvatarEnteringNewParcel;
private NewGridInstantMessage handler023 = null; //OnGridInstantMessageToIMModule; private NewGridInstantMessage handlerGridInstantMessageToIM = null; //OnGridInstantMessageToIMModule;
private NewGridInstantMessage handler024 = null; //OnGridInstantMessageToFriendsModule; private NewGridInstantMessage handlerGridInstantMessageToFriends = null; //OnGridInstantMessageToFriendsModule;
private ClientClosed handler025 = null; //OnClientClosed; private ClientClosed handlerClientClosed = null; //OnClientClosed;
private OnNewPresenceDelegate handler026 = null; //OnMakeChildAgent; private OnNewPresenceDelegate handlerMakeChildAgent = null; //OnMakeChildAgent;
public void TriggerOnScriptChangedEvent(uint localID, uint change) public void TriggerOnScriptChangedEvent(uint localID, uint change)
{ {
@ -343,20 +343,20 @@ namespace OpenSim.Region.Environment.Scenes
public void TriggerLandObjectAdded(Land newParcel, LLUUID regionID) public void TriggerLandObjectAdded(Land newParcel, LLUUID regionID)
{ {
handler020 = OnLandObjectAdded; handlerLandObjectAdded = OnLandObjectAdded;
if (handler020 != null) if (handlerLandObjectAdded != null)
{ {
handler020(newParcel, regionID); handlerLandObjectAdded(newParcel, regionID);
} }
} }
public void TriggerLandObjectRemoved(LLUUID globalID) public void TriggerLandObjectRemoved(LLUUID globalID)
{ {
handler021 = OnLandObjectRemoved; handlerLandObjectRemoved = OnLandObjectRemoved;
if (handler021 != null) if (handlerLandObjectRemoved != null)
{ {
handler021(globalID); handlerLandObjectRemoved(globalID);
} }
} }
@ -369,11 +369,11 @@ namespace OpenSim.Region.Environment.Scenes
public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID) public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
{ {
handler022 = OnAvatarEnteringNewParcel; handlerAvatarEnteringNewParcel = OnAvatarEnteringNewParcel;
if (handler022 != null) if (handlerAvatarEnteringNewParcel != null)
{ {
handler022(avatar, localLandID, regionID); handlerAvatarEnteringNewParcel(avatar, localLandID, regionID);
} }
} }
@ -384,18 +384,18 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if ((whichModule & InstantMessageReceiver.IMModule) != 0) if ((whichModule & InstantMessageReceiver.IMModule) != 0)
{ {
handler023 = OnGridInstantMessageToIMModule; handlerGridInstantMessageToIM = OnGridInstantMessageToIMModule;
if (handler023 != null) if (handlerGridInstantMessageToIM != null)
{ {
handler023(message); handlerGridInstantMessageToIM(message);
} }
} }
if ((whichModule & InstantMessageReceiver.FriendsModule) != 0) if ((whichModule & InstantMessageReceiver.FriendsModule) != 0)
{ {
handler024 = OnGridInstantMessageToFriendsModule; handlerGridInstantMessageToFriends = OnGridInstantMessageToFriendsModule;
if (handler024 != null) if (handlerGridInstantMessageToFriends != null)
{ {
handler024(message); handlerGridInstantMessageToFriends(message);
} }
} }
@ -403,19 +403,19 @@ namespace OpenSim.Region.Environment.Scenes
public void TriggerClientClosed(LLUUID ClientID) public void TriggerClientClosed(LLUUID ClientID)
{ {
handler025 = OnClientClosed; handlerClientClosed = OnClientClosed;
if (handler025 != null) if (handlerClientClosed != null)
{ {
handler025(ClientID); handlerClientClosed(ClientID);
} }
} }
public void TriggerOnMakeChildAgent(ScenePresence presence) public void TriggerOnMakeChildAgent(ScenePresence presence)
{ {
handler026 = OnMakeChildAgent; handlerMakeChildAgent = OnMakeChildAgent;
if (handler026 != null) if (handlerMakeChildAgent != null)
{ {
handler026(presence); handlerMakeChildAgent(presence);
} }
} }