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

Merge branch 'opensim:master' into master

Browse Source
This commit is contained in:
AdilElFarissi
2024-04-08 07:17:51 +00:00
committed by GitHub
parent cc79aa0c23 44b0d30561
commit efda155791
57 changed files with 643 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
View File

@@ -65,16 +65,9 @@ namespace OpenSim.Server.Handlers.Hypergrid
if (name == null)
name = string.Empty;
UUID regionID = UUID.Zero;
string externalName = string.Empty;
string imageURL = string.Empty;
ulong regionHandle = 0;
string reason = string.Empty;
int sizeX = 256;
int sizeY = 256;
m_log.DebugFormat("[HG Handler]: XMLRequest to link to {0} from {1}", (name.Length == 0) ? "default region" : name, remoteClient.Address.ToString());
bool success = m_GatekeeperService.LinkRegion(name, out regionID, out regionHandle, out externalName, out imageURL, out reason, out sizeX, out sizeY);
bool success = m_GatekeeperService.LinkLocalRegion(name, out UUID regionID, out ulong regionHandle, out string externalName,
out string imageURL, out string reason, out int sizeX, out int sizeY);
Hashtable hash = new Hashtable();
hash["result"] = success.ToString();

12
OpenSim/Server/runtimeconfig.template.json
View File

@@ -1,7 +1,11 @@
{
"configProperties": {
"System.GC.Server": false,
"System.Drawing.EnableUnixSupport": true,
"System.Globalization.UseNls": true
"configProperties": {
"System.GC.Server": false,
"System.GC.HighMemoryPercent": 50,
"System.Drawing.EnableUnixSupport": true,
"System.Globalization.UseNls": true,
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
"System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": true,
"System.Runtime.TieredCompilation.QuickJit": false
}
}