diff options
| author | UbitUmarov | 2017-01-06 01:09:42 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-06 01:09:42 +0000 |
| commit | 6172446e2afa53960b4e118e0b2ae199f6e17b3f (patch) | |
| tree | 835b484189907c74259d70e1841c151ea3bb8e3f /OpenSim/Region/CoreModules/Agent/AssetTransaction | |
| parent | fix merge (diff) | |
| parent | UserLevel must have a trusted source (diff) | |
| download | opensim-SC-6172446e2afa53960b4e118e0b2ae199f6e17b3f.zip opensim-SC-6172446e2afa53960b4e118e0b2ae199f6e17b3f.tar.gz opensim-SC-6172446e2afa53960b4e118e0b2ae199f6e17b3f.tar.bz2 opensim-SC-6172446e2afa53960b4e118e0b2ae199f6e17b3f.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs index 89fdf09..7d9f3b3 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
| @@ -255,7 +255,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 255 | // check user level | 255 | // check user level |
| 256 | if (avatar != null) | 256 | if (avatar != null) |
| 257 | { | 257 | { |
| 258 | if (avatar.UserLevel < m_levelUpload) | 258 | if (avatar.GodController.UserLevel < m_levelUpload) |
| 259 | { | 259 | { |
| 260 | remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false); | 260 | remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false); |
| 261 | return; | 261 | return; |