aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs31
1 files changed, 15 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 245f533..bfc7b41 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5465,14 +5465,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5465 switch (Helpers.FieldToUTF8String(messagePacket.MethodData.Method)) 5465 switch (Helpers.FieldToUTF8String(messagePacket.MethodData.Method))
5466 { 5466 {
5467 case "getinfo": 5467 case "getinfo":
5468 5468 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5469 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId))
5470 { 5469 {
5471 OnDetailedEstateDataRequest(this, messagePacket.MethodData.Invoice); 5470 OnDetailedEstateDataRequest(this, messagePacket.MethodData.Invoice);
5472 } 5471 }
5473 break; 5472 break;
5474 case "setregioninfo": 5473 case "setregioninfo":
5475 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5474 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5476 { 5475 {
5477 OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), 5476 OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter),
5478 convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), 5477 convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter),
@@ -5485,7 +5484,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5485 5484
5486 break; 5485 break;
5487// case "texturebase": 5486// case "texturebase":
5488// if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5487// if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5489// { 5488// {
5490// foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) 5489// foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
5491// { 5490// {
@@ -5500,7 +5499,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5500// } 5499// }
5501// break; 5500// break;
5502 case "texturedetail": 5501 case "texturedetail":
5503 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5502 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5504 { 5503 {
5505 foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) 5504 foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
5506 { 5505 {
@@ -5518,7 +5517,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5518 5517
5519 break; 5518 break;
5520 case "textureheights": 5519 case "textureheights":
5521 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5520 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5522 { 5521 {
5523 foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) 5522 foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
5524 { 5523 {
@@ -5539,7 +5538,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5539 OnCommitEstateTerrainTextureRequest(this); 5538 OnCommitEstateTerrainTextureRequest(this);
5540 break; 5539 break;
5541 case "setregionterrain": 5540 case "setregionterrain":
5542 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5541 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5543 { 5542 {
5544 if (messagePacket.ParamList.Length != 9) 5543 if (messagePacket.ParamList.Length != 9)
5545 { 5544 {
@@ -5578,7 +5577,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5578 5577
5579 break; 5578 break;
5580 case "restart": 5579 case "restart":
5581 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5580 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5582 { 5581 {
5583 // There's only 1 block in the estateResetSim.. and that's the number of seconds till restart. 5582 // There's only 1 block in the estateResetSim.. and that's the number of seconds till restart.
5584 foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) 5583 foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
@@ -5592,7 +5591,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5592 } 5591 }
5593 break; 5592 break;
5594 case "estatechangecovenantid": 5593 case "estatechangecovenantid":
5595 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5594 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5596 { 5595 {
5597 foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) 5596 foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList)
5598 { 5597 {
@@ -5602,7 +5601,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5602 } 5601 }
5603 break; 5602 break;
5604 case "estateaccessdelta": // Estate access delta manages the banlist and allow list too. 5603 case "estateaccessdelta": // Estate access delta manages the banlist and allow list too.
5605 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5604 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5606 { 5605 {
5607 int estateAccessType = Convert.ToInt16(Helpers.FieldToUTF8String(messagePacket.ParamList[1].Parameter)); 5606 int estateAccessType = Convert.ToInt16(Helpers.FieldToUTF8String(messagePacket.ParamList[1].Parameter));
5608 OnUpdateEstateAccessDeltaRequest(this, messagePacket.MethodData.Invoice, estateAccessType, new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter))); 5607 OnUpdateEstateAccessDeltaRequest(this, messagePacket.MethodData.Invoice, estateAccessType, new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter)));
@@ -5610,7 +5609,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5610 } 5609 }
5611 break; 5610 break;
5612 case "simulatormessage": 5611 case "simulatormessage":
5613 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5612 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5614 { 5613 {
5615 LLUUID invoice = messagePacket.MethodData.Invoice; 5614 LLUUID invoice = messagePacket.MethodData.Invoice;
5616 LLUUID SenderID = new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter)); 5615 LLUUID SenderID = new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter));
@@ -5621,7 +5620,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5621 } 5620 }
5622 break; 5621 break;
5623 case "instantmessage": 5622 case "instantmessage":
5624 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5623 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5625 { 5624 {
5626 if (messagePacket.ParamList.Length < 5) 5625 if (messagePacket.ParamList.Length < 5)
5627 break; 5626 break;
@@ -5634,7 +5633,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5634 } 5633 }
5635 break; 5634 break;
5636 case "setregiondebug": 5635 case "setregiondebug":
5637 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5636 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5638 { 5637 {
5639 LLUUID invoice = messagePacket.MethodData.Invoice; 5638 LLUUID invoice = messagePacket.MethodData.Invoice;
5640 LLUUID SenderID = messagePacket.AgentData.AgentID; 5639 LLUUID SenderID = messagePacket.AgentData.AgentID;
@@ -5646,7 +5645,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5646 } 5645 }
5647 break; 5646 break;
5648 case "teleporthomeuser": 5647 case "teleporthomeuser":
5649 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5648 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5650 { 5649 {
5651 LLUUID invoice = messagePacket.MethodData.Invoice; 5650 LLUUID invoice = messagePacket.MethodData.Invoice;
5652 LLUUID SenderID = messagePacket.AgentData.AgentID; 5651 LLUUID SenderID = messagePacket.AgentData.AgentID;
@@ -5672,7 +5671,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5672 } 5671 }
5673 break; 5672 break;
5674 case "terrain": 5673 case "terrain":
5675 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5674 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5676 { 5675 {
5677 handlerBakeTerrain = OnBakeTerrain; 5676 handlerBakeTerrain = OnBakeTerrain;
5678 if (handlerBakeTerrain != null) 5677 if (handlerBakeTerrain != null)
@@ -5683,7 +5682,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5683 break; 5682 break;
5684 5683
5685 case "estatechangeinfo": 5684 case "estatechangeinfo":
5686 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId)) 5685 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId, false))
5687 { 5686 {
5688 LLUUID invoice = messagePacket.MethodData.Invoice; 5687 LLUUID invoice = messagePacket.MethodData.Invoice;
5689 LLUUID SenderID = messagePacket.AgentData.AgentID; 5688 LLUUID SenderID = messagePacket.AgentData.AgentID;