OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change inworld restart to use blue boxes rather than notices to match SL

avinationmerge
Melanie 2010-11-29 21:45:03 +01:00
parent 836b73f765
commit b08cc63003
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
View File

@ -148,11 +148,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
(uint)presence.AbsolutePosition.Y, (uint)presence.AbsolutePosition.Y,
(uint)presence.AbsolutePosition.Z); (uint)presence.AbsolutePosition.Z);
m_log.DebugFormat("TP invite with message {0}", message); m_log.DebugFormat("[LURE]: TP invite with message {0}", message);
GridInstantMessage m; GridInstantMessage m;
if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodLevel >= 200 && (scene.Permissions.IsAdministrator(targetid))) if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodLevel >= 200 && (!scene.Permissions.IsAdministrator(targetid)))
{ {
m = new GridInstantMessage(scene, client.AgentId, m = new GridInstantMessage(scene, client.AgentId,
client.FirstName+" "+client.LastName, targetid, client.FirstName+" "+client.LastName, targetid,

2
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
timeInSeconds -= 15; timeInSeconds -= 15;
} }
restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true); restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false);
} }
} }