diff options
author | Melanie | 2010-11-29 21:45:03 +0100 |
---|---|---|
committer | Melanie | 2010-11-29 21:45:03 +0100 |
commit | b08cc63003bcba51f9c735154d41f290f5c56010 (patch) | |
tree | c9865ba43068a011a9f63cde238171b68a59030e /OpenSim/Region | |
parent | Fix the build break (diff) | |
download | opensim-SC_OLD-b08cc63003bcba51f9c735154d41f290f5c56010.zip opensim-SC_OLD-b08cc63003bcba51f9c735154d41f290f5c56010.tar.gz opensim-SC_OLD-b08cc63003bcba51f9c735154d41f290f5c56010.tar.bz2 opensim-SC_OLD-b08cc63003bcba51f9c735154d41f290f5c56010.tar.xz |
Change inworld restart to use blue boxes rather than notices to match SL
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index a09e72b..6532bbb 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
@@ -148,11 +148,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
148 | (uint)presence.AbsolutePosition.Y, | 148 | (uint)presence.AbsolutePosition.Y, |
149 | (uint)presence.AbsolutePosition.Z); | 149 | (uint)presence.AbsolutePosition.Z); |
150 | 150 | ||
151 | m_log.DebugFormat("TP invite with message {0}", message); | 151 | m_log.DebugFormat("[LURE]: TP invite with message {0}", message); |
152 | 152 | ||
153 | GridInstantMessage m; | 153 | GridInstantMessage m; |
154 | 154 | ||
155 | if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodLevel >= 200 && (scene.Permissions.IsAdministrator(targetid))) | 155 | if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodLevel >= 200 && (!scene.Permissions.IsAdministrator(targetid))) |
156 | { | 156 | { |
157 | m = new GridInstantMessage(scene, client.AgentId, | 157 | m = new GridInstantMessage(scene, client.AgentId, |
158 | client.FirstName+" "+client.LastName, targetid, | 158 | client.FirstName+" "+client.LastName, targetid, |
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 75cf0c6..60e8c1a 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
248 | timeInSeconds -= 15; | 248 | timeInSeconds -= 15; |
249 | } | 249 | } |
250 | 250 | ||
251 | restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true); | 251 | restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false); |
252 | } | 252 | } |
253 | } | 253 | } |
254 | 254 | ||