diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 58bfefb..a5c63d6 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -201,17 +201,17 @@ namespace OpenSim.Region.ClientStack | |||
201 | private ParcelSelectObjects handler077 = null; //OnParcelSelectObjects; | 201 | private ParcelSelectObjects handler077 = null; //OnParcelSelectObjects; |
202 | private ParcelObjectOwnerRequest handler078 = null; //OnParcelObjectOwnerRequest; | 202 | private ParcelObjectOwnerRequest handler078 = null; //OnParcelObjectOwnerRequest; |
203 | private EstateOwnerMessageRequest handler079 = null; //OnEstateOwnerMessage; | 203 | private EstateOwnerMessageRequest handler079 = null; //OnEstateOwnerMessage; |
204 | private RegionInfoRequest handler080 = null; //OnRegionInfoRequest; | 204 | private RegionInfoRequest handlerRegionInfoRequest = null; //OnRegionInfoRequest; |
205 | private EstateCovenantRequest handler081 = null; //OnEstateCovenantRequest; | 205 | private EstateCovenantRequest handlerEstateCovenantRequest = null; //OnEstateCovenantRequest; |
206 | private RequestGodlikePowers handler082 = null; //OnRequestGodlikePowers; | 206 | private RequestGodlikePowers handlerReqGodlikePowers = null; //OnRequestGodlikePowers; |
207 | private GodKickUser handlerGodKickUser = null; //OnGodKickUser; | 207 | private GodKickUser handlerGodKickUser = null; //OnGodKickUser; |
208 | private ViewerEffectEventHandler handler083 = null; //OnViewerEffect; | 208 | private ViewerEffectEventHandler handlerViewerEffect = null; //OnViewerEffect; |
209 | private Action<IClientAPI> handler084 = null; //OnLogout; | 209 | private Action<IClientAPI> handlerLogout = null; //OnLogout; |
210 | private MoneyTransferRequest handler085 = null; //OnMoneyTransferRequest; | 210 | private MoneyTransferRequest handlerMoneyTransferRequest = null; //OnMoneyTransferRequest; |
211 | private UpdateVector handler086 = null; //OnUpdatePrimSinglePosition; | 211 | private UpdateVector handlerUpdatePrimSinglePosition = null; //OnUpdatePrimSinglePosition; |
212 | private UpdatePrimSingleRotation handler087 = null; //OnUpdatePrimSingleRotation; | 212 | private UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = null; //OnUpdatePrimSingleRotation; |
213 | private UpdateVector handler088 = null; //OnUpdatePrimScale; | 213 | private UpdateVector handlerUpdatePrimScale = null; //OnUpdatePrimScale; |
214 | private UpdateVector handler089 = null; //OnUpdatePrimGroupPosition; | 214 | private UpdateVector handlerUpdateVector = null; //OnUpdatePrimGroupPosition; |
215 | private UpdatePrimRotation handlerUpdatePrimRotation = null; //OnUpdatePrimGroupRotation; | 215 | private UpdatePrimRotation handlerUpdatePrimRotation = null; //OnUpdatePrimGroupRotation; |
216 | private UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = null; //OnUpdatePrimGroupMouseRotation; | 216 | private UpdatePrimGroupRotation handlerUpdatePrimGroupRotation = null; //OnUpdatePrimGroupMouseRotation; |
217 | private PacketStats handlerPacketStats = null; // OnPacketStats;# | 217 | private PacketStats handlerPacketStats = null; // OnPacketStats;# |
@@ -2240,10 +2240,10 @@ namespace OpenSim.Region.ClientStack | |||
2240 | // validate the agent owns the agentID and sessionID | 2240 | // validate the agent owns the agentID and sessionID |
2241 | if (money.MoneyData.SourceID == sender.AgentId && money.AgentData.AgentID == sender.AgentId && money.AgentData.SessionID == sender.SessionId) | 2241 | if (money.MoneyData.SourceID == sender.AgentId && money.AgentData.AgentID == sender.AgentId && money.AgentData.SessionID == sender.SessionId) |
2242 | { | 2242 | { |
2243 | handler085 = OnMoneyTransferRequest; | 2243 | handlerMoneyTransferRequest = OnMoneyTransferRequest; |
2244 | if (handler085 != null) | 2244 | if (handlerMoneyTransferRequest != null) |
2245 | { | 2245 | { |
2246 | handler085(money.MoneyData.SourceID, money.MoneyData.DestID, | 2246 | handlerMoneyTransferRequest(money.MoneyData.SourceID, money.MoneyData.DestID, |
2247 | money.MoneyData.Amount, money.MoneyData.TransactionType, | 2247 | money.MoneyData.Amount, money.MoneyData.TransactionType, |
2248 | Util.FieldToString(money.MoneyData.Description)); | 2248 | Util.FieldToString(money.MoneyData.Description)); |
2249 | } | 2249 | } |
@@ -2259,10 +2259,10 @@ namespace OpenSim.Region.ClientStack | |||
2259 | private bool HandleViewerEffect(IClientAPI sender, Packet Pack) | 2259 | private bool HandleViewerEffect(IClientAPI sender, Packet Pack) |
2260 | { | 2260 | { |
2261 | ViewerEffectPacket viewer = (ViewerEffectPacket)Pack; | 2261 | ViewerEffectPacket viewer = (ViewerEffectPacket)Pack; |
2262 | handler083 = OnViewerEffect; | 2262 | handlerViewerEffect = OnViewerEffect; |
2263 | if (handler083 != null) | 2263 | if (handlerViewerEffect != null) |
2264 | { | 2264 | { |
2265 | handler083(sender, viewer.Effect); | 2265 | handlerViewerEffect(sender, viewer.Effect); |
2266 | } | 2266 | } |
2267 | 2267 | ||
2268 | return true; | 2268 | return true; |
@@ -2272,11 +2272,11 @@ namespace OpenSim.Region.ClientStack | |||
2272 | { | 2272 | { |
2273 | m_log.Info("[CLIENT]: Got a logout request"); | 2273 | m_log.Info("[CLIENT]: Got a logout request"); |
2274 | 2274 | ||
2275 | handler084 = OnLogout; | 2275 | handlerLogout = OnLogout; |
2276 | 2276 | ||
2277 | if (handler084 != null) | 2277 | if (handlerLogout != null) |
2278 | { | 2278 | { |
2279 | handler084(client); | 2279 | handlerLogout(client); |
2280 | } | 2280 | } |
2281 | 2281 | ||
2282 | return true; | 2282 | return true; |
@@ -2343,57 +2343,57 @@ namespace OpenSim.Region.ClientStack | |||
2343 | case 1: | 2343 | case 1: |
2344 | LLVector3 pos1 = new LLVector3(block.Data, 0); | 2344 | LLVector3 pos1 = new LLVector3(block.Data, 0); |
2345 | 2345 | ||
2346 | handler086 = OnUpdatePrimSinglePosition; | 2346 | handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; |
2347 | if (handler086 != null) | 2347 | if (handlerUpdatePrimSinglePosition != null) |
2348 | { | 2348 | { |
2349 | 2349 | ||
2350 | // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); | 2350 | // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); |
2351 | handler086(localId, pos1, this); | 2351 | handlerUpdatePrimSinglePosition(localId, pos1, this); |
2352 | } | 2352 | } |
2353 | break; | 2353 | break; |
2354 | case 2: | 2354 | case 2: |
2355 | LLQuaternion rot1 = new LLQuaternion(block.Data, 0, true); | 2355 | LLQuaternion rot1 = new LLQuaternion(block.Data, 0, true); |
2356 | 2356 | ||
2357 | handler087 = OnUpdatePrimSingleRotation; | 2357 | handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; |
2358 | if (handler087 != null) | 2358 | if (handlerUpdatePrimSingleRotation != null) |
2359 | { | 2359 | { |
2360 | 2360 | ||
2361 | //System.Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); | 2361 | //System.Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); |
2362 | handler087(localId, rot1, this); | 2362 | handlerUpdatePrimSingleRotation(localId, rot1, this); |
2363 | } | 2363 | } |
2364 | break; | 2364 | break; |
2365 | case 3: | 2365 | case 3: |
2366 | 2366 | ||
2367 | LLQuaternion rot2 = new LLQuaternion(block.Data, 12, true); | 2367 | LLQuaternion rot2 = new LLQuaternion(block.Data, 12, true); |
2368 | handler087 = OnUpdatePrimSingleRotation; | 2368 | handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; |
2369 | if (handler087 != null) | 2369 | if (handlerUpdatePrimSingleRotation != null) |
2370 | { | 2370 | { |
2371 | 2371 | ||
2372 | //System.Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); | 2372 | //System.Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); |
2373 | handler087(localId, rot2, this); | 2373 | handlerUpdatePrimSingleRotation(localId, rot2, this); |
2374 | } | 2374 | } |
2375 | break; | 2375 | break; |
2376 | case 5: | 2376 | case 5: |
2377 | 2377 | ||
2378 | LLVector3 scale1 = new LLVector3(block.Data, 12); | 2378 | LLVector3 scale1 = new LLVector3(block.Data, 12); |
2379 | 2379 | ||
2380 | handler088 = OnUpdatePrimScale; | 2380 | handlerUpdatePrimScale = OnUpdatePrimScale; |
2381 | if (handler088 != null) | 2381 | if (handlerUpdatePrimScale != null) |
2382 | { | 2382 | { |
2383 | 2383 | ||
2384 | // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | 2384 | // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); |
2385 | handler088(localId, scale1, this); | 2385 | handlerUpdatePrimScale(localId, scale1, this); |
2386 | } | 2386 | } |
2387 | break; | 2387 | break; |
2388 | case 9: | 2388 | case 9: |
2389 | LLVector3 pos2 = new LLVector3(block.Data, 0); | 2389 | LLVector3 pos2 = new LLVector3(block.Data, 0); |
2390 | 2390 | ||
2391 | handler089 = OnUpdatePrimGroupPosition; | 2391 | handlerUpdateVector = OnUpdatePrimGroupPosition; |
2392 | 2392 | ||
2393 | if (handler089 != null) | 2393 | if (handlerUpdateVector != null) |
2394 | { | 2394 | { |
2395 | 2395 | ||
2396 | handler089(localId, pos2, this); | 2396 | handlerUpdateVector(localId, pos2, this); |
2397 | } | 2397 | } |
2398 | break; | 2398 | break; |
2399 | case 10: | 2399 | case 10: |
@@ -2427,19 +2427,19 @@ namespace OpenSim.Region.ClientStack | |||
2427 | LLVector3 scale2 = new LLVector3(block.Data, 12); | 2427 | LLVector3 scale2 = new LLVector3(block.Data, 12); |
2428 | LLVector3 pos4 = new LLVector3(block.Data, 0); | 2428 | LLVector3 pos4 = new LLVector3(block.Data, 0); |
2429 | 2429 | ||
2430 | handler088 = OnUpdatePrimScale; | 2430 | handlerUpdatePrimScale = OnUpdatePrimScale; |
2431 | if (handler088 != null) | 2431 | if (handlerUpdatePrimScale != null) |
2432 | { | 2432 | { |
2433 | 2433 | ||
2434 | //Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | 2434 | //Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); |
2435 | handler088(localId, scale2, this); | 2435 | handlerUpdatePrimScale(localId, scale2, this); |
2436 | 2436 | ||
2437 | // Change the position based on scale (for bug number 246) | 2437 | // Change the position based on scale (for bug number 246) |
2438 | handler086 = OnUpdatePrimSinglePosition; | 2438 | handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; |
2439 | // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); | 2439 | // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); |
2440 | if (handler086 != null) | 2440 | if (handlerUpdatePrimSinglePosition != null) |
2441 | { | 2441 | { |
2442 | handler086(localId, pos4, this); | 2442 | handlerUpdatePrimSinglePosition(localId, pos4, this); |
2443 | } | 2443 | } |
2444 | } | 2444 | } |
2445 | break; | 2445 | break; |
@@ -2447,27 +2447,27 @@ namespace OpenSim.Region.ClientStack | |||
2447 | LLVector3 scale5 = new LLVector3(block.Data, 12); | 2447 | LLVector3 scale5 = new LLVector3(block.Data, 12); |
2448 | LLVector3 pos5 = new LLVector3(block.Data, 0); | 2448 | LLVector3 pos5 = new LLVector3(block.Data, 0); |
2449 | 2449 | ||
2450 | handler088 = OnUpdatePrimScale; | 2450 | handlerUpdatePrimScale = OnUpdatePrimScale; |
2451 | if (handler088 != null) | 2451 | if (handlerUpdatePrimScale != null) |
2452 | { | 2452 | { |
2453 | 2453 | ||
2454 | // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z ); | 2454 | // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z ); |
2455 | handler088(localId, scale5, this); | 2455 | handlerUpdatePrimScale(localId, scale5, this); |
2456 | 2456 | ||
2457 | handler086 = OnUpdatePrimSinglePosition; | 2457 | handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; |
2458 | if (handler086 != null) | 2458 | if (handlerUpdatePrimSinglePosition != null) |
2459 | { | 2459 | { |
2460 | handler086(localId, pos5, this); | 2460 | handlerUpdatePrimSinglePosition(localId, pos5, this); |
2461 | } | 2461 | } |
2462 | } | 2462 | } |
2463 | break; | 2463 | break; |
2464 | case 21: | 2464 | case 21: |
2465 | LLVector3 scale6 = new LLVector3(block.Data, 12); | 2465 | LLVector3 scale6 = new LLVector3(block.Data, 12); |
2466 | handler088 = OnUpdatePrimScale; | 2466 | handlerUpdatePrimScale = OnUpdatePrimScale; |
2467 | if (handler088 != null) | 2467 | if (handlerUpdatePrimScale != null) |
2468 | { | 2468 | { |
2469 | // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | 2469 | // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); |
2470 | handler088(localId, scale6, this); | 2470 | handlerUpdatePrimScale(localId, scale6, this); |
2471 | } | 2471 | } |
2472 | break; | 2472 | break; |
2473 | } | 2473 | } |
@@ -4129,10 +4129,10 @@ namespace OpenSim.Region.ClientStack | |||
4129 | case PacketType.RequestRegionInfo: | 4129 | case PacketType.RequestRegionInfo: |
4130 | RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; | 4130 | RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; |
4131 | 4131 | ||
4132 | handler080 = OnRegionInfoRequest; | 4132 | handlerRegionInfoRequest = OnRegionInfoRequest; |
4133 | if (handler080 != null) | 4133 | if (handlerRegionInfoRequest != null) |
4134 | { | 4134 | { |
4135 | handler080(this, mPacket.SessionID); | 4135 | handlerRegionInfoRequest(this, mPacket.SessionID); |
4136 | } | 4136 | } |
4137 | break; | 4137 | break; |
4138 | case PacketType.EstateCovenantRequest: | 4138 | case PacketType.EstateCovenantRequest: |
@@ -4140,10 +4140,10 @@ namespace OpenSim.Region.ClientStack | |||
4140 | EstateCovenantRequestPacket.AgentDataBlock epack = | 4140 | EstateCovenantRequestPacket.AgentDataBlock epack = |
4141 | ((EstateCovenantRequestPacket)Pack).AgentData; | 4141 | ((EstateCovenantRequestPacket)Pack).AgentData; |
4142 | 4142 | ||
4143 | handler081 = OnEstateCovenantRequest; | 4143 | handlerEstateCovenantRequest = OnEstateCovenantRequest; |
4144 | if (handler081 != null) | 4144 | if (handlerEstateCovenantRequest != null) |
4145 | { | 4145 | { |
4146 | handler081(this, epack.SessionID); | 4146 | handlerEstateCovenantRequest(this, epack.SessionID); |
4147 | } | 4147 | } |
4148 | break; | 4148 | break; |
4149 | 4149 | ||
@@ -4158,11 +4158,11 @@ namespace OpenSim.Region.ClientStack | |||
4158 | LLUUID token = rblock.Token; | 4158 | LLUUID token = rblock.Token; |
4159 | RequestGodlikePowersPacket.AgentDataBlock ablock = rglpPack.AgentData; | 4159 | RequestGodlikePowersPacket.AgentDataBlock ablock = rglpPack.AgentData; |
4160 | 4160 | ||
4161 | handler082 = OnRequestGodlikePowers; | 4161 | handlerReqGodlikePowers = OnRequestGodlikePowers; |
4162 | 4162 | ||
4163 | if (handler082 != null) | 4163 | if (handlerReqGodlikePowers != null) |
4164 | { | 4164 | { |
4165 | handler082(ablock.AgentID, ablock.SessionID, token, this); | 4165 | handlerReqGodlikePowers(ablock.AgentID, ablock.SessionID, token, this); |
4166 | } | 4166 | } |
4167 | 4167 | ||
4168 | break; | 4168 | break; |