aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
-rw-r--r--bin/OpenSim.ini.example4
2 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7e4a5a0..3acb882 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8688,7 +8688,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8688 8688
8689 Dictionary<string, string> httpHeaders = new Dictionary<string, string>(); 8689 Dictionary<string, string> httpHeaders = new Dictionary<string, string>();
8690 8690
8691 httpHeaders["X-SecondLife-Shard"] = "OpenSim"; 8691 string shard = "OpenSim";
8692 IConfigSource config = new IniConfigSource(Application.iniFilePath);
8693 if (config.Configs["Network"] != null)
8694 {
8695 shard = config.Configs["Network"].GetString("user_server_url", shard);
8696 shard = config.Configs["Network"].GetString("shard", shard);
8697 }
8698
8699 httpHeaders["X-SecondLife-Shard"] = shard;
8692 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name; 8700 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name;
8693 httpHeaders["X-SecondLife-Object-Key"] = m_itemID.ToString(); 8701 httpHeaders["X-SecondLife-Object-Key"] = m_itemID.ToString();
8694 httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.RegionLocX, regionInfo.RegionLocY); 8702 httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.RegionLocX, regionInfo.RegionLocY);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 582b3f9..d78dfc4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -322,6 +322,10 @@ InterregionComms = "RESTComms"
322 ; user_send_key and user_recv_key, too 322 ; user_send_key and user_recv_key, too
323 messaging_server_url = "http://127.0.0.1:8006" 323 messaging_server_url = "http://127.0.0.1:8006"
324 324
325 ; What is reported as the "X-Secondlife-Shard"
326 ; Defaults to the user server url if not set
327 ; The old default is "OpenSim", set here fro compatibility
328 shard = "OpenSim"
325 329
326[ClientStack.LindenUDP] 330[ClientStack.LindenUDP]
327 ; This is the multiplier applied to all client throttles for outgoing UDP network data 331 ; This is the multiplier applied to all client throttles for outgoing UDP network data