diff options
| author | Justin Clark-Casey (justincc) | 2010-04-19 21:34:42 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-19 21:34:42 +0100 |
| commit | 50f327ef5c63959b7dcfbd4e19761f3a8a8038c8 (patch) | |
| tree | c979aa5e1a0fd45556b6b800f17b8944f05e630d | |
| parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-50f327ef5c63959b7dcfbd4e19761f3a8a8038c8.zip opensim-SC_OLD-50f327ef5c63959b7dcfbd4e19761f3a8a8038c8.tar.gz opensim-SC_OLD-50f327ef5c63959b7dcfbd4e19761f3a8a8038c8.tar.bz2 opensim-SC_OLD-50f327ef5c63959b7dcfbd4e19761f3a8a8038c8.tar.xz | |
minor: change a comment and replace some magic numbers with the AssetType enum
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index c4e8e09..d7120a5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -7132,7 +7132,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 7132 | else | 7132 | else |
| 7133 | { | 7133 | { |
| 7134 | // TODO: Change this code to allow items other than notecards and scripts to be successfully | 7134 | // TODO: Change this code to allow items other than notecards and scripts to be successfully |
| 7135 | // shared with group. In fact, all this permissions checking should move to an IPermissionsModule | 7135 | // shared with group. In fact, this whole block of permissions checking should move to an IPermissionsModule |
| 7136 | if (part.OwnerID != AgentId) | 7136 | if (part.OwnerID != AgentId) |
| 7137 | { | 7137 | { |
| 7138 | m_log.WarnFormat( | 7138 | m_log.WarnFormat( |
| @@ -7194,7 +7194,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 7194 | // only to notecards and scripts. All | 7194 | // only to notecards and scripts. All |
| 7195 | // other asset types are always available | 7195 | // other asset types are always available |
| 7196 | // | 7196 | // |
| 7197 | if (assetRequestItem.AssetType == 10) | 7197 | if (assetRequestItem.AssetType == (int)AssetType.LSLText) |
| 7198 | { | 7198 | { |
| 7199 | if (!((Scene)m_scene).Permissions.CanViewScript(itemID, UUID.Zero, AgentId)) | 7199 | if (!((Scene)m_scene).Permissions.CanViewScript(itemID, UUID.Zero, AgentId)) |
| 7200 | { | 7200 | { |
| @@ -7202,7 +7202,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 7202 | return true; | 7202 | return true; |
| 7203 | } | 7203 | } |
| 7204 | } | 7204 | } |
| 7205 | else if (assetRequestItem.AssetType == 7) | 7205 | else if (assetRequestItem.AssetType == (int)AssetType.Notecard) |
| 7206 | { | 7206 | { |
| 7207 | if (!((Scene)m_scene).Permissions.CanViewNotecard(itemID, UUID.Zero, AgentId)) | 7207 | if (!((Scene)m_scene).Permissions.CanViewNotecard(itemID, UUID.Zero, AgentId)) |
| 7208 | { | 7208 | { |