lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now does allow GridService from other instance

Browse Source
This commit is contained in:
lickx
2026-01-15 06:23:01 +01:00
parent 20492ac080
commit e950829c94
3 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
View File

@@ -36,12 +36,16 @@ using Nini.Config;
using Nwc.XmlRpc;
using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Services.Interfaces;
using OpenSim.Services.Base;
using OpenSim.Server.Base;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Data;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;
namespace OpenSim.Server.Handlers.Grid
{
public class GridInfoHandlers
@@ -55,7 +59,7 @@ namespace OpenSim.Server.Handlers.Grid
private byte[] cachedStatAnswer = null;
private bool stats_available = false;
private int _lastrun;
protected IRegionData m_Database_regions = null;
protected IGridService m_GridService = null;
protected IGridUserData m_Database_griduser = null;
/// <summary>
@@ -85,6 +89,13 @@ namespace OpenSim.Server.Handlers.Grid
if (stats_available)
{
stats_available = false;
string gridService = gridCfg.GetString("GridService", string.Empty);
if (!string.IsNullOrWhiteSpace(gridService))
{
object[] args = new object[] { configSource };
m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
if (m_GridService != null)
{
IConfig dbConfig = configSource.Configs["DatabaseService"];
if (dbConfig is not null)
{
@@ -93,9 +104,6 @@ namespace OpenSim.Server.Handlers.Grid
string connString = dbConfig.GetString("ConnectionString", String.Empty);
if (dllName.Length != 0 && connString.Length != 0)
{
m_Database_regions = serviceBase.LoadPlugin<IRegionData>(dllName, [connString, "regions"]);
if(m_Database_regions != null)
{
m_Database_griduser = serviceBase.LoadPlugin<IGridUserData>(dllName, [connString, "GridUser"]);
if (m_Database_griduser != null)
@@ -106,9 +114,10 @@ namespace OpenSim.Server.Handlers.Grid
}
}
}
}
if (!stats_available)
{
_log.Warn("[GRID INFO SERVICE]: Could not find or initialize Database Service config. Grid stats will be unavailable!");
_log.Warn("[GRID INFO SERVICE]: Could not initialize. Grid stats will be unavailable!");
}
}
@@ -274,13 +283,16 @@ namespace OpenSim.Server.Handlers.Grid
try
{
// Fetch region data
List<RegionData> regions = m_Database_regions.GetOnlineRegions(UUID.Zero);
foreach (RegionData region in regions)
if (m_GridService is not null)
{
List<GridRegion> regions = m_GridService.GetOnlineRegions(UUID.Zero, 0, 0, int.MaxValue);
foreach (GridRegion region in regions)
{
// Count individual region equivalent
region_count += (region.sizeX * region.sizeY) >> 16;
region_count += (region.RegionSizeX * region.RegionSizeY) >> 16;
}
regions = null;
}
// Fetch all grid users, can't do a simple query unfortunately
GridUserData[] gridusers = m_Database_griduser.GetAll(string.Empty);

2
bin/Robust.HG.ini.example
View File

@@ -640,6 +640,8 @@
[GridInfoService]
GridService = "OpenSim.Services.GridService.dll:GridService"
; These settings are used to return information on a get_grid_info call.
; Client launcher scripts and third-party clients make use of this to
; autoconfigure the client and to provide a nice user experience. If you

2
bin/Robust.ini.example
View File

@@ -561,6 +561,8 @@
[GridInfoService]
GridService = "OpenSim.Services.GridService.dll:GridService"
; These settings are used to return information on a get_grid_info call.
; Client launcher scripts and third-party clients make use of this to
; autoconfigure the client and to provide a nice user experience. If you