diff options
author | UbitUmarov | 2018-05-26 05:43:55 +0100 |
---|---|---|
committer | UbitUmarov | 2018-05-26 05:43:55 +0100 |
commit | f6765b86682b2f86bae8db45712033450cd197bc (patch) | |
tree | 436efa33a499a77b992695b39756ec4f0a785dc6 /OpenSim/Region | |
parent | stale LandSnapshot by time also, so dwell can be updated (diff) | |
download | opensim-SC-f6765b86682b2f86bae8db45712033450cd197bc.zip opensim-SC-f6765b86682b2f86bae8db45712033450cd197bc.tar.gz opensim-SC-f6765b86682b2f86bae8db45712033450cd197bc.tar.bz2 opensim-SC-f6765b86682b2f86bae8db45712033450cd197bc.tar.xz |
use RegionInfo.ServerURI to report region url on datasnapshot
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs index c55e4eb..f384c9a 100644 --- a/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs | |||
@@ -47,17 +47,13 @@ namespace OpenSim.Region.DataSnapshot | |||
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | private Dictionary<String, String> m_gridinfo = null; | 48 | private Dictionary<String, String> m_gridinfo = null; |
49 | private bool m_cacheEnabled = true; | 49 | private bool m_cacheEnabled = true; |
50 | private string m_listener_port = "9000"; //TODO: Set default port over 9000 | ||
51 | private string m_hostname = "127.0.0.1"; | ||
52 | #endregion | 50 | #endregion |
53 | 51 | ||
54 | public SnapshotStore(string directory, Dictionary<String, String> gridinfo, string port, string hostname) { | 52 | public SnapshotStore(string directory, Dictionary<String, String> gridinfo) { |
55 | m_directory = directory; | 53 | m_directory = directory; |
56 | m_scenes = new Dictionary<Scene, bool>(); | 54 | m_scenes = new Dictionary<Scene, bool>(); |
57 | m_providers = new List<IDataSnapshotProvider>(); | 55 | m_providers = new List<IDataSnapshotProvider>(); |
58 | m_gridinfo = gridinfo; | 56 | m_gridinfo = gridinfo; |
59 | m_listener_port = port; | ||
60 | m_hostname = hostname; | ||
61 | 57 | ||
62 | if (Directory.Exists(m_directory)) | 58 | if (Directory.Exists(m_directory)) |
63 | { | 59 | { |
@@ -270,7 +266,7 @@ namespace OpenSim.Region.DataSnapshot | |||
270 | infoblock.AppendChild(infopiece); | 266 | infoblock.AppendChild(infopiece); |
271 | 267 | ||
272 | infopiece = basedoc.CreateNode(XmlNodeType.Element, "url", ""); | 268 | infopiece = basedoc.CreateNode(XmlNodeType.Element, "url", ""); |
273 | infopiece.InnerText = "http://" + m_hostname + ":" + m_listener_port; | 269 | infopiece.InnerText = scene.RegionInfo.ServerURI; |
274 | infoblock.AppendChild(infopiece); | 270 | infoblock.AppendChild(infopiece); |
275 | 271 | ||
276 | infopiece = basedoc.CreateNode(XmlNodeType.Element, "name", ""); | 272 | infopiece = basedoc.CreateNode(XmlNodeType.Element, "name", ""); |