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

Thank you, robsmart, for a patch that allows the shard to be set.

Browse Source 
The built-in default is OpenSim, unless a user server url is given, then
that is used, unless "shard" is also goven, then shard takes precedence.
The defult in OpenSim.ini is "OpenSim" for compatibility.
This commit is contained in:
Melanie Thielker
2009-02-21 00:14:47 +00:00
parent 6119b02860
commit d76178f302
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -8688,7 +8688,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Dictionary<string, string> httpHeaders = new Dictionary<string, string>();
httpHeaders["X-SecondLife-Shard"] = "OpenSim";
string shard = "OpenSim";
IConfigSource config = new IniConfigSource(Application.iniFilePath);
if (config.Configs["Network"] != null)
{
shard = config.Configs["Network"].GetString("user_server_url", shard);
shard = config.Configs["Network"].GetString("shard", shard);
}
httpHeaders["X-SecondLife-Shard"] = shard;
httpHeaders["X-SecondLife-Object-Name"] = m_host.Name;
httpHeaders["X-SecondLife-Object-Key"] = m_itemID.ToString();
httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.RegionLocX, regionInfo.RegionLocY);

4
bin/OpenSim.ini.example
View File

@@ -322,6 +322,10 @@ InterregionComms = "RESTComms"
; user_send_key and user_recv_key, too
messaging_server_url = "http://127.0.0.1:8006"
; What is reported as the "X-Secondlife-Shard"
; Defaults to the user server url if not set
; The old default is "OpenSim", set here fro compatibility
shard = "OpenSim"
[ClientStack.LindenUDP]
; This is the multiplier applied to all client throttles for outgoing UDP network data