ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2017-01-06 01:09:42 +00:00
parent 254b26a7d5 78ed9c81ff
commit 6172446e2a
22 changed files with 344 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@@ -537,7 +537,7 @@ namespace OpenSim.Region.ClientStack.Linden
// check user level
if (avatar != null)
{
if (avatar.UserLevel < m_levelUpload)
if (avatar.GodController.UserLevel < m_levelUpload)
{
LLSDAssetUploadError resperror = new LLSDAssetUploadError();
resperror.message = "Insufficient permissions to upload";

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -11455,7 +11455,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ScenePresence p;
if (scene.TryGetScenePresence(sender.AgentId, out p))
{
if (p.GodLevel >= 200)
if (p.GodController.GodLevel >= 200)
{
groupProfileReply.GroupData.OpenEnrollment = true;
groupProfileReply.GroupData.MembershipFee = 0;