diff options
author | Justin Clarke Casey | 2008-05-05 20:14:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-05 20:14:53 +0000 |
commit | 9655cf280779021e6241a08f8610cad9b982763f (patch) | |
tree | 82ef6d74969e4b64971d64a6a18e4488729167a8 /OpenSim/Region/ClientStack/LindenUDP | |
parent | * Just some tidy up and documentation before I make my first ever attempt to ... (diff) | |
download | opensim-SC-9655cf280779021e6241a08f8610cad9b982763f.zip opensim-SC-9655cf280779021e6241a08f8610cad9b982763f.tar.gz opensim-SC-9655cf280779021e6241a08f8610cad9b982763f.tar.bz2 opensim-SC-9655cf280779021e6241a08f8610cad9b982763f.tar.xz |
* Refactor: Break out permissions code into a separate region PermissionsModule
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index f2271fb..f7d6f9e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -4956,13 +4956,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4956 | { | 4956 | { |
4957 | case "getinfo": | 4957 | case "getinfo": |
4958 | 4958 | ||
4959 | if (((Scene)m_scene).PermissionsMngr.GenericEstatePermission(this.AgentId)) | 4959 | if (((Scene)m_scene).Permissions.GenericEstatePermission(this.AgentId)) |
4960 | { | 4960 | { |
4961 | OnDetailedEstateDataRequest(this, messagePacket.MethodData.Invoice); | 4961 | OnDetailedEstateDataRequest(this, messagePacket.MethodData.Invoice); |
4962 | } | 4962 | } |
4963 | break; | 4963 | break; |
4964 | case "setregioninfo": | 4964 | case "setregioninfo": |
4965 | if (((Scene)m_scene).PermissionsMngr.CanEditEstateTerrain(this.AgentId)) | 4965 | if (((Scene)m_scene).Permissions.CanEditEstateTerrain(this.AgentId)) |
4966 | { | 4966 | { |
4967 | OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter),convertParamStringToBool(messagePacket.ParamList[1].Parameter), | 4967 | OnSetEstateFlagsRequest(convertParamStringToBool(messagePacket.ParamList[0].Parameter),convertParamStringToBool(messagePacket.ParamList[1].Parameter), |
4968 | convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), | 4968 | convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), |
@@ -4975,7 +4975,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4975 | 4975 | ||
4976 | break; | 4976 | break; |
4977 | case "texturebase": | 4977 | case "texturebase": |
4978 | if (((Scene)m_scene).PermissionsMngr.CanEditEstateTerrain(this.AgentId)) | 4978 | if (((Scene)m_scene).Permissions.CanEditEstateTerrain(this.AgentId)) |
4979 | { | 4979 | { |
4980 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 4980 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
4981 | { | 4981 | { |
@@ -4990,7 +4990,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4990 | } | 4990 | } |
4991 | break; | 4991 | break; |
4992 | case "texturedetail": | 4992 | case "texturedetail": |
4993 | if (((Scene)m_scene).PermissionsMngr.CanEditEstateTerrain(this.AgentId)) | 4993 | if (((Scene)m_scene).Permissions.CanEditEstateTerrain(this.AgentId)) |
4994 | { | 4994 | { |
4995 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 4995 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
4996 | { | 4996 | { |
@@ -5008,7 +5008,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5008 | 5008 | ||
5009 | break; | 5009 | break; |
5010 | case "textureheights": | 5010 | case "textureheights": |
5011 | if (((Scene)m_scene).PermissionsMngr.CanEditEstateTerrain(this.AgentId)) | 5011 | if (((Scene)m_scene).Permissions.CanEditEstateTerrain(this.AgentId)) |
5012 | { | 5012 | { |
5013 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 5013 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
5014 | { | 5014 | { |
@@ -5029,7 +5029,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5029 | OnCommitEstateTerrainTextureRequest(this); | 5029 | OnCommitEstateTerrainTextureRequest(this); |
5030 | break; | 5030 | break; |
5031 | case "setregionterrain": | 5031 | case "setregionterrain": |
5032 | if (((Scene)m_scene).PermissionsMngr.CanEditEstateTerrain(this.AgentId)) | 5032 | if (((Scene)m_scene).Permissions.CanEditEstateTerrain(this.AgentId)) |
5033 | { | 5033 | { |
5034 | if (messagePacket.ParamList.Length != 9) | 5034 | if (messagePacket.ParamList.Length != 9) |
5035 | { | 5035 | { |
@@ -5064,7 +5064,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5064 | 5064 | ||
5065 | break; | 5065 | break; |
5066 | case "restart": | 5066 | case "restart": |
5067 | if (((Scene)m_scene).PermissionsMngr.CanRestartSim(this.AgentId)) | 5067 | if (((Scene)m_scene).Permissions.CanRestartSim(this.AgentId)) |
5068 | { | 5068 | { |
5069 | // There's only 1 block in the estateResetSim.. and that's the number of seconds till restart. | 5069 | // There's only 1 block in the estateResetSim.. and that's the number of seconds till restart. |
5070 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 5070 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
@@ -5078,7 +5078,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5078 | } | 5078 | } |
5079 | break; | 5079 | break; |
5080 | case "estatechangecovenantid": | 5080 | case "estatechangecovenantid": |
5081 | if (((Scene)m_scene).PermissionsMngr.CanEditEstateTerrain(this.AgentId)) | 5081 | if (((Scene)m_scene).Permissions.CanEditEstateTerrain(this.AgentId)) |
5082 | { | 5082 | { |
5083 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) | 5083 | foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) |
5084 | { | 5084 | { |
@@ -5088,7 +5088,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5088 | } | 5088 | } |
5089 | break; | 5089 | break; |
5090 | case "estateaccessdelta": // Estate access delta manages the banlist and allow list too. | 5090 | case "estateaccessdelta": // Estate access delta manages the banlist and allow list too. |
5091 | if (((Scene)m_scene).PermissionsMngr.GenericEstatePermission(this.AgentId)) | 5091 | if (((Scene)m_scene).Permissions.GenericEstatePermission(this.AgentId)) |
5092 | { | 5092 | { |
5093 | int estateAccessType = Convert.ToInt16(Helpers.FieldToUTF8String(messagePacket.ParamList[1].Parameter)); | 5093 | int estateAccessType = Convert.ToInt16(Helpers.FieldToUTF8String(messagePacket.ParamList[1].Parameter)); |
5094 | OnUpdateEstateAccessDeltaRequest(this, messagePacket.MethodData.Invoice,estateAccessType,new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter))); | 5094 | OnUpdateEstateAccessDeltaRequest(this, messagePacket.MethodData.Invoice,estateAccessType,new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter))); |
@@ -5096,7 +5096,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5096 | } | 5096 | } |
5097 | break; | 5097 | break; |
5098 | case "simulatormessage": | 5098 | case "simulatormessage": |
5099 | if (((Scene)m_scene).PermissionsMngr.GenericEstatePermission(this.AgentId)) | 5099 | if (((Scene)m_scene).Permissions.GenericEstatePermission(this.AgentId)) |
5100 | { | 5100 | { |
5101 | LLUUID invoice = messagePacket.MethodData.Invoice; | 5101 | LLUUID invoice = messagePacket.MethodData.Invoice; |
5102 | LLUUID SenderID = new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter)); | 5102 | LLUUID SenderID = new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter)); |
@@ -5107,7 +5107,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5107 | } | 5107 | } |
5108 | break; | 5108 | break; |
5109 | case "instantmessage": | 5109 | case "instantmessage": |
5110 | if (((Scene)m_scene).PermissionsMngr.GenericEstatePermission(this.AgentId)) | 5110 | if (((Scene)m_scene).Permissions.GenericEstatePermission(this.AgentId)) |
5111 | { | 5111 | { |
5112 | LLUUID invoice = messagePacket.MethodData.Invoice; | 5112 | LLUUID invoice = messagePacket.MethodData.Invoice; |
5113 | LLUUID SenderID = new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter)); | 5113 | LLUUID SenderID = new LLUUID(Helpers.FieldToUTF8String(messagePacket.ParamList[2].Parameter)); |
@@ -5118,7 +5118,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5118 | } | 5118 | } |
5119 | break; | 5119 | break; |
5120 | case "setregiondebug": | 5120 | case "setregiondebug": |
5121 | if (((Scene)m_scene).PermissionsMngr.GenericEstatePermission(this.AgentId)) | 5121 | if (((Scene)m_scene).Permissions.GenericEstatePermission(this.AgentId)) |
5122 | { | 5122 | { |
5123 | LLUUID invoice = messagePacket.MethodData.Invoice; | 5123 | LLUUID invoice = messagePacket.MethodData.Invoice; |
5124 | LLUUID SenderID = messagePacket.AgentData.AgentID; | 5124 | LLUUID SenderID = messagePacket.AgentData.AgentID; |
@@ -5130,7 +5130,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5130 | } | 5130 | } |
5131 | break; | 5131 | break; |
5132 | case "teleporthomeuser": | 5132 | case "teleporthomeuser": |
5133 | if (((Scene)m_scene).PermissionsMngr.GenericEstatePermission(this.AgentId)) | 5133 | if (((Scene)m_scene).Permissions.GenericEstatePermission(this.AgentId)) |
5134 | { | 5134 | { |
5135 | LLUUID invoice = messagePacket.MethodData.Invoice; | 5135 | LLUUID invoice = messagePacket.MethodData.Invoice; |
5136 | LLUUID SenderID = messagePacket.AgentData.AgentID; | 5136 | LLUUID SenderID = messagePacket.AgentData.AgentID; |