* Added the ability for Region Owners to add and remove estate managers using the estate tools.

* Estate managers get abilities like the region owner for now.
* Estate managers, you'll need to request server admin status to be able to activate the estate tools dialog (haven't figured out why this is the case yet)
* Switching from grid mode to standalone or switching grids will make the stored Estate Manager UUIDs not match up with a valid account so you'll see (waiting) listed there instead of a user until you reset them or go back to the grid you added them from.
This commit is contained in:
Teravus Ovares
2008-01-02 20:25:47 +00:00
parent d893c91249
commit a72d33d3a5
3 changed files with 142 additions and 29 deletions

View File

@@ -1790,7 +1790,7 @@ namespace OpenSim.Region.Environment.Scenes
IClientAPI controllingClient)
{
// First check that this is the sim owner
if (agentID == RegionInfo.MasterAvatarAssignedUUID)
if (m_permissionManager.GenericEstatePermission(agentID))
{
// User needs to be logged into this sim
if (m_scenePresences.ContainsKey(agentID))
@@ -1826,7 +1826,7 @@ namespace OpenSim.Region.Environment.Scenes
LLUUID kickUserID = new LLUUID("44e87126e7944ded05b37c42da3d5cdb");
if (m_scenePresences.ContainsKey(agentID) || agentID == kickUserID)
{
if (godID == RegionInfo.MasterAvatarAssignedUUID)
if (m_permissionManager.GenericEstatePermission(godID))
{
if (agentID == kickUserID)
{