diff options
author | Charles Krinke | 2008-03-01 20:37:27 +0000 |
---|---|---|
committer | Charles Krinke | 2008-03-01 20:37:27 +0000 |
commit | b0fbe96ca4b3fbde36ae4216e2cbf1ba4d8f0b07 (patch) | |
tree | a6307b5d7d6c7a33a845b7de84cb7f6653929aef /OpenSim/Region | |
parent | Thank you very much, Kinoc for: (diff) | |
download | opensim-SC_OLD-b0fbe96ca4b3fbde36ae4216e2cbf1ba4d8f0b07.zip opensim-SC_OLD-b0fbe96ca4b3fbde36ae4216e2cbf1ba4d8f0b07.tar.gz opensim-SC_OLD-b0fbe96ca4b3fbde36ae4216e2cbf1ba4d8f0b07.tar.bz2 opensim-SC_OLD-b0fbe96ca4b3fbde36ae4216e2cbf1ba4d8f0b07.tar.xz |
Beginning to change all handler000 through handler094
to more meaningful names starting from the end and
working backwards.
handler094 -> handlerRequestAsset
handler093 -> handlerPacketStats
handler092 -> handlerGodKickUser
handler091 -> handlerUpdatePrimGroupRotation
handler090 -> handlerUpdatePrimRotation
Others to come shortly.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index aa7db95..58bfefb 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -204,7 +204,7 @@ namespace OpenSim.Region.ClientStack | |||
204 | private RegionInfoRequest handler080 = null; //OnRegionInfoRequest; | 204 | private RegionInfoRequest handler080 = null; //OnRegionInfoRequest; |
205 | private EstateCovenantRequest handler081 = null; //OnEstateCovenantRequest; | 205 | private EstateCovenantRequest handler081 = null; //OnEstateCovenantRequest; |
206 | private RequestGodlikePowers handler082 = null; //OnRequestGodlikePowers; | 206 | private RequestGodlikePowers handler082 = null; //OnRequestGodlikePowers; |
207 | private GodKickUser handler092 = null; //OnGodKickUser; | 207 | private GodKickUser handlerGodKickUser = null; //OnGodKickUser; |
208 | private ViewerEffectEventHandler handler083 = null; //OnViewerEffect; | 208 | private ViewerEffectEventHandler handler083 = null; //OnViewerEffect; |
209 | private Action<IClientAPI> handler084 = null; //OnLogout; | 209 | private Action<IClientAPI> handler084 = null; //OnLogout; |
210 | private MoneyTransferRequest handler085 = null; //OnMoneyTransferRequest; | 210 | private MoneyTransferRequest handler085 = null; //OnMoneyTransferRequest; |
@@ -212,10 +212,10 @@ namespace OpenSim.Region.ClientStack | |||
212 | private UpdatePrimSingleRotation handler087 = null; //OnUpdatePrimSingleRotation; | 212 | private UpdatePrimSingleRotation handler087 = null; //OnUpdatePrimSingleRotation; |
213 | private UpdateVector handler088 = null; //OnUpdatePrimScale; | 213 | private UpdateVector handler088 = null; //OnUpdatePrimScale; |
214 | private UpdateVector handler089 = null; //OnUpdatePrimGroupPosition; | 214 | private UpdateVector handler089 = null; //OnUpdatePrimGroupPosition; |
215 | private UpdatePrimRotation handler090 = null; //OnUpdatePrimGroupRotation; | 215 | private UpdatePrimRotation handlerUpdatePrimRotation = null; //OnUpdatePrimGroupRotation; |
216 | private UpdatePrimGroupRotation handler091 = null; //OnUpdatePrimGroupMouseRotation; | 216 | private UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = null; //OnUpdatePrimGroupMouseRotation; |
217 | private PacketStats handler093 = null; // OnPacketStats;# | 217 | private PacketStats handlerPacketStats = null; // OnPacketStats;# |
218 | private RequestAsset handler094 = null; // OnRequestAsset; | 218 | private RequestAsset handlerRequestAsset = null; // OnRequestAsset; |
219 | 219 | ||
220 | 220 | ||
221 | /* Properties */ | 221 | /* Properties */ |
@@ -2335,8 +2335,8 @@ namespace OpenSim.Region.ClientStack | |||
2335 | 2335 | ||
2336 | 2336 | ||
2337 | 2337 | ||
2338 | UpdatePrimRotation handler090 = OnUpdatePrimGroupRotation; | 2338 | UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; |
2339 | UpdatePrimGroupRotation handler091 = OnUpdatePrimGroupMouseRotation; | 2339 | UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; |
2340 | 2340 | ||
2341 | switch (block.Type) | 2341 | switch (block.Type) |
2342 | { | 2342 | { |
@@ -2400,12 +2400,12 @@ namespace OpenSim.Region.ClientStack | |||
2400 | 2400 | ||
2401 | LLQuaternion rot3 = new LLQuaternion(block.Data, 0, true); | 2401 | LLQuaternion rot3 = new LLQuaternion(block.Data, 0, true); |
2402 | 2402 | ||
2403 | handler090 = OnUpdatePrimGroupRotation; | 2403 | handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; |
2404 | if (handler090 != null) | 2404 | if (handlerUpdatePrimRotation != null) |
2405 | { | 2405 | { |
2406 | 2406 | ||
2407 | // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); | 2407 | // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); |
2408 | handler090(localId, rot3, this); | 2408 | handlerUpdatePrimRotation(localId, rot3, this); |
2409 | } | 2409 | } |
2410 | break; | 2410 | break; |
2411 | case 11: | 2411 | case 11: |
@@ -2413,14 +2413,13 @@ namespace OpenSim.Region.ClientStack | |||
2413 | LLVector3 pos3 = new LLVector3(block.Data, 0); | 2413 | LLVector3 pos3 = new LLVector3(block.Data, 0); |
2414 | LLQuaternion rot4 = new LLQuaternion(block.Data, 12, true); | 2414 | LLQuaternion rot4 = new LLQuaternion(block.Data, 12, true); |
2415 | 2415 | ||
2416 | handler091 = OnUpdatePrimGroupMouseRotation; | 2416 | handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; |
2417 | if (handler091 != null) | 2417 | if (handlerUpdatePrimGroupRotation != null) |
2418 | { | 2418 | { |
2419 | 2419 | ||
2420 | //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z); | 2420 | //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z); |
2421 | // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); | 2421 | // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); |
2422 | handler091(localId, pos3, rot4, | 2422 | handlerUpdatePrimGroupRotation(localId, pos3, rot4, this); |
2423 | this); | ||
2424 | } | 2423 | } |
2425 | break; | 2424 | break; |
2426 | case 13: | 2425 | case 13: |
@@ -2819,10 +2818,10 @@ namespace OpenSim.Region.ClientStack | |||
2819 | 2818 | ||
2820 | protected void SendPacketStats() | 2819 | protected void SendPacketStats() |
2821 | { | 2820 | { |
2822 | handler093 = OnPacketStats; | 2821 | handlerPacketStats = OnPacketStats; |
2823 | if (handler093 != null) | 2822 | if (handlerPacketStats != null) |
2824 | { | 2823 | { |
2825 | handler093(m_packetsReceived - m_lastPacketsReceivedSentToScene, m_packetsSent - m_lastPacketsSentSentToScene, m_unAckedBytes); | 2824 | handlerPacketStats(m_packetsReceived - m_lastPacketsReceivedSentToScene, m_packetsSent - m_lastPacketsSentSentToScene, m_unAckedBytes); |
2826 | m_lastPacketsReceivedSentToScene = m_packetsReceived; | 2825 | m_lastPacketsReceivedSentToScene = m_packetsReceived; |
2827 | m_lastPacketsSentSentToScene = m_packetsSent; | 2826 | m_lastPacketsSentSentToScene = m_packetsSent; |
2828 | } | 2827 | } |
@@ -3565,11 +3564,11 @@ namespace OpenSim.Region.ClientStack | |||
3565 | //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request"); | 3564 | //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request"); |
3566 | TransferRequestPacket transfer = (TransferRequestPacket)Pack; | 3565 | TransferRequestPacket transfer = (TransferRequestPacket)Pack; |
3567 | m_assetCache.AddAssetRequest(this, transfer); | 3566 | m_assetCache.AddAssetRequest(this, transfer); |
3568 | /* handler094 = OnRequestAsset; | 3567 | /* RequestAsset = OnRequestAsset; |
3569 | if (handler094 != null) | 3568 | if (RequestAsset != null) |
3570 | { | 3569 | { |
3571 | handler094(this, transfer); | 3570 | RequestAsset(this, transfer); |
3572 | }*/ | 3571 | }*/ |
3573 | break; | 3572 | break; |
3574 | case PacketType.AssetUploadRequest: | 3573 | case PacketType.AssetUploadRequest: |
3575 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; | 3574 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; |
@@ -4175,10 +4174,10 @@ namespace OpenSim.Region.ClientStack | |||
4175 | 4174 | ||
4176 | if (gkupack.UserInfo.GodSessionID == SessionId && AgentId == gkupack.UserInfo.GodID) | 4175 | if (gkupack.UserInfo.GodSessionID == SessionId && AgentId == gkupack.UserInfo.GodID) |
4177 | { | 4176 | { |
4178 | handler092 = OnGodKickUser; | 4177 | handlerGodKickUser = OnGodKickUser; |
4179 | if (handler092 != null) | 4178 | if (handlerGodKickUser != null) |
4180 | { | 4179 | { |
4181 | handler092(gkupack.UserInfo.GodID, gkupack.UserInfo.GodSessionID, | 4180 | handlerGodKickUser(gkupack.UserInfo.GodID, gkupack.UserInfo.GodSessionID, |
4182 | gkupack.UserInfo.AgentID, (uint)0, gkupack.UserInfo.Reason); | 4181 | gkupack.UserInfo.AgentID, (uint)0, gkupack.UserInfo.Reason); |
4183 | } | 4182 | } |
4184 | } | 4183 | } |