aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps
diff options
context:
space:
mode:
authorUbitUmarov2017-01-06 01:09:42 +0000
committerUbitUmarov2017-01-06 01:09:42 +0000
commit6172446e2afa53960b4e118e0b2ae199f6e17b3f (patch)
tree835b484189907c74259d70e1841c151ea3bb8e3f /OpenSim/Region/ClientStack/Linden/Caps
parentfix merge (diff)
parentUserLevel must have a trusted source (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 8cb40e1..58b7b00 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -537,7 +537,7 @@ namespace OpenSim.Region.ClientStack.Linden
537 // check user level 537 // check user level
538 if (avatar != null) 538 if (avatar != null)
539 { 539 {
540 if (avatar.UserLevel < m_levelUpload) 540 if (avatar.GodController.UserLevel < m_levelUpload)
541 { 541 {
542 LLSDAssetUploadError resperror = new LLSDAssetUploadError(); 542 LLSDAssetUploadError resperror = new LLSDAssetUploadError();
543 resperror.message = "Insufficient permissions to upload"; 543 resperror.message = "Insufficient permissions to upload";