aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorCharles Krinke2009-05-02 16:28:30 +0000
committerCharles Krinke2009-05-02 16:28:30 +0000
commit280d2cbf4ab7a075b3a3d16744ba4f2b2a19c984 (patch)
tree79a984b7874804d64007e9944d9c23180cf82f0e /OpenSim/Framework
parentThank you kindly, MCortez for a patch that solves: (diff)
downloadopensim-SC_OLD-280d2cbf4ab7a075b3a3d16744ba4f2b2a19c984.zip
opensim-SC_OLD-280d2cbf4ab7a075b3a3d16744ba4f2b2a19c984.tar.gz
opensim-SC_OLD-280d2cbf4ab7a075b3a3d16744ba4f2b2a19c984.tar.bz2
opensim-SC_OLD-280d2cbf4ab7a075b3a3d16744ba4f2b2a19c984.tar.xz
Thank you kindly, BlueWall, for a patch that:
Move json stats to non-published resource name Remove well-known resource name for json stats, creating dynamic uris with private keys and add a user configurable resource name for region owner usage.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs2
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs16
2 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index a0f536a..4c107c9 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -211,6 +211,8 @@ namespace OpenSim.Framework
211 public int ProxyOffset = 0; 211 public int ProxyOffset = 0;
212 public string RegionName = String.Empty; 212 public string RegionName = String.Empty;
213 public string regionSecret = UUID.Random().ToString(); 213 public string regionSecret = UUID.Random().ToString();
214
215 public string osSecret;
214 216
215 public UUID lastMapUUID = UUID.Zero; 217 public UUID lastMapUUID = UUID.Zero;
216 public string lastMapRefresh = "0"; 218 public string lastMapRefresh = "0";
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 483f8b6..e03713e 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -79,6 +79,11 @@ namespace OpenSim.Framework.Servers
79 protected string m_version; 79 protected string m_version;
80 80
81 protected string m_pidFile = String.Empty; 81 protected string m_pidFile = String.Empty;
82
83 /// <summary>
84 /// Random uuid for private data
85 /// </summary>
86 protected string m_osSecret = String.Empty;
82 87
83 protected BaseHttpServer m_httpServer; 88 protected BaseHttpServer m_httpServer;
84 public BaseHttpServer HttpServer 89 public BaseHttpServer HttpServer
@@ -95,6 +100,9 @@ namespace OpenSim.Framework.Servers
95 { 100 {
96 m_startuptime = DateTime.Now; 101 m_startuptime = DateTime.Now;
97 m_version = VersionInfo.Version; 102 m_version = VersionInfo.Version;
103
104 // Random uuid for private data
105 m_osSecret = UUID.Random().ToString();
98 106
99 m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics); 107 m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
100 m_periodicDiagnosticsTimer.Enabled = true; 108 m_periodicDiagnosticsTimer.Enabled = true;
@@ -458,12 +466,18 @@ namespace OpenSim.Framework.Servers
458 { 466 {
459 } 467 }
460 } 468 }
469
470 public string osSecret {
471 // Secret uuid for the simulator
472 get { return m_osSecret; }
473
474 }
461 475
462 public string StatReport(OSHttpRequest httpRequest) 476 public string StatReport(OSHttpRequest httpRequest)
463 { 477 {
464 return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ); 478 return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version );
465 } 479 }
466 480
467 protected void RemovePIDFile() 481 protected void RemovePIDFile()
468 { 482 {
469 if (m_pidFile != String.Empty) 483 if (m_pidFile != String.Empty)