aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-14 18:08:22 +0000
committerMelanie Thielker2008-08-14 18:08:22 +0000
commitc2f1771c63108c78b799a4f107cabe7e33984866 (patch)
tree40b76fc02e6ec938d841f3d51f11417131cfb850 /OpenSim/Region/ScriptEngine
parentMantis #1953 (diff)
downloadopensim-SC-c2f1771c63108c78b799a4f107cabe7e33984866.zip
opensim-SC-c2f1771c63108c78b799a4f107cabe7e33984866.tar.gz
opensim-SC-c2f1771c63108c78b799a4f107cabe7e33984866.tar.bz2
opensim-SC-c2f1771c63108c78b799a4f107cabe7e33984866.tar.xz
Make the estate owner work. Changes permissions checks to allow the
estate owner user the ability to add and remove estate managers, and have EM rights outside of that.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
index ca12a42..687d5e1 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
@@ -282,7 +282,7 @@ namespace OpenSim.Region.ScriptEngine.Common
282 public int osRegionRestart(double seconds) 282 public int osRegionRestart(double seconds)
283 { 283 {
284 m_host.AddScriptLPS(1); 284 m_host.AddScriptLPS(1);
285 if (World.ExternalChecks.ExternalChecksCanIssueEstateCommand(m_host.OwnerID)) 285 if (World.ExternalChecks.ExternalChecksCanIssueEstateCommand(m_host.OwnerID, false))
286 { 286 {
287 World.Restart((float)seconds); 287 World.Restart((float)seconds);
288 return 1; 288 return 1;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 914aeac..2e87754 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
121 } 121 }
122 122
123 m_host.AddScriptLPS(1); 123 m_host.AddScriptLPS(1);
124 if (World.ExternalChecks.ExternalChecksCanIssueEstateCommand(m_host.OwnerID)) 124 if (World.ExternalChecks.ExternalChecksCanIssueEstateCommand(m_host.OwnerID, false))
125 { 125 {
126 World.Restart((float)seconds); 126 World.Restart((float)seconds);
127 return 1; 127 return 1;