diff options
author | Melanie Thielker | 2008-11-21 22:14:57 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-21 22:14:57 +0000 |
commit | ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9 (patch) | |
tree | db636daea691f80b0d8bfd3970b8ced36ef9ced0 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | * Comment out unused access time method in MSSQL (diff) | |
download | opensim-SC_OLD-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.zip opensim-SC_OLD-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.tar.gz opensim-SC_OLD-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.tar.bz2 opensim-SC_OLD-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.tar.xz |
Refactor: Scene.ExternalChecks -> Scene.Permissions. Also make all
the internals of the permissions module adapter sane
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 9874886..a897aa2 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1095,7 +1095,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1095 | string fromName, byte dialog, uint timeStamp, | 1095 | string fromName, byte dialog, uint timeStamp, |
1096 | UUID transactionID, bool fromGroup, byte[] binaryBucket) | 1096 | UUID transactionID, bool fromGroup, byte[] binaryBucket) |
1097 | { | 1097 | { |
1098 | if (((Scene)(m_scene)).ExternalChecks.ExternalChecksCanInstantMessage(fromAgent, toAgent)) | 1098 | if (((Scene)(m_scene)).Permissions.CanInstantMessage(fromAgent, toAgent)) |
1099 | { | 1099 | { |
1100 | ImprovedInstantMessagePacket msg | 1100 | ImprovedInstantMessagePacket msg |
1101 | = (ImprovedInstantMessagePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedInstantMessage); | 1101 | = (ImprovedInstantMessagePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedInstantMessage); |
@@ -4984,7 +4984,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4984 | UUID taskID = new UUID(transfer.TransferInfo.Params, 48); | 4984 | UUID taskID = new UUID(transfer.TransferInfo.Params, 48); |
4985 | UUID itemID = new UUID(transfer.TransferInfo.Params, 64); | 4985 | UUID itemID = new UUID(transfer.TransferInfo.Params, 64); |
4986 | UUID requestID = new UUID(transfer.TransferInfo.Params, 80); | 4986 | UUID requestID = new UUID(transfer.TransferInfo.Params, 80); |
4987 | if (!(((Scene)m_scene).ExternalChecks.ExternalChecksBypassPermissions())) | 4987 | if (!(((Scene)m_scene).Permissions.BypassPermissions())) |
4988 | { | 4988 | { |
4989 | if (taskID != UUID.Zero) // Prim | 4989 | if (taskID != UUID.Zero) // Prim |
4990 | { | 4990 | { |
@@ -5040,7 +5040,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5040 | // | 5040 | // |
5041 | if (assetRequestItem.AssetType == 10) | 5041 | if (assetRequestItem.AssetType == 10) |
5042 | { | 5042 | { |
5043 | if (!((Scene)m_scene).ExternalChecks.ExternalChecksCanViewScript(itemID, UUID.Zero, AgentId)) | 5043 | if (!((Scene)m_scene).Permissions.CanViewScript(itemID, UUID.Zero, AgentId)) |
5044 | { | 5044 | { |
5045 | SendAgentAlertMessage("Insufficient permissions to view script", false); | 5045 | SendAgentAlertMessage("Insufficient permissions to view script", false); |
5046 | break; | 5046 | break; |
@@ -5048,7 +5048,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5048 | } | 5048 | } |
5049 | else if (assetRequestItem.AssetType == 7) | 5049 | else if (assetRequestItem.AssetType == 7) |
5050 | { | 5050 | { |
5051 | if (!((Scene)m_scene).ExternalChecks.ExternalChecksCanViewNotecard(itemID, UUID.Zero, AgentId)) | 5051 | if (!((Scene)m_scene).Permissions.CanViewNotecard(itemID, UUID.Zero, AgentId)) |
5052 | { | 5052 | { |
5053 | SendAgentAlertMessage("Insufficient permissions to view notecard", false); | 5053 | SendAgentAlertMessage("Insufficient permissions to view notecard", false); |
5054 | break; | 5054 | break; |
@@ -5799,13 +5799,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5799 | switch (Utils.BytesToString(messagePacket.MethodData.Method)) | 5799 | switch (Utils.BytesToString(messagePacket.MethodData.Method)) |
5800 | { | 5800 | { |
5801 | case "getinfo": | 5801 | case "getinfo": |
5802 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5802 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5803 | { | 5803 | { |
5804 | OnDetailedEstateDataRequest(this, messagePacket.MethodData.Invoice); | 5804 | OnDetailedEstateDataRequest(this, messagePacket.MethodData.Invoice); |
5805 | } | 5805 | } |
5806 | break; | 5806 | break; |
5807 | case "setregioninfo": | 5807 | case "setregioninfo": |
5808 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5808 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5809 | { | 5809 | { |
5810 | OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), | 5810 | OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), |
5811 | convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), | 5811 | convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), |
@@ -5818,7 +5818,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5818 | 5818 | ||
5819 | break; | 5819 | break; |
5820 | // case "texturebase": | 5820 | // case "texturebase": |
5821 | // if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5821 | // if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5822 | // { | 5822 | // { |
5823 | // foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 5823 | // foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
5824 | // { | 5824 | // { |
@@ -5833,7 +5833,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5833 | // } | 5833 | // } |
5834 | // break; | 5834 | // break; |
5835 | case "texturedetail": | 5835 | case "texturedetail": |
5836 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5836 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5837 | { | 5837 | { |
5838 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 5838 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
5839 | { | 5839 | { |
@@ -5851,7 +5851,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5851 | 5851 | ||
5852 | break; | 5852 | break; |
5853 | case "textureheights": | 5853 | case "textureheights": |
5854 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5854 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5855 | { | 5855 | { |
5856 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 5856 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
5857 | { | 5857 | { |
@@ -5872,7 +5872,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5872 | OnCommitEstateTerrainTextureRequest(this); | 5872 | OnCommitEstateTerrainTextureRequest(this); |
5873 | break; | 5873 | break; |
5874 | case "setregionterrain": | 5874 | case "setregionterrain": |
5875 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5875 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5876 | { | 5876 | { |
5877 | if (messagePacket.ParamList.Length != 9) | 5877 | if (messagePacket.ParamList.Length != 9) |
5878 | { | 5878 | { |
@@ -5910,7 +5910,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5910 | 5910 | ||
5911 | break; | 5911 | break; |
5912 | case "restart": | 5912 | case "restart": |
5913 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5913 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5914 | { | 5914 | { |
5915 | // There's only 1 block in the estateResetSim.. and that's the number of seconds till restart. | 5915 | // There's only 1 block in the estateResetSim.. and that's the number of seconds till restart. |
5916 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 5916 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
@@ -5924,7 +5924,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5924 | } | 5924 | } |
5925 | break; | 5925 | break; |
5926 | case "estatechangecovenantid": | 5926 | case "estatechangecovenantid": |
5927 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5927 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5928 | { | 5928 | { |
5929 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 5929 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
5930 | { | 5930 | { |
@@ -5934,7 +5934,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5934 | } | 5934 | } |
5935 | break; | 5935 | break; |
5936 | case "estateaccessdelta": // Estate access delta manages the banlist and allow list too. | 5936 | case "estateaccessdelta": // Estate access delta manages the banlist and allow list too. |
5937 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5937 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5938 | { | 5938 | { |
5939 | int estateAccessType = Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[1].Parameter)); | 5939 | int estateAccessType = Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[1].Parameter)); |
5940 | OnUpdateEstateAccessDeltaRequest(this, messagePacket.MethodData.Invoice, estateAccessType, new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter))); | 5940 | OnUpdateEstateAccessDeltaRequest(this, messagePacket.MethodData.Invoice, estateAccessType, new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter))); |
@@ -5942,7 +5942,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5942 | } | 5942 | } |
5943 | break; | 5943 | break; |
5944 | case "simulatormessage": | 5944 | case "simulatormessage": |
5945 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5945 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5946 | { | 5946 | { |
5947 | UUID invoice = messagePacket.MethodData.Invoice; | 5947 | UUID invoice = messagePacket.MethodData.Invoice; |
5948 | UUID SenderID = new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter)); | 5948 | UUID SenderID = new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter)); |
@@ -5953,7 +5953,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5953 | } | 5953 | } |
5954 | break; | 5954 | break; |
5955 | case "instantmessage": | 5955 | case "instantmessage": |
5956 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5956 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5957 | { | 5957 | { |
5958 | if (messagePacket.ParamList.Length < 5) | 5958 | if (messagePacket.ParamList.Length < 5) |
5959 | break; | 5959 | break; |
@@ -5966,7 +5966,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5966 | } | 5966 | } |
5967 | break; | 5967 | break; |
5968 | case "setregiondebug": | 5968 | case "setregiondebug": |
5969 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5969 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5970 | { | 5970 | { |
5971 | UUID invoice = messagePacket.MethodData.Invoice; | 5971 | UUID invoice = messagePacket.MethodData.Invoice; |
5972 | UUID SenderID = messagePacket.AgentData.AgentID; | 5972 | UUID SenderID = messagePacket.AgentData.AgentID; |
@@ -5978,7 +5978,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5978 | } | 5978 | } |
5979 | break; | 5979 | break; |
5980 | case "teleporthomeuser": | 5980 | case "teleporthomeuser": |
5981 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5981 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5982 | { | 5982 | { |
5983 | UUID invoice = messagePacket.MethodData.Invoice; | 5983 | UUID invoice = messagePacket.MethodData.Invoice; |
5984 | UUID SenderID = messagePacket.AgentData.AgentID; | 5984 | UUID SenderID = messagePacket.AgentData.AgentID; |
@@ -5990,7 +5990,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5990 | } | 5990 | } |
5991 | break; | 5991 | break; |
5992 | case "teleporthomeallusers": | 5992 | case "teleporthomeallusers": |
5993 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 5993 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
5994 | { | 5994 | { |
5995 | UUID invoice = messagePacket.MethodData.Invoice; | 5995 | UUID invoice = messagePacket.MethodData.Invoice; |
5996 | UUID SenderID = messagePacket.AgentData.AgentID; | 5996 | UUID SenderID = messagePacket.AgentData.AgentID; |
@@ -6012,7 +6012,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6012 | } | 6012 | } |
6013 | break; | 6013 | break; |
6014 | case "terrain": | 6014 | case "terrain": |
6015 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 6015 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
6016 | { | 6016 | { |
6017 | if (messagePacket.ParamList.Length > 0) | 6017 | if (messagePacket.ParamList.Length > 0) |
6018 | { | 6018 | { |
@@ -6054,7 +6054,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6054 | break; | 6054 | break; |
6055 | 6055 | ||
6056 | case "estatechangeinfo": | 6056 | case "estatechangeinfo": |
6057 | if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(AgentId, false)) | 6057 | if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) |
6058 | { | 6058 | { |
6059 | UUID invoice = messagePacket.MethodData.Invoice; | 6059 | UUID invoice = messagePacket.MethodData.Invoice; |
6060 | UUID SenderID = messagePacket.AgentData.AgentID; | 6060 | UUID SenderID = messagePacket.AgentData.AgentID; |