diff options
author | Melanie Thielker | 2009-02-21 00:14:47 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-02-21 00:14:47 +0000 |
commit | d76178f3024b709c7aa51ba6210402f67064aec0 (patch) | |
tree | c9722212b25626add4dde58df4e9a6302d65bad7 /OpenSim | |
parent | * Apply http://opensimulator.org/mantis/view.php?id=3185 (diff) | |
download | opensim-SC-d76178f3024b709c7aa51ba6210402f67064aec0.zip opensim-SC-d76178f3024b709c7aa51ba6210402f67064aec0.tar.gz opensim-SC-d76178f3024b709c7aa51ba6210402f67064aec0.tar.bz2 opensim-SC-d76178f3024b709c7aa51ba6210402f67064aec0.tar.xz |
Thank you, robsmart, for a patch that allows the shard to be set.
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.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 10 |
1 files changed, 9 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); |