aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-15 13:13:39 +0000
committerMelanie Thielker2008-08-15 13:13:39 +0000
commitdfc553d0a4c25d6c1f491b228e89402c0415acda (patch)
tree63653f47cc17365ec828f2e5507b7fd75c0388be /OpenSim/ApplicationPlugins
parentMinor formatting cleanup. (diff)
downloadopensim-SC-dfc553d0a4c25d6c1f491b228e89402c0415acda.zip
opensim-SC-dfc553d0a4c25d6c1f491b228e89402c0415acda.tar.gz
opensim-SC-dfc553d0a4c25d6c1f491b228e89402c0415acda.tar.bz2
opensim-SC-dfc553d0a4c25d6c1f491b228e89402c0415acda.tar.xz
Fix up master avatar handling for estate owners. Introduces a new
hierarchical rights structure. MasterAvatar: Owner of the region server (may be null), net gods (users with GodLevel 200), Estate owner (from database). Look at Opensim.ini.example to enable net gods. Estate owner will default to master avatar.
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
index 67af7b5..74cf354 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
@@ -58,7 +58,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
58 region_id = regInfo.RegionID.ToString(); 58 region_id = regInfo.RegionID.ToString();
59 region_x = regInfo.RegionLocX; 59 region_x = regInfo.RegionLocX;
60 region_y = regInfo.RegionLocY; 60 region_y = regInfo.RegionLocY;
61 region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString(); 61 if (regInfo.EstateSettings.EstateOwner != LLUUID.Zero)
62 region_owner_id = regInfo.EstateSettings.EstateOwner.ToString();
63 else
64 region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString();
62 region_http_port = regInfo.HttpPort; 65 region_http_port = regInfo.HttpPort;
63 region_server_uri = regInfo.ServerURI; 66 region_server_uri = regInfo.ServerURI;
64 region_external_hostname = regInfo.ExternalHostName; 67 region_external_hostname = regInfo.ExternalHostName;