Changed a couple of method in PermissionManager from private to protected to fix the error that ckrinke just reported
parent
ad03c0dc69
commit
5fa0821531
|
@ -20,12 +20,12 @@ namespace OpenSim.Region.Environment
|
||||||
m_scene = world;
|
m_scene = world;
|
||||||
}
|
}
|
||||||
|
|
||||||
private virtual bool IsAdministrator(LLUUID user)
|
protected virtual bool IsAdministrator(LLUUID user)
|
||||||
{
|
{
|
||||||
return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
|
return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
|
||||||
}
|
}
|
||||||
|
|
||||||
private virtual bool IsEstateManager(LLUUID user)
|
protected virtual bool IsEstateManager(LLUUID user)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -51,7 +51,7 @@ namespace OpenSim.Region.Environment
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
SceneObject task = (SceneObject)m_scene.Entities[obj];
|
SceneObject task = (SceneObject)m_scene.Entities[obj];
|
||||||
LLUUID taskOwner; // Since we dont have a 'owner' property on task yet
|
LLUUID taskOwner = null; // Since we dont have a 'owner' property on task yet
|
||||||
|
|
||||||
// Object owners should be able to delete their own content
|
// Object owners should be able to delete their own content
|
||||||
if (user == taskOwner)
|
if (user == taskOwner)
|
||||||
|
|
|
@ -316,7 +316,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
this.m_particleSystem = pSystem.GetBytes();
|
this.m_particleSystem = pSystem.GetBytes();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#region Position
|
#region Position
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
|
|
Loading…
Reference in New Issue