aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs7
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs20
-rw-r--r--OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs3
-rw-r--r--OpenSim/Region/DataSnapshot/LLSDDiscovery.cs1
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs7
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs5
-rw-r--r--OpenSim/Region/DataSnapshot/SnapshotStore.cs9
7 files changed, 22 insertions, 30 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 9af8914..82b3826 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -26,16 +26,15 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections; 29using System.Collections;
31using System.Reflection; 30using System.Reflection;
32using System.Xml; 31using System.Xml;
33using log4net; 32using log4net;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Framework.Communications.Capabilities;
36using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
37using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework.Communications.Capabilities;
38using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Region.Framework.Scenes;
37using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
39 38
40namespace OpenSim.Region.DataSnapshot 39namespace OpenSim.Region.DataSnapshot
41{ 40{
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 735e14b..3013971 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -31,17 +31,15 @@ using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Net; 32using System.Net;
33using System.Reflection; 33using System.Reflection;
34using System.Text;
35using System.Xml; 34using System.Xml;
36using OpenMetaverse;
37using log4net; 35using log4net;
38using Nini.Config; 36using Nini.Config;
37using OpenMetaverse;
39using OpenSim.Framework; 38using OpenSim.Framework;
40using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
41using OpenSim.Region.DataSnapshot.Interfaces; 40using OpenSim.Region.DataSnapshot.Interfaces;
42using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
44using OpenMetaverse.Packets;
45 43
46namespace OpenSim.Region.DataSnapshot 44namespace OpenSim.Region.DataSnapshot
47{ 45{
@@ -51,7 +49,7 @@ namespace OpenSim.Region.DataSnapshot
51 //Information from config 49 //Information from config
52 private bool m_enabled = false; 50 private bool m_enabled = false;
53 private bool m_configLoaded = false; 51 private bool m_configLoaded = false;
54 private List<String> m_disabledModules = new List<String>(); 52 private List<string> m_disabledModules = new List<string>();
55 private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>(); 53 private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>();
56 private string m_snapsDir = "DataSnapshot"; 54 private string m_snapsDir = "DataSnapshot";
57 private string m_exposure_level = "minimum"; 55 private string m_exposure_level = "minimum";
@@ -123,7 +121,7 @@ namespace OpenSim.Region.DataSnapshot
123 { 121 {
124 m_disabledModules.Add(bloody_wanker); 122 m_disabledModules.Add(bloody_wanker);
125 } 123 }
126 m_lastUpdate = System.Environment.TickCount; 124 m_lastUpdate = Environment.TickCount;
127 } 125 }
128 catch (Exception) 126 catch (Exception)
129 { 127 {
@@ -363,26 +361,26 @@ namespace OpenSim.Region.DataSnapshot
363 private void CheckStale() 361 private void CheckStale()
364 { 362 {
365 // Wrap check 363 // Wrap check
366 if (System.Environment.TickCount < m_lastUpdate) 364 if (Environment.TickCount < m_lastUpdate)
367 { 365 {
368 m_lastUpdate = System.Environment.TickCount; 366 m_lastUpdate = Environment.TickCount;
369 } 367 }
370 368
371 if (m_stales >= m_maxStales) 369 if (m_stales >= m_maxStales)
372 { 370 {
373 if (System.Environment.TickCount - m_lastUpdate >= 20000) 371 if (Environment.TickCount - m_lastUpdate >= 20000)
374 { 372 {
375 m_stales = 0; 373 m_stales = 0;
376 m_lastUpdate = System.Environment.TickCount; 374 m_lastUpdate = Environment.TickCount;
377 MakeEverythingStale(); 375 MakeEverythingStale();
378 } 376 }
379 } 377 }
380 else 378 else
381 { 379 {
382 if (m_lastUpdate + 1000 * m_period < System.Environment.TickCount) 380 if (m_lastUpdate + 1000 * m_period < Environment.TickCount)
383 { 381 {
384 m_stales = 0; 382 m_stales = 0;
385 m_lastUpdate = System.Environment.TickCount; 383 m_lastUpdate = Environment.TickCount;
386 MakeEverythingStale(); 384 MakeEverythingStale();
387 } 385 }
388 } 386 }
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
index e805e5b..36f93a3 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml; 28using System.Xml;
32 29
33namespace OpenSim.Region.DataSnapshot.Interfaces 30namespace OpenSim.Region.DataSnapshot.Interfaces
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
index 73e41ee..6c66922 100644
--- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
+++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
@@ -25,7 +25,6 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*/ 26*/
27 27
28using System;
29using OpenSim.Framework.Communications.Capabilities; 28using OpenSim.Framework.Communications.Capabilities;
30 29
31namespace OpenSim.Region.DataSnapshot 30namespace OpenSim.Region.DataSnapshot
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 52659e4..fea9f9b 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -29,15 +29,14 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Xml; 31using System.Xml;
32using OpenMetaverse;
33using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.CoreModules.World.Land;
35using OpenSim.Region.DataSnapshot.Interfaces; 37using OpenSim.Region.DataSnapshot.Interfaces;
36using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.CoreModules.World.Land;
38using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
39using OpenMetaverse.Packets;
40using OpenSim.Framework.Communications.Cache;
41 40
42namespace OpenSim.Region.DataSnapshot.Providers 41namespace OpenSim.Region.DataSnapshot.Providers
43{ 42{
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 949cc38..7cca6ad 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -30,12 +30,11 @@ using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Xml; 31using System.Xml;
32using log4net; 32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework;
33using OpenSim.Region.DataSnapshot.Interfaces; 35using OpenSim.Region.DataSnapshot.Interfaces;
34using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.CoreModules.World.Land;
37using OpenSim.Framework;
38using OpenMetaverse;
39 38
40namespace OpenSim.Region.DataSnapshot.Providers 39namespace OpenSim.Region.DataSnapshot.Providers
41{ 40{
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index 22fe067..9886995 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -27,12 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
30using System.Text; 32using System.Text;
31using System.Xml; 33using System.Xml;
32using System.IO; 34using log4net;
33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.DataSnapshot.Interfaces; 35using OpenSim.Region.DataSnapshot.Interfaces;
35using OpenMetaverse; 36using OpenSim.Region.Framework.Scenes;
36 37
37namespace OpenSim.Region.DataSnapshot 38namespace OpenSim.Region.DataSnapshot
38{ 39{
@@ -42,7 +43,7 @@ namespace OpenSim.Region.DataSnapshot
42 private String m_directory = "unyuu"; //not an attempt at adding RM references to core SVN, honest 43 private String m_directory = "unyuu"; //not an attempt at adding RM references to core SVN, honest
43 private Dictionary<Scene, bool> m_scenes = null; 44 private Dictionary<Scene, bool> m_scenes = null;
44 private List<IDataSnapshotProvider> m_providers = null; 45 private List<IDataSnapshotProvider> m_providers = null;
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 private Dictionary<String, String> m_gridinfo = null; 47 private Dictionary<String, String> m_gridinfo = null;
47 private bool m_cacheEnabled = true; 48 private bool m_cacheEnabled = true;
48 private string m_listener_port = "9000"; //TODO: Set default port over 9000 49 private string m_listener_port = "9000"; //TODO: Set default port over 9000