ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2022-02-07 20:11:09 +00:00
parent d20dbcb74a
commit 57e8cac8cb
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
View File

@@ -44,7 +44,7 @@ using Mono.Addins;
namespace OpenSim.Region.CoreModules.World.Estate
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEstate")]
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EstateModule")]
public class EstateModule : ISharedRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
private Scene FindScene(UUID RegionID)
{
foreach (Scene s in Scenes)
foreach (Scene s in m_Scenes)
{
if (s.RegionInfo.RegionID == RegionID)
return s;
@@ -187,16 +187,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
uint estateID = senderScenes.RegionInfo.EstateSettings.EstateID;
foreach (Scene s in Scenes)
foreach (Scene s in m_Scenes)
{
if (s.RegionInfo.EstateSettings.EstateID == estateID)
{
IDialogModule dm = s.RequestModuleInterface<IDialogModule>();
if (dm != null)
{
dm.SendNotificationToUsersInRegion(FromID, FromName,
Message);
dm.SendNotificationToUsersInRegion(FromID, FromName, Message);
}
}
}
@@ -209,17 +207,15 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (prey.IsZero())
return;
if (!(client.Scene is Scene))
Scene scene = client.Scene as Scene;
if (scene == null)
return;
Scene scene = (Scene)client.Scene;
uint estateID = scene.RegionInfo.EstateSettings.EstateID;
if (!scene.Permissions.CanIssueEstateCommand(client.AgentId, false))
return;
foreach (Scene s in Scenes)
uint estateID = scene.RegionInfo.EstateSettings.EstateID;
foreach (Scene s in m_Scenes)
{
if (s.RegionInfo.EstateSettings.EstateID != estateID)
continue;
@@ -250,17 +246,15 @@ namespace OpenSim.Region.CoreModules.World.Estate
private void OnEstateTeleportAllUsersHomeRequest(IClientAPI client, UUID invoice, UUID senderID)
{
if (!(client.Scene is Scene))
Scene scene = client.Scene as Scene;
if(scene == null)
return;
Scene scene = (Scene)client.Scene;
uint estateID = scene.RegionInfo.EstateSettings.EstateID;
if (!scene.Permissions.CanIssueEstateCommand(client.AgentId, false))
return;
foreach (Scene s in Scenes)
uint estateID = scene.RegionInfo.EstateSettings.EstateID;
foreach (Scene s in m_Scenes)
{
if (s.RegionInfo.EstateSettings.EstateID != estateID)
continue;

4
OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
View File

@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
httpResponse.StatusCode = (int)HttpStatusCode.OK;
// m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body);
// m_log.DebugFormat("[ESTATE HANDLER]: query String: {0}", body);
try
{
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
}
catch (Exception e)
{
m_log.Debug("[XESTATE]: Exception {0}" + e.ToString());
m_log.Debug("[ESTATE]: Exception {0}" + e.ToString());
}
httpResponse.RawBuffer = FailureResult();