ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Optimised using statements and namespace references across entire project (this took a while to run).

Browse Source
This commit is contained in:
Adam Frisby
2008-04-21 07:09:17 +00:00
parent 05e24c8f58
commit fef3b36894
306 changed files with 1011 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/DataSnapshot/DataRequestHandler.cs
View File

@@ -26,14 +26,11 @@
*
*/
using System;
using System.Collections.Generic;
using System.Collections;
using System.Text;
using System.Reflection;
using System.Xml;
using log4net;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Console;
namespace OpenSim.Region.DataSnapshot
{
@@ -41,7 +38,7 @@ namespace OpenSim.Region.DataSnapshot
{
private Scene m_scene = null;
private DataSnapshotManager m_externalData = null;
private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public DataRequestHandler(Scene scene, DataSnapshotManager externalData)
{

24
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
View File

@@ -28,18 +28,18 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Xml;
using System.IO;
using System.Net;
using System.Reflection;
using System.Text;
using System.Timers;
using OpenSim.Framework;
using System.Xml;
using libsecondlife;
using log4net;
using Nini.Config;
using OpenSim.Framework.Communications;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
using Nini.Config;
using libsecondlife;
using libsecondlife.Packets;
namespace OpenSim.Region.DataSnapshot
{
@@ -47,13 +47,13 @@ namespace OpenSim.Region.DataSnapshot
{
#region Class members
private List<Scene> m_scenes = new List<Scene>();
private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private bool m_enabled = false;
private bool m_configLoaded = false;
internal object m_syncInit = new object();
private DataRequestHandler m_requests = null;
private Dictionary<Scene, List<IDataSnapshotProvider>> m_dataproviders = new Dictionary<Scene, List<IDataSnapshotProvider>>();
private Dictionary<String, String> m_gridinfo = new Dictionary<String, String>();
private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>();
//private int m_oldestSnapshot = 0;
private int m_maxSnapshots = 500;
private int m_lastSnapshot = 0;
@@ -63,7 +63,7 @@ namespace OpenSim.Region.DataSnapshot
private string m_hostname = "127.0.0.1";
private Timer m_periodic = null;
private int m_period = 60; // in seconds
private List<String> m_disabledModules = new List<String>();
private List<string> m_disabledModules = new List<string>();
#endregion
#region IRegionModule
@@ -72,7 +72,7 @@ namespace OpenSim.Region.DataSnapshot
}
public void Initialise(Scene scene, Nini.Config.IConfigSource config)
public void Initialise(Scene scene, IConfigSource config)
{
if (!m_scenes.Contains(scene))
m_scenes.Add(scene);
@@ -495,7 +495,7 @@ namespace OpenSim.Region.DataSnapshot
{
reply = cli.Request();
}
catch (System.Net.WebException)
catch (WebException)
{
m_log.Warn("[DATASNAPSHOT] Unable to notify " + url);
}
@@ -514,7 +514,7 @@ namespace OpenSim.Region.DataSnapshot
m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace);
}
// This is not quite working, so...
string responseStr = System.Text.ASCIIEncoding.UTF8.GetString(response);
string responseStr = ASCIIEncoding.UTF8.GetString(response);
m_log.Info("[DATASNAPSHOT] data service notified: " + url);
}

9
OpenSim/Region/DataSnapshot/EstateSnapshot.cs
View File

@@ -26,16 +26,9 @@
*/
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Modules.LandManagement;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Communications;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.DataSnapshot
{

4
OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
View File

@@ -26,12 +26,8 @@
*
*/
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml;
using OpenSim.Region.Environment.Scenes;
using libsecondlife;
namespace OpenSim.Region.DataSnapshot
{

18
OpenSim/Region/DataSnapshot/LandSnapshot.cs
View File

@@ -28,18 +28,14 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml;
using System.Reflection;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Modules.LandManagement;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Communications;
using System.Xml;
using libsecondlife;
using libsecondlife.Packets;
using log4net;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Modules.LandManagement;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.DataSnapshot
{
@@ -48,7 +44,7 @@ namespace OpenSim.Region.DataSnapshot
private Scene m_scene = null;
private DataSnapshotManager m_parent = null;
//private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>();
private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
#region Dead code

10
OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
View File

@@ -25,14 +25,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
using System.Xml;
using System.Reflection;
using System.Xml;
using log4net;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework;
using libsecondlife;
namespace OpenSim.Region.DataSnapshot
{
@@ -40,7 +36,7 @@ namespace OpenSim.Region.DataSnapshot
{
private Scene m_scene = null;
private DataSnapshotManager m_parent = null;
private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public void Initialize(Scene scene, DataSnapshotManager parent)
{