From 9b6b6d05d45cf0f754a0b26bf6240ef50be66563 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 3 Jul 2007 14:37:29 +0000
Subject: * Optimized usings (the 'LL ate my scripts' commit) * added some
licensing info
---
OpenSim/Region/Application/Application.cs | 8 +--
OpenSim/Region/Application/OpenSimMain.cs | 52 ++++++----------
OpenSim/Region/Application/VersionInfo.cs | 2 -
OpenSim/Region/Caches/AssetCache.cs | 17 +++---
OpenSim/Region/Caches/Properties/AssemblyInfo.cs | 2 -
OpenSim/Region/Capabilities/Caps.cs | 11 ++--
OpenSim/Region/Capabilities/LLSDArray.cs | 3 -
OpenSim/Region/Capabilities/LLSDCapEvent.cs | 4 --
OpenSim/Region/Capabilities/LLSDCapsDetails.cs | 4 --
OpenSim/Region/Capabilities/LLSDEmpty.cs | 4 --
OpenSim/Region/Capabilities/LLSDHelpers.cs | 9 ++-
OpenSim/Region/Capabilities/LLSDMapLayer.cs | 4 --
.../Region/Capabilities/LLSDMapLayerResponse.cs | 4 --
OpenSim/Region/Capabilities/LLSDMapRequest.cs | 4 --
OpenSim/Region/Capabilities/LLSDTest.cs | 4 --
OpenSim/Region/Capabilities/LLSDType.cs | 2 -
OpenSim/Region/Capabilities/LLSDUploadReply.cs | 5 +-
.../Region/ClientStack/Assets/InventoryCache.cs | 17 +++---
.../ClientStack/ClientStackNetworkHandler.cs | 6 --
OpenSim/Region/ClientStack/ClientView.API.cs | 44 +++++++-------
.../ClientStack/ClientView.AgentAssetUpload.cs | 7 +--
.../ClientStack/ClientView.PacketHandlers.cs | 23 ++-----
.../ClientStack/ClientView.ProcessPackets.cs | 16 ++---
OpenSim/Region/ClientStack/ClientView.cs | 30 +++++-----
OpenSim/Region/ClientStack/ClientViewBase.cs | 23 ++++---
OpenSim/Region/ClientStack/PacketServer.cs | 8 +--
.../Region/ClientStack/RegionApplicationBase.cs | 23 ++-----
OpenSim/Region/ClientStack/UDPServer.cs | 19 ++----
.../Communications/Local/CommunicationsLocal.cs | 9 +--
.../Communications/Local/LocalBackEndServices.cs | 6 +-
.../Communications/Local/LocalUserServices.cs | 10 +---
.../Local/Properties/AssemblyInfo.cs | 2 -
.../Communications/OGS1/CommunicationsOGS1.cs | 6 +-
.../Region/Communications/OGS1/OGS1GridServices.cs | 26 ++++----
.../Communications/OGS1/OGS1InterSimComms.cs | 11 ++--
.../Region/Communications/OGS1/OGS1UserServices.cs | 8 +--
.../Communications/OGS1/Properties/AssemblyInfo.cs | 2 -
OpenSim/Region/Environment/EstateManager.cs | 33 +++++-----
OpenSim/Region/Environment/ParcelManager.cs | 13 ++--
OpenSim/Region/Environment/RegionManager.cs | 8 +--
OpenSim/Region/Environment/Scenes/Entity.cs | 5 +-
OpenSim/Region/Environment/Scenes/EntityBase.cs | 6 +-
.../Environment/Scenes/IScenePresenceBody.cs | 5 --
OpenSim/Region/Environment/Scenes/Primitive.cs | 7 +--
OpenSim/Region/Environment/Scenes/PrimitiveOld.cs | 13 ++--
.../Environment/Scenes/Scene.PacketHandlers.cs | 8 +--
OpenSim/Region/Environment/Scenes/Scene.cs | 70 ++++++++++------------
OpenSim/Region/Environment/Scenes/SceneBase.cs | 17 ++----
OpenSim/Region/Environment/Scenes/SceneEvents.cs | 8 +--
OpenSim/Region/Environment/Scenes/SceneObject.cs | 5 +-
.../Environment/Scenes/ScenePresence.Animations.cs | 6 +-
.../Environment/Scenes/ScenePresence.Body.cs | 5 --
OpenSim/Region/Environment/Scenes/ScenePresence.cs | 17 +++---
.../Scenes/scripting/Engines/CSharpScriptEngine.cs | 11 ++--
.../Scenes/scripting/Engines/JScriptEngine.cs | 11 ++--
.../Region/Environment/Scenes/scripting/Script.cs | 9 +--
.../Environment/Scenes/scripting/ScriptInfo.cs | 8 +--
.../Environment/Scenes/scripting/ScriptManager.cs | 14 ++---
.../Region/Examples/SimpleApp/LlsdMethodEntry.cs | 9 +--
OpenSim/Region/Examples/SimpleApp/MyWorld.cs | 16 ++---
OpenSim/Region/Examples/SimpleApp/Program.cs | 25 ++++----
.../Examples/SimpleApp/Properties/AssemblyInfo.cs | 2 -
.../Region/GridInterfaces/Local/AssemblyInfo.cs | 2 -
.../GridInterfaces/Local/LocalAssetServer.cs | 28 ++++-----
.../Region/GridInterfaces/Remote/AssemblyInfo.cs | 2 -
.../GridInterfaces/Remote/RemoteAssetServer.cs | 10 ++--
.../Physics/BasicPhysicsPlugin/AssemblyInfo.cs | 2 -
.../BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 6 +-
OpenSim/Region/Physics/Manager/AssemblyInfo.cs | 2 -
OpenSim/Region/Physics/Manager/PhysicsActor.cs | 12 ++--
OpenSim/Region/Physics/Manager/PhysicsManager.cs | 8 +--
OpenSim/Region/Physics/Manager/PhysicsScene.cs | 11 ++--
OpenSim/Region/Physics/Manager/PhysicsVector.cs | 4 --
OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs | 2 -
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 17 +++---
OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs | 2 -
OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 9 +--
.../LocalStorageBerkeleyDB/BDBLocalStorage.cs | 9 +--
.../Storage/LocalStorageDb4o/AssemblyInfo.cs | 2 -
.../Storage/LocalStorageDb4o/Db4LocalStorage.cs | 24 ++++----
.../Region/Storage/LocalStorageDb4o/MapStorage.cs | 4 --
.../Storage/LocalStorageDb4o/UUIDParcelQuery.cs | 5 --
.../Storage/LocalStorageDb4o/UUIDPrimQuery.cs | 5 --
.../LocalStorageSQLite/Properties/AssemblyInfo.cs | 2 -
.../LocalStorageSQLite/SQLiteLocalStorage.cs | 14 ++---
.../Properties/AssemblyInfo.cs | 2 -
.../Region/Terrain.BasicTerrain/TerrainEngine.cs | 49 +++++++--------
.../Region/Terrain.BasicTerrain/TerrainFilter.cs | 8 +--
88 files changed, 366 insertions(+), 641 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 1dcd99b..0428f5a 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -26,10 +26,8 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
using OpenSim.Framework.Console;
-using OpenSim.Region.ClientStack;
+using OpenSim.Region.Environment.Scenes;
namespace OpenSim
{
@@ -109,13 +107,13 @@ namespace OpenSim
sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts;
sim.gridLocalAsset = gridLocalAsset;
- OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
+ ScenePresence.PhysicsEngineFlying = allowFlying;
sim.StartUp();
while (true)
{
- OpenSim.Framework.Console.MainLog.Instance.MainLogPrompt();
+ MainLog.Instance.MainLogPrompt();
}
}
}
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 097d1cc..e976fe3 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -27,37 +27,23 @@
*/
using System;
-using System.Text;
using System.IO;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Data;
-
-using OpenSim.Framework.Types;
-using OpenSim.Framework;
using OpenSim.Assets;
-using OpenSim.Region.Caches;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
using OpenSim.Framework.Console;
-using OpenSim.Physics.Manager;
-using Nwc.XmlRpc;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
using OpenSim.GenericConfig;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Communications.OGS1;
-using OpenSim.Region.Communications.Local;
-
+using OpenSim.Physics.Manager;
+using OpenSim.Region.Caches;
using OpenSim.Region.ClientStack;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Region.Communications.OGS1;
+using OpenSim.Region.Environment.Scenes;
namespace OpenSim
{
@@ -96,7 +82,7 @@ namespace OpenSim
}
m_log = new LogBase(m_logFilename, "Region", this, m_silent);
- OpenSim.Framework.Console.MainLog.Instance = m_log;
+ MainLog.Instance = m_log;
m_log.Verbose( "Main.cs:Startup() - Loading configuration");
this.serversData.InitConfig(this.m_sandbox, this.localConfig);
@@ -121,7 +107,7 @@ namespace OpenSim
startuptime = DateTime.Now;
- this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
+ this.physManager = new PhysicsManager();
this.physManager.LoadPlugins();
this.SetupHttpListener();
@@ -187,12 +173,12 @@ namespace OpenSim
RegionInfo regionDat = new RegionInfo();
AuthenticateSessionsBase authenBase;
- string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions");
+ string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
string[] configFiles = Directory.GetFiles(path, "*.xml");
if (configFiles.Length == 0)
{
- string path2 = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions");
+ string path2 = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
string path3 = Path.Combine(path2, "default.xml");
Console.WriteLine("Creating default region config file");
//TODO create default region
@@ -361,23 +347,23 @@ namespace OpenSim
case "":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
+ ScenePresence.PhysicsEngineFlying = false;
break;
case "basicphysics":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
- OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
+ ScenePresence.PhysicsEngineFlying = false;
break;
case "RealPhysX":
this.m_physicsEngine = "RealPhysX";
- OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
+ ScenePresence.PhysicsEngineFlying = true;
break;
case "OpenDynamicsEngine":
this.m_physicsEngine = "OpenDynamicsEngine";
- OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
+ ScenePresence.PhysicsEngineFlying = true;
break;
}
@@ -459,7 +445,7 @@ namespace OpenSim
m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
break;
case "users":
- OpenSim.Region.Environment.Scenes.ScenePresence TempAv;
+ ScenePresence TempAv;
m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
/* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
{
diff --git a/OpenSim/Region/Application/VersionInfo.cs b/OpenSim/Region/Application/VersionInfo.cs
index 5d1354e..2c720a3 100644
--- a/OpenSim/Region/Application/VersionInfo.cs
+++ b/OpenSim/Region/Application/VersionInfo.cs
@@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-
namespace OpenSim
{
///
diff --git a/OpenSim/Region/Caches/AssetCache.cs b/OpenSim/Region/Caches/AssetCache.cs
index 6cf921b..453edbe 100644
--- a/OpenSim/Region/Caches/AssetCache.cs
+++ b/OpenSim/Region/Caches/AssetCache.cs
@@ -28,13 +28,12 @@
using System;
using System.Collections.Generic;
-using System.Threading;
using System.Reflection;
+using System.Threading;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
namespace OpenSim.Region.Caches
{
@@ -45,8 +44,8 @@ namespace OpenSim.Region.Caches
///
public class AssetCache : IAssetReceiver
{
- public Dictionary Assets;
- public Dictionary Textures;
+ public Dictionary Assets;
+ public Dictionary Textures;
public List AssetRequests = new List(); //assets ready to be sent to viewers
public List TextureRequests = new List(); //textures ready to be sent
@@ -67,8 +66,8 @@ namespace OpenSim.Region.Caches
Console.WriteLine("Creating Asset cache");
_assetServer = assetServer;
_assetServer.SetReceiver(this);
- Assets = new Dictionary();
- Textures = new Dictionary();
+ Assets = new Dictionary();
+ Textures = new Dictionary();
this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
this._assetCacheThread.IsBackground = true;
this._assetCacheThread.Start();
@@ -81,8 +80,8 @@ namespace OpenSim.Region.Caches
_assetServer = this.LoadAssetDll(assetServerDLLName);
_assetServer.SetServerInfo(assetServerURL, assetServerKey);
_assetServer.SetReceiver(this);
- Assets = new Dictionary();
- Textures = new Dictionary();
+ Assets = new Dictionary();
+ Textures = new Dictionary();
this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
this._assetCacheThread.IsBackground = true;
this._assetCacheThread.Start();
@@ -216,7 +215,7 @@ namespace OpenSim.Region.Caches
/// Event handler, called by a TextureSender object to say that texture has been sent
///
///
- public void TextureSent(AssetCache.TextureSender sender)
+ public void TextureSent(TextureSender sender)
{
if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
{
diff --git a/OpenSim/Region/Caches/Properties/AssemblyInfo.cs b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
index 5e6ecbb..8389415 100644
--- a/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index 2bbf656..b38979d 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -29,14 +29,11 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
-using System.IO;
-using System.Xml;
+using libsecondlife;
using OpenSim.Framework.Servers;
-using OpenSim.Framework;
-using OpenSim.Framework.Utilities;
using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
using OpenSim.Region.Caches;
-using libsecondlife;
namespace OpenSim.Region.Capabilities
{
@@ -126,7 +123,7 @@ namespace OpenSim.Region.Capabilities
///
public string MapLayer(string request, string path, string param)
{
- Encoding _enc = System.Text.Encoding.UTF8;
+ Encoding _enc = Encoding.UTF8;
Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
LLSDMapRequest mapReq = new LLSDMapRequest();
LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
@@ -252,7 +249,7 @@ namespace OpenSim.Region.Capabilities
public string uploaderCaps(string request, string path, string param)
{
- Encoding _enc = System.Text.Encoding.UTF8;
+ Encoding _enc = Encoding.UTF8;
byte[] data = _enc.GetBytes(request);
//Console.WriteLine("recieved upload " + Util.FieldToString(data));
LLUUID inv = this.inventoryItemID;
diff --git a/OpenSim/Region/Capabilities/LLSDArray.cs b/OpenSim/Region/Capabilities/LLSDArray.cs
index 76d5a2c..e04849f 100644
--- a/OpenSim/Region/Capabilities/LLSDArray.cs
+++ b/OpenSim/Region/Capabilities/LLSDArray.cs
@@ -25,10 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
using System.Collections;
-using System.Collections.Generic;
-using System.Text;
namespace OpenSim.Region.Capabilities
{
diff --git a/OpenSim/Region/Capabilities/LLSDCapEvent.cs b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
index d47d25c..51b4fe0 100644
--- a/OpenSim/Region/Capabilities/LLSDCapEvent.cs
+++ b/OpenSim/Region/Capabilities/LLSDCapEvent.cs
@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
namespace OpenSim.Region.Capabilities
{
[LLSDType("MAP")]
diff --git a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
index d6db606..1522559 100644
--- a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
+++ b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
namespace OpenSim.Region.Capabilities
{
[LLSDType("MAP")]
diff --git a/OpenSim/Region/Capabilities/LLSDEmpty.cs b/OpenSim/Region/Capabilities/LLSDEmpty.cs
index 68f1ce9..d79c09e 100644
--- a/OpenSim/Region/Capabilities/LLSDEmpty.cs
+++ b/OpenSim/Region/Capabilities/LLSDEmpty.cs
@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
namespace OpenSim.Region.Capabilities
{
[LLSDType("MAP")]
diff --git a/OpenSim/Region/Capabilities/LLSDHelpers.cs b/OpenSim/Region/Capabilities/LLSDHelpers.cs
index 76d9345..19ef0c9 100644
--- a/OpenSim/Region/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Region/Capabilities/LLSDHelpers.cs
@@ -27,9 +27,8 @@
*/
using System;
using System.Collections;
-using System.Collections.Generic;
-using System.Text;
using System.IO;
+using System.Reflection;
using System.Xml;
using libsecondlife;
@@ -43,7 +42,7 @@ namespace OpenSim.Region.Capabilities
XmlTextWriter writer = new XmlTextWriter(sw);
writer.Formatting = Formatting.None;
writer.WriteStartElement(String.Empty, "llsd", String.Empty);
- LLSDHelpers.SerializeLLSDType(writer, obj);
+ SerializeLLSDType(writer, obj);
writer.WriteEndElement();
writer.Close();
return sw.ToString();
@@ -59,7 +58,7 @@ namespace OpenSim.Region.Capabilities
{
case "MAP":
writer.WriteStartElement(String.Empty, "map", String.Empty);
- System.Reflection.FieldInfo[] fields = myType.GetFields();
+ FieldInfo[] fields = myType.GetFields();
for (int i = 0; i < fields.Length; i++)
{
object fieldValue = fields[i].GetValue(obj);
@@ -115,7 +114,7 @@ namespace OpenSim.Region.Capabilities
IDictionaryEnumerator enumerator = llsd.GetEnumerator();
while (enumerator.MoveNext())
{
- System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
+ FieldInfo field = myType.GetField((string)enumerator.Key);
if (field != null)
{
if (enumerator.Value is Hashtable)
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayer.cs b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
index b097ec3..566d0e9 100644
--- a/OpenSim/Region/Capabilities/LLSDMapLayer.cs
+++ b/OpenSim/Region/Capabilities/LLSDMapLayer.cs
@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
using libsecondlife;
namespace OpenSim.Region.Capabilities
diff --git a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
index ee37a5b..ce746ae 100644
--- a/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
+++ b/OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs
@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
namespace OpenSim.Region.Capabilities
{
[LLSDType("MAP")]
diff --git a/OpenSim/Region/Capabilities/LLSDMapRequest.cs b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
index b15f1be..fb739cd 100644
--- a/OpenSim/Region/Capabilities/LLSDMapRequest.cs
+++ b/OpenSim/Region/Capabilities/LLSDMapRequest.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
namespace OpenSim.Region.Capabilities
{
[LLSDType("MAP")]
diff --git a/OpenSim/Region/Capabilities/LLSDTest.cs b/OpenSim/Region/Capabilities/LLSDTest.cs
index 3948f2c..f23e327 100644
--- a/OpenSim/Region/Capabilities/LLSDTest.cs
+++ b/OpenSim/Region/Capabilities/LLSDTest.cs
@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
namespace OpenSim.Region.Capabilities
{
[LLSDType("MAP")]
diff --git a/OpenSim/Region/Capabilities/LLSDType.cs b/OpenSim/Region/Capabilities/LLSDType.cs
index a2ae8df..c58a937 100644
--- a/OpenSim/Region/Capabilities/LLSDType.cs
+++ b/OpenSim/Region/Capabilities/LLSDType.cs
@@ -26,8 +26,6 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
namespace OpenSim.Region.Capabilities
{
diff --git a/OpenSim/Region/Capabilities/LLSDUploadReply.cs b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
index 83cf166..023a056 100644
--- a/OpenSim/Region/Capabilities/LLSDUploadReply.cs
+++ b/OpenSim/Region/Capabilities/LLSDUploadReply.cs
@@ -25,11 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
using libsecondlife;
+
namespace OpenSim.Region.Capabilities
{
[LLSDType("MAP")]
diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index da74f85..082c0d0 100644
--- a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -28,13 +28,12 @@
using System;
using System.Collections.Generic;
+using System.Text;
using libsecondlife;
-using OpenSim;
using libsecondlife.Packets;
-//using OpenSim.GridServers;
+using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Types;
-using OpenSim.Framework.Interfaces;
using OpenSim.Region.ClientStack;
namespace OpenSim.Assets
@@ -46,7 +45,7 @@ namespace OpenSim.Assets
{
private Dictionary _agentsInventory;
private List _serverRequests; //list of requests made to user server.
- private System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ private Encoding _enc = Encoding.ASCII;
private const uint FULL_MASK_PERMISSIONS = 2147483647;
public InventoryCache()
@@ -127,7 +126,7 @@ namespace OpenSim.Assets
return res;
}
- public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)
+ public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, AssetBase asset)
{
LLUUID newItem = null;
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
@@ -163,7 +162,7 @@ namespace OpenSim.Assets
return res;
}
- public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)
+ public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, AssetBase asset)
{
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
@@ -238,7 +237,7 @@ namespace OpenSim.Assets
Descend.ItemData[i].SalePrice = 100;
Descend.ItemData[i].SaleType = 0;
Descend.ItemData[i].Type = Item.Type;
- Descend.ItemData[i].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+ Descend.ItemData[i].CRC = Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
}
userInfo.OutPacket(Descend);
@@ -286,7 +285,7 @@ namespace OpenSim.Assets
InventoryReply.InventoryData[0].SalePrice = 100;
InventoryReply.InventoryData[0].SaleType = 0;
InventoryReply.InventoryData[0].Type = Item.Type;
- InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+ InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
userInfo.OutPacket(InventoryReply);
}
}
@@ -320,7 +319,7 @@ namespace OpenSim.Assets
InventoryReply.InventoryData[0].SalePrice = 100;
InventoryReply.InventoryData[0].SaleType = 0;
InventoryReply.InventoryData[0].Type = Item.Type;
- InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+ InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
remoteClient.OutPacket(InventoryReply);
}
diff --git a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index f99cf79..f4e537c 100644
--- a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -25,13 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Net;
using System.Net.Sockets;
-using libsecondlife;
-
namespace OpenSim.Region.ClientStack
{
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 51f02da..40e0021 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -27,14 +27,14 @@
*/
using System;
using System.Collections.Generic;
+using System.Net;
using System.Text;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Types;
-
+using Axiom.MathLib;
using libsecondlife;
using libsecondlife.Packets;
-using System.Net;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
namespace OpenSim.Region.ClientStack
{
@@ -137,7 +137,7 @@ namespace OpenSim.Region.ClientStack
///
public void SendRegionHandshake(RegionInfo regionInfo)
{
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ Encoding _enc = Encoding.ASCII;
RegionHandshakePacket handshake = new RegionHandshakePacket();
handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;
@@ -219,8 +219,8 @@ namespace OpenSim.Region.ClientStack
///
public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
{
- System.Text.Encoding enc = System.Text.Encoding.ASCII;
- libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
+ Encoding enc = Encoding.ASCII;
+ ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
reply.ChatData.Audible = 1;
reply.ChatData.Message = message;
reply.ChatData.ChatType = type;
@@ -260,7 +260,7 @@ namespace OpenSim.Region.ClientStack
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
}
}
@@ -286,7 +286,7 @@ namespace OpenSim.Region.ClientStack
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
}
}
@@ -298,7 +298,7 @@ namespace OpenSim.Region.ClientStack
///
public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint )
{
- System.Net.IPAddress neighbourIP = neighbourEndPoint.Address;
+ IPAddress neighbourIP = neighbourEndPoint.Address;
ushort neighbourPort = (ushort) neighbourEndPoint.Port;
EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
@@ -343,7 +343,7 @@ namespace OpenSim.Region.ClientStack
newSimPack.Info = new CrossedRegionPacket.InfoBlock();
newSimPack.Info.Position = pos;
newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
- newSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();
+ newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock();
newSimPack.RegionData.RegionHandle = newRegionHandle;
byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes();
newSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
@@ -359,7 +359,7 @@ namespace OpenSim.Region.ClientStack
public void SendMapBlock(List mapBlocks)
{
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ Encoding _enc = Encoding.ASCII;
MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
mapReply.AgentData.AgentID = this.AgentID;
@@ -514,20 +514,20 @@ namespace OpenSim.Region.ClientStack
///
public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry)
{
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ Encoding _enc = Encoding.ASCII;
//send a objectupdate packet with information about the clients avatar
ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
objupdate.RegionData.RegionHandle = regionHandle;
objupdate.RegionData.TimeDilation = 64096;
- objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
+ objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry);
//give this avatar object a local id and assign the user a name
objupdate.ObjectData[0].ID = avatarLocalID;
objupdate.ObjectData[0].FullID = avatarID;
objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + " \0");
- libsecondlife.LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);
+ LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);
byte[] pb = pos2.GetBytes();
Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
@@ -716,9 +716,9 @@ namespace OpenSim.Region.ClientStack
ushort InternVelocityX;
ushort InternVelocityY;
ushort InternVelocityZ;
- Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0);
+ Vector3 internDirec = new Vector3(0, 0, 0);
- internDirec = new Axiom.MathLib.Vector3(velocity.X, velocity.Y, velocity.Z);
+ internDirec = new Vector3(velocity.X, velocity.Y, velocity.Z);
internDirec = internDirec / 128.0f;
internDirec.x += 1;
@@ -961,7 +961,7 @@ namespace OpenSim.Region.ClientStack
///
protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
{
- libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
+ ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
SetDefaultAvatarPacketValues(ref objdata);
objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
@@ -977,12 +977,12 @@ namespace OpenSim.Region.ClientStack
{
objdata.TextureEntry = textureEntry;
}
- System.Text.Encoding enc = System.Text.Encoding.ASCII;
- libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
+ Encoding enc = Encoding.ASCII;
+ LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
pos.X = 100f;
objdata.ID = 8880000;
objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
- libsecondlife.LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
+ LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
//objdata.FullID=user.AgentID;
byte[] pb = pos.GetBytes();
Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index bc6cc21..60cd33a 100644
--- a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -27,14 +27,13 @@
*/
using System;
using System.Collections.Generic;
-using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
using OpenSim.Assets;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
using OpenSim.Region.Caches;
-using libsecondlife;
-using libsecondlife.Packets;
namespace OpenSim.Region.ClientStack
{
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 0456e3c..e4512d1 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -25,22 +25,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections;
-using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
-using Nwc.XmlRpc;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
-using OpenSim.Assets;
+using OpenSim.Framework.Console;
namespace OpenSim.Region.ClientStack
{
@@ -55,7 +42,7 @@ namespace OpenSim.Region.ClientStack
protected virtual bool Logout(ClientView simClient, Packet packet)
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
+ MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
//send reply to let the client logout
LogoutReplyPacket logReply = new LogoutReplyPacket();
logReply.AgentData.AgentID = this.AgentID;
@@ -120,7 +107,7 @@ namespace OpenSim.Region.ClientStack
{
if (OnUpdatePrimPosition != null)
{
- libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+ LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
}
//should update stored position of the prim
@@ -129,7 +116,7 @@ namespace OpenSim.Region.ClientStack
{
if (OnUpdatePrimRotation != null)
{
- libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
+ LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
}
}
@@ -137,7 +124,7 @@ namespace OpenSim.Region.ClientStack
{
if (OnUpdatePrimScale != null)
{
- libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+ LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
}
}
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 75d3f65..8419906 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -26,21 +26,13 @@
*
*/
using System;
-using System.Collections;
using System.Collections.Generic;
+using System.Text;
using libsecondlife;
using libsecondlife.Packets;
-using Nwc.XmlRpc;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
-using System.Threading;
-using System.Timers;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
-using OpenSim.Assets;
namespace OpenSim.Region.ClientStack
{
@@ -64,7 +56,7 @@ namespace OpenSim.Region.ClientStack
}
else
{
- System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+ Encoding _enc = Encoding.ASCII;
switch (Pack.Type)
{
@@ -452,7 +444,7 @@ namespace OpenSim.Region.ClientStack
this.OutPacket(tpStart);
TeleportProgressPacket tpProgress = new TeleportProgressPacket();
- tpProgress.Info.Message = (new System.Text.ASCIIEncoding()).GetBytes("sending_landmark");
+ tpProgress.Info.Message = (new ASCIIEncoding()).GetBytes("sending_landmark");
tpProgress.Info.TeleportFlags = 8;
tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
this.OutPacket(tpProgress);
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index a36eeb0..606ca1d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -25,24 +25,22 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections;
using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using Nwc.XmlRpc;
using System.Net;
-using System.Net.Sockets;
-using System.IO;
+using System.Text;
using System.Threading;
using System.Timers;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Assets;
using OpenSim.Framework;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
-using OpenSim.Assets;
using OpenSim.Region.Caches;
+using Timer=System.Timers.Timer;
namespace OpenSim.Region.ClientStack
{
@@ -79,7 +77,7 @@ namespace OpenSim.Region.ClientStack
private int cachedtextureserial = 0;
private RegionInfo m_regionData;
protected AuthenticateSessionsBase m_authenticateSessionsHandler;
- private System.Text.Encoding enc = System.Text.Encoding.ASCII;
+ private Encoding enc = Encoding.ASCII;
public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
{
@@ -91,7 +89,7 @@ namespace OpenSim.Region.ClientStack
m_inventoryCache = inventoryCache;
m_authenticateSessionsHandler = authenSessions;
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
+ MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
cirpack = initialcirpack;
userEP = remoteEP;
@@ -100,7 +98,7 @@ namespace OpenSim.Region.ClientStack
PacketQueue = new BlockingQueue();
this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
- AckTimer = new System.Timers.Timer(500);
+ AckTimer = new Timer(500);
AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
AckTimer.Start();
@@ -189,7 +187,7 @@ namespace OpenSim.Region.ClientStack
protected virtual void ClientLoop()
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");
+ MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");
while (true)
{
QueItem nextPacket = PacketQueue.Dequeue();
@@ -211,7 +209,7 @@ namespace OpenSim.Region.ClientStack
protected virtual void InitNewClient()
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
+ MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
this.m_world.AddNewClient(this, false);
}
@@ -222,12 +220,12 @@ namespace OpenSim.Region.ClientStack
if (!sessionInfo.Authorised)
{
//session/circuit not authorised
- OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
+ MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
ClientThread.Abort();
}
else
{
- OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
+ MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
//session is authorised
this.AgentID = cirpack.CircuitCode.ID;
this.SessionID = cirpack.CircuitCode.SessionID;
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 7d39405..f105978 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -27,17 +27,14 @@
*
*/
using System;
-using System.Collections;
using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
using System.Net;
using System.Net.Sockets;
-using System.IO;
-using System.Threading;
using System.Timers;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Interfaces;
namespace OpenSim.Region.ClientStack
{
@@ -47,7 +44,7 @@ namespace OpenSim.Region.ClientStack
protected Dictionary PendingAcks = new Dictionary();
protected Dictionary NeedAck = new Dictionary();
- protected System.Timers.Timer AckTimer;
+ protected Timer AckTimer;
protected uint Sequence = 0;
protected object SequenceLock = new object();
protected const int MAX_APPENDED_ACKS = 10;
@@ -159,7 +156,7 @@ namespace OpenSim.Region.ClientStack
}
catch (Exception)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
+ MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
this.KillThread();
}
@@ -195,8 +192,8 @@ namespace OpenSim.Region.ClientStack
else if ((NewPack.Type == PacketType.StartPingCheck))
{
//reply to pingcheck
- libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack;
- libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket();
+ StartPingCheckPacket startPing = (StartPingCheckPacket)NewPack;
+ CompletePingCheckPacket endPing = new CompletePingCheckPacket();
endPing.PingID.PingID = startPing.PingID.PingID;
OutPacket(endPing);
}
@@ -224,7 +221,7 @@ namespace OpenSim.Region.ClientStack
{
if (Pack.Header.Reliable)
{
- libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket();
+ PacketAckPacket ack_it = new PacketAckPacket();
ack_it.Packets = new PacketAckPacket.PacketsBlock[1];
ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();
ack_it.Packets[0].ID = Pack.Header.Sequence;
@@ -254,7 +251,7 @@ namespace OpenSim.Region.ClientStack
{
if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +
+ MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +
(now - packet.TickCount) + "ms have passed");
packet.Header.Resent = true;
@@ -273,7 +270,7 @@ namespace OpenSim.Region.ClientStack
if (PendingAcks.Count > 250)
{
// FIXME: Handle the odd case where we have too many pending ACKs queued up
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "Too many ACKs queued up!");
+ MainLog.Instance.Verbose( "Too many ACKs queued up!");
return;
}
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 6f20413..b5f0a02 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -25,15 +25,13 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
using System.Collections.Generic;
-using System.Text;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework;
using System.Net;
using System.Net.Sockets;
+using libsecondlife.Packets;
using OpenSim.Assets;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
using OpenSim.Region.Caches;
namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 94db8ee..1e99c71 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -26,27 +26,16 @@
*
*/
using System;
-using System.Text;
-using System.IO;
-using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Region.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework;
+using System.Net;
using OpenSim.Assets;
-using OpenSim.Region.Caches;
+using OpenSim.Framework;
using OpenSim.Framework.Console;
-using OpenSim.Physics.Manager;
-using Nwc.XmlRpc;
+using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
+using OpenSim.Physics.Manager;
+using OpenSim.Region.Caches;
namespace OpenSim.Region.ClientStack
{
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 8ad5332..6eea524 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -26,26 +26,15 @@
*
*/
using System;
-using System.Text;
-using System.IO;
-using System.Threading;
+using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
-using System.Timers;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Region.Terrain;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
using OpenSim.Assets;
-using OpenSim.Region.Caches;
-using OpenSim.Framework.Console;
using OpenSim.Framework;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Region.Caches;
namespace OpenSim.Region.ClientStack
{
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 7c7c389..5d6ede8 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -25,15 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Communications;
+using OpenSim.Framework.Types;
namespace OpenSim.Region.Communications.Local
{
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 26834be..43bdd03 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -25,13 +25,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
using System.Collections.Generic;
-using System.Text;
using libsecondlife;
-using OpenSim.Framework.Types;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
+using OpenSim.Framework.Types;
namespace OpenSim.Region.Communications.Local
{
@@ -163,7 +161,7 @@ namespace OpenSim.Region.Communications.Local
///
///
///
- public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+ public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
{
if (this.regionHosts.ContainsKey(regionHandle))
{
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index b441a8d..592b36c 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -1,17 +1,11 @@
using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-
+using libsecondlife;
using OpenSim.Framework.Communications;
-//using OpenSim.Framework.User;
-using OpenSim.Framework.UserManagement;
using OpenSim.Framework.Data;
using OpenSim.Framework.Types;
+using OpenSim.Framework.UserManagement;
using OpenSim.Framework.Utilities;
-using libsecondlife;
-
namespace OpenSim.Region.Communications.Local
{
public class LocalUserServices : UserManagerBase, IUserServices
diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index 1eb7107..9afb75e 100644
--- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 870f577..0a0847e 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Communications;
+using OpenSim.Framework.Types;
+
namespace OpenSim.Region.Communications.OGS1
{
public class CommunicationsOGS1 : CommunicationsManager
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 977b131..1706c6d 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -1,19 +1,17 @@
using System;
-using System.Collections.Generic;
using System.Collections;
-using System.Text;
+using System.Collections.Generic;
+using System.Net;
using System.Runtime.Remoting;
using System.Runtime.Remoting.Channels;
using System.Runtime.Remoting.Channels.Tcp;
-
-using OpenSim.Framework.Servers;
+using libsecondlife;
+using Nwc.XmlRpc;
using OpenSim.Framework;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Communications;
-
-using Nwc.XmlRpc;
-using libsecondlife;
-using System.Net;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
namespace OpenSim.Region.Communications.OGS1
{
@@ -52,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
if (GridRespData.ContainsKey("error"))
{
string errorstring = (string)GridRespData["error"];
- OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
+ MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
return null;
}
@@ -103,7 +101,7 @@ namespace OpenSim.Region.Communications.OGS1
public RegionInfo RequestNeighbourInfo(ulong regionHandle)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");
+ MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");
return null;
}
@@ -184,7 +182,7 @@ namespace OpenSim.Region.Communications.OGS1
}
else
{
- OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
+ MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
}
return new XmlRpcResponse();
@@ -215,7 +213,7 @@ namespace OpenSim.Region.Communications.OGS1
return false;
}
- public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+ public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
{
if (this.listeners.ContainsKey(regionHandle))
{
@@ -239,7 +237,7 @@ namespace OpenSim.Region.Communications.OGS1
return false;
}
- public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+ public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position)
{
if (this.listeners.ContainsKey(regionHandle))
{
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 51b33e9..f514a29 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -1,12 +1,11 @@
using System;
-using System.Collections.Generic;
-using System.Text;
+using libsecondlife;
using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications;
+
namespace OpenSim.Region.Communications.OGS1
{
public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
- public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
+ public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position);
public sealed class InterRegionSingleton
{
@@ -40,7 +39,7 @@ namespace OpenSim.Region.Communications.OGS1
return false;
}
- public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+ public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
{
if (OnArrival != null)
{
@@ -62,7 +61,7 @@ namespace OpenSim.Region.Communications.OGS1
return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
}
- public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+ public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
{
return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 6d428d0..7c7db03 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -1,13 +1,9 @@
using System;
using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Data;
using libsecondlife;
-
using Nwc.XmlRpc;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Data;
namespace OpenSim.Region.Communications.OGS1
{
diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 0c6f965..41f811a 100644
--- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index c2c1ecf..b5a74ad 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -28,13 +28,12 @@
using System;
using System.Collections.Generic;
using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim;
using libsecondlife;
using libsecondlife.Packets;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Region.Environment.Scenes;
using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
@@ -79,30 +78,30 @@ namespace OpenSim.Region.Environment
case "setregioninfo":
if (packet.ParamList.Length != 9)
{
- OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
+ MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
}
else
{
- m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;
+ m_regInfo.estateSettings.regionFlags = Simulator.RegionFlags.None;
if (convertParamStringToBool(packet.ParamList[0].Parameter))
{
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.BlockTerraform;
}
if (convertParamStringToBool(packet.ParamList[1].Parameter))
{
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.NoFly;
}
if (convertParamStringToBool(packet.ParamList[2].Parameter))
{
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.AllowDamage;
}
if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
{
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.BlockLandResell;
}
@@ -113,17 +112,17 @@ namespace OpenSim.Region.Environment
m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
- m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;
+ m_regInfo.estateSettings.simAccess = (Simulator.SimAccess)tempMatureLevel;
if (convertParamStringToBool(packet.ParamList[7].Parameter))
{
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.RestrictPushObject;
}
if (convertParamStringToBool(packet.ParamList[8].Parameter))
{
- m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;
+ m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.AllowParcelChanges;
}
sendRegionInfoPacketToAll();
@@ -223,7 +222,7 @@ namespace OpenSim.Region.Environment
case "setregionterrain":
if (packet.ParamList.Length != 9)
{
- OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
+ MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
}
else
{
@@ -237,7 +236,7 @@ namespace OpenSim.Region.Environment
}
break;
default:
- OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
+ MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
break;
}
}
@@ -265,7 +264,7 @@ namespace OpenSim.Region.Environment
public void sendRegionInfoPacket(IClientAPI remote_client)
{
- Encoding _enc = System.Text.Encoding.ASCII;
+ Encoding _enc = Encoding.ASCII;
AgentCircuitData circuitData = remote_client.RequestClientInfo();
diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 3afbe6e..2059b3f 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -27,7 +27,6 @@
*/
using System;
using System.Collections.Generic;
-using System.Text;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
@@ -43,7 +42,7 @@ namespace OpenSim.Region.Environment
///
/// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
///
- public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver
+ public class ParcelManager : ILocalStorageParcelReceiver
{
#region Constants
@@ -420,7 +419,7 @@ namespace OpenSim.Region.Environment
{
for (y = 0; y < inc_y; y++)
{
- OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);
+ Parcel currentParcel = getParcel(start_x + x, start_y + y);
if (!temp.Contains(currentParcel))
{
currentParcel.forceUpdateParcelInfo();
@@ -429,10 +428,10 @@ namespace OpenSim.Region.Environment
}
}
- int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL;
+ int requestResult = PARCEL_RESULT_ONE_PARCEL;
if (temp.Count > 1)
{
- requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;
+ requestResult = PARCEL_RESULT_MULTIPLE_PARCELS;
}
for (i = 0; i < temp.Count; i++)
@@ -571,7 +570,7 @@ namespace OpenSim.Region.Environment
updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
- updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);
+ updatePacket.ParcelData.Desc = Helpers.StringToField(parcelData.parcelDesc);
updatePacket.ParcelData.Category = (byte)parcelData.category;
updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
@@ -631,7 +630,7 @@ namespace OpenSim.Region.Environment
parcelData.mediaID = packet.ParcelData.MediaID;
parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
- parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);
+ parcelData.parcelName = Helpers.FieldToUTF8String(packet.ParcelData.Name);
parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
parcelData.passHours = packet.ParcelData.PassHours;
parcelData.passPrice = packet.ParcelData.PassPrice;
diff --git a/OpenSim/Region/Environment/RegionManager.cs b/OpenSim/Region/Environment/RegionManager.cs
index 4ff55a8..cd67e97 100644
--- a/OpenSim/Region/Environment/RegionManager.cs
+++ b/OpenSim/Region/Environment/RegionManager.cs
@@ -1,11 +1,9 @@
-using System;
using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Communications;
using OpenSim.Framework;
-using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers;
using OpenSim.Region.Capabilities;
+using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment
{
@@ -17,7 +15,7 @@ namespace OpenSim.Region.Environment
protected List capsHandlers = new List();
protected BaseHttpServer httpListener;
- protected Scenes.Scene m_Scene;
+ protected Scene m_Scene;
public ParcelManager parcelManager;
public EstateManager estateManager;
diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
index 6db57a4..c697faa 100644
--- a/OpenSim/Region/Environment/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
@@ -26,11 +26,8 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
-using Axiom.MathLib;
-using OpenSim.Physics.Manager;
using libsecondlife;
+using OpenSim.Physics.Manager;
namespace OpenSim.Region.Environment.Scenes
{
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 63f3f5d..a8eb9ce 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -1,6 +1,4 @@
-using System;
using System.Collections.Generic;
-using System.Text;
using Axiom.MathLib;
using libsecondlife;
@@ -8,7 +6,7 @@ namespace OpenSim.Region.Environment.Scenes
{
public abstract class EntityBase
{
- public libsecondlife.LLUUID uuid;
+ public LLUUID uuid;
protected List children;
@@ -83,7 +81,7 @@ namespace OpenSim.Region.Environment.Scenes
///
public EntityBase()
{
- uuid = new libsecondlife.LLUUID();
+ uuid = new LLUUID();
m_pos = new LLVector3();
velocity = new LLVector3();
diff --git a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
index 36023d0..7c3a033 100644
--- a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
namespace OpenSim.Region.Environment.Scenes
{
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index b8ec68b..a767bd2 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -1,12 +1,11 @@
using System;
using System.Collections.Generic;
-using System.Text;
+using Axiom.MathLib;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
namespace OpenSim.Region.Environment.Scenes
{
@@ -266,7 +265,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SendTerseUpdateToClient(IClientAPI RemoteClient)
{
LLVector3 lPos;
- Axiom.MathLib.Quaternion lRot;
+ Quaternion lRot;
lPos = this.Pos;
lRot = this.rotation;
diff --git a/OpenSim/Region/Environment/Scenes/PrimitiveOld.cs b/OpenSim/Region/Environment/Scenes/PrimitiveOld.cs
index d703857..4213a18 100644
--- a/OpenSim/Region/Environment/Scenes/PrimitiveOld.cs
+++ b/OpenSim/Region/Environment/Scenes/PrimitiveOld.cs
@@ -29,12 +29,13 @@
using System;
using System.Collections.Generic;
using System.Text;
+using Axiom.MathLib;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
+using OpenSim.Physics.Manager;
namespace OpenSim.Region.Environment.Scenes
{
@@ -174,9 +175,9 @@ namespace OpenSim.Region.Environment.Scenes
dataArrays.Add(primData.ToBytes());
foreach (Entity child in children)
{
- if (child is OpenSim.Region.Environment.Scenes.PrimitiveOld)
+ if (child is PrimitiveOld)
{
- dataArrays.Add(((OpenSim.Region.Environment.Scenes.PrimitiveOld)child).GetByteArray());
+ dataArrays.Add(((PrimitiveOld)child).GetByteArray());
}
}
byte[] primstart = Helpers.StringToField("");
@@ -351,7 +352,7 @@ namespace OpenSim.Region.Environment.Scenes
///
public byte[] ConvertInventoryToBytes()
{
- System.Text.Encoding enc = System.Text.Encoding.ASCII;
+ Encoding enc = Encoding.ASCII;
byte[] result = new byte[0];
List inventoryData = new List();
int totallength = 0;
@@ -434,7 +435,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SendTerseUpdateToClient(IClientAPI RemoteClient)
{
LLVector3 lPos;
- Axiom.MathLib.Quaternion lRot;
+ Quaternion lRot;
if (this._physActor != null && this.physicsEnabled) //is this needed ? doesn't the property fields do this for us?
{
PhysicsVector pPos = this._physActor.Position;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index d8533b0..669039f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -27,14 +27,10 @@
*/
using System;
using System.Collections.Generic;
-using System.Text;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Utilities;
namespace OpenSim.Region.Environment.Scenes
{
@@ -253,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (((SceneObject)ent).rootLocalID == primLocalID)
{
- ((OpenSim.Region.Environment.Scenes.SceneObject)ent).GetProperites(remoteClient);
+ ((SceneObject)ent).GetProperites(remoteClient);
break;
}
}
@@ -349,7 +345,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (ent.LocalId == localID)
{
- ((OpenSim.Region.Environment.Scenes.PrimitiveOld)ent).UpdatePosition(pos);
+ ((PrimitiveOld)ent).UpdatePosition(pos);
break;
}
}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 059bfd7..2bc3f8c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -26,27 +26,23 @@
*
*/
using System;
-using libsecondlife;
-using libsecondlife.Packets;
using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
using System.Threading;
using System.Timers;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
+using libsecondlife;
+using libsecondlife.Packets;
using OpenSim.Framework;
-using OpenSim.Region.Terrain;
using OpenSim.Framework.Communications;
-using OpenSim.Region.Caches;
-using OpenSim.Region.Environment;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
+using OpenSim.Physics.Manager;
+using OpenSim.Region.Caches;
using OpenSim.Region.Enviorment.Scripting;
-using OpenSim.Region.Capabilities;
-using Caps = OpenSim.Region.Capabilities.Caps;
+using OpenSim.Region.Terrain;
+using Caps=OpenSim.Region.Capabilities.Caps;
+using Timer=System.Timers.Timer;
namespace OpenSim.Region.Environment.Scenes
{
@@ -54,9 +50,9 @@ namespace OpenSim.Region.Environment.Scenes
public partial class Scene : SceneBase, ILocalStorageReceiver
{
- protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
- protected Dictionary Avatars;
- protected Dictionary Prims;
+ protected Timer m_heartbeatTimer = new Timer();
+ protected Dictionary Avatars;
+ protected Dictionary Prims;
private PhysicsScene phyScene;
private float timeStep = 0.1f;
private Random Rand = new Random();
@@ -119,12 +115,12 @@ namespace OpenSim.Region.Environment.Scenes
scriptManager = new ScriptManager(this);
eventManager = new EventManager();
- OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs - creating new entitities instance");
- Entities = new Dictionary();
+ MainLog.Instance.Verbose("World.cs - creating new entitities instance");
+ Entities = new Dictionary();
Avatars = new Dictionary();
Prims = new Dictionary();
- OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs - creating LandMap");
+ MainLog.Instance.Verbose("World.cs - creating LandMap");
Terrain = new TerrainEngine();
ScenePresence.LoadAnims();
@@ -151,7 +147,7 @@ namespace OpenSim.Region.Environment.Scenes
///
///
///
- void Heartbeat(object sender, System.EventArgs e)
+ void Heartbeat(object sender, EventArgs e)
{
this.Update();
}
@@ -170,7 +166,7 @@ namespace OpenSim.Region.Environment.Scenes
}
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ foreach (LLUUID UUID in Entities.Keys)
{
Entities[UUID].updateMovement();
}
@@ -180,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes
this.phyScene.Simulate(timeStep);
}
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ foreach (LLUUID UUID in Entities.Keys)
{
Entities[UUID].update();
}
@@ -198,7 +194,7 @@ namespace OpenSim.Region.Environment.Scenes
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
}
updateLock.ReleaseMutex();
@@ -237,14 +233,14 @@ namespace OpenSim.Region.Environment.Scenes
this.SendLayerData(client);
}
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ foreach (LLUUID UUID in Entities.Keys)
{
Entities[UUID].LandRenegerated();
}
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
}
}
@@ -268,14 +264,14 @@ namespace OpenSim.Region.Environment.Scenes
this.SendLayerData(client);
}
- foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+ foreach (LLUUID UUID in Entities.Keys)
{
Entities[UUID].LandRenegerated();
}
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
}
}
@@ -301,7 +297,7 @@ namespace OpenSim.Region.Environment.Scenes
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
}
}
@@ -351,7 +347,7 @@ namespace OpenSim.Region.Environment.Scenes
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
}
}
@@ -382,12 +378,12 @@ namespace OpenSim.Region.Environment.Scenes
{
try
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives");
+ MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives");
this.localStorage.LoadPrimitives(this);
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
}
}
@@ -428,7 +424,7 @@ namespace OpenSim.Region.Environment.Scenes
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
}
}
@@ -482,10 +478,10 @@ namespace OpenSim.Region.Environment.Scenes
{
ScenePresence newAvatar = null;
- OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
+ MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
newAvatar = new ScenePresence(client, this, this.m_regInfo);
- OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Adding new avatar to world");
- OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Starting RegionHandshake ");
+ MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Adding new avatar to world");
+ MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Starting RegionHandshake ");
PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
lock (this.m_syncRoot)
@@ -638,7 +634,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
- public void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+ public void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
{
if (regionHandle == this.m_regInfo.RegionHandle)
{
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 817f206..4036743 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -26,25 +26,20 @@
*
*/
using System;
-using libsecondlife;
-using libsecondlife.Packets;
using System.Collections.Generic;
-using System.Text;
using System.Reflection;
-using System.IO;
-using System.Threading;
-using OpenSim.Physics.Manager;
+using libsecondlife;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
-using OpenSim.Region.Terrain;
using OpenSim.Region.Caches;
+using OpenSim.Region.Terrain;
namespace OpenSim.Region.Environment.Scenes
{
public abstract class SceneBase : IWorld
{
- public Dictionary Entities;
+ public Dictionary Entities;
protected Dictionary m_clientThreads;
protected ulong m_regionHandle;
protected string m_regionName;
@@ -113,7 +108,7 @@ namespace OpenSim.Region.Environment.Scenes
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
+ MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
return false;
}
}
@@ -191,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
+ MainLog.Instance.WriteLine(LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
}
}
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index ac887c0..9e383c6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using libsecondlife;
namespace OpenSim.Region.Environment.Scenes
{
@@ -18,7 +16,7 @@ namespace OpenSim.Region.Environment.Scenes
public delegate void OnNewPrimitiveDelegate(PrimitiveOld prim);
public event OnNewPrimitiveDelegate OnNewPrimitive;
- public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid);
+ public delegate void OnRemovePresenceDelegate(LLUUID uuid);
public event OnRemovePresenceDelegate OnRemovePresence;
public void TriggerOnFrame()
@@ -41,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
OnNewPresence(presence);
}
- public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid)
+ public void TriggerOnRemovePresence(LLUUID uuid)
{
if (OnRemovePresence != null)
{
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index c03354e..04ed408 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -25,21 +25,18 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
using OpenSim.Physics.Manager;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Inventory;
namespace OpenSim.Region.Environment.Scenes
{
public class SceneObject : EntityBase
{
- private System.Text.Encoding enc = System.Text.Encoding.ASCII;
+ private Encoding enc = Encoding.ASCII;
private Dictionary ChildPrimitives = new Dictionary(); //list of all primitive id's that are part of this group
public Primitive rootPrimitive;
private Scene m_world;
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index 2caabc2..d1f75ed 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -25,11 +25,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
using System.Xml;
+using libsecondlife;
namespace OpenSim.Region.Environment.Scenes
{
@@ -66,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
// OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
- foreach (KeyValuePair kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
+ foreach (KeyValuePair kp in Animations.AnimsLLUUID)
{
AnimsNames.Add(kp.Value, kp.Key);
}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
index 2c81d2a..dbb5d3f 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
@@ -25,14 +25,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
namespace OpenSim.Region.Environment.Scenes
{
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8a8f5ae..dcca848 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -28,14 +28,13 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.Text;
+using Axiom.MathLib;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Physics.Manager;
-using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using Axiom.MathLib;
+using OpenSim.Physics.Manager;
namespace OpenSim.Region.Environment.Scenes
{
@@ -53,7 +52,7 @@ namespace OpenSim.Region.Environment.Scenes
private byte movementflag = 0;
private List forcesList = new List();
private short _updateCount = 0;
- private Axiom.MathLib.Quaternion bodyRot;
+ private Quaternion bodyRot;
private LLObject.TextureEntry avatarAppearanceTexture = null;
private byte[] visualParams;
private AvatarWearable[] Wearables;
@@ -110,7 +109,7 @@ namespace OpenSim.Region.Environment.Scenes
m_regionInfo = reginfo;
m_regionHandle = reginfo.RegionHandle;
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");
+ MainLog.Instance.Verbose("Avatar.cs ");
ControllingClient = theClient;
this.firstname = ControllingClient.FirstName;
this.lastname = ControllingClient.LastName;
@@ -240,7 +239,7 @@ namespace OpenSim.Region.Environment.Scenes
bool update_rotation = false;
bool DCFlagKeyPressed = false;
Vector3 agent_control_v3 = new Vector3(0, 0, 0);
- Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
+ Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
@@ -278,10 +277,10 @@ namespace OpenSim.Region.Environment.Scenes
}
- protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation)
+ protected void AddNewMovement(Vector3 vec, Quaternion rotation)
{
NewForce newVelocity = new NewForce();
- Axiom.MathLib.Vector3 direc = rotation * vec;
+ Vector3 direc = rotation * vec;
direc.Normalize();
direc = direc * ((0.03f) * 128f);
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
index fc193f5..56f5c0b 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
@@ -26,13 +26,10 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
-
-// Compilation stuff
-using System.CodeDom;
using System.CodeDom.Compiler;
+using System.Collections.Generic;
using Microsoft.CSharp;
+using OpenSim.Framework.Console;
namespace OpenSim.Region.Enviorment.Scripting
{
@@ -60,10 +57,10 @@ namespace OpenSim.Region.Enviorment.Scripting
if (compilerResults.Errors.Count > 0)
{
- OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");
+ MainLog.Instance.Error("Compile errors");
foreach (CompilerError error in compilerResults.Errors)
{
- OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
+ MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
}
}
else
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
index e6d66eb..2cea6e0 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
@@ -26,13 +26,10 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
-
-// Compilation stuff
-using System.CodeDom;
using System.CodeDom.Compiler;
+using System.Collections.Generic;
using Microsoft.JScript;
+using OpenSim.Framework.Console;
namespace OpenSim.Region.Enviorment.Scripting
{
@@ -60,10 +57,10 @@ namespace OpenSim.Region.Enviorment.Scripting
if (compilerResults.Errors.Count > 0)
{
- OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");
+ MainLog.Instance.Error("Compile errors");
foreach (CompilerError error in compilerResults.Errors)
{
- OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
+ MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
}
}
else
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 1e64675..8029883 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -25,13 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using OpenSim.Framework.Console;
-using OpenSim.Framework;
-using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Enviorment.Scripting
@@ -54,7 +47,7 @@ namespace OpenSim.Region.Enviorment.Scripting
public void Initialise(ScriptInfo scriptInfo)
{
script = scriptInfo;
- script.events.OnFrame += new OpenSim.Region.Environment.Scenes.EventManager.OnFrameDelegate(events_OnFrame);
+ script.events.OnFrame += new EventManager.OnFrameDelegate(events_OnFrame);
script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);
}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index 522a572..d984d60 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -25,12 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Console;
+using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Enviorment.Scripting
{
@@ -52,7 +48,7 @@ namespace OpenSim.Region.Enviorment.Scripting
{
world = scene;
events = world.eventManager;
- logger = OpenSim.Framework.Console.MainLog.Instance;
+ logger = MainLog.Instance;
}
}
}
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index eb1c1d9..1d47c24 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -25,16 +25,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
using System.Collections.Generic;
-using System.Text;
+using OpenSim.Framework.Console;
+using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Enviorment.Scripting
{
public class ScriptManager
{
List scripts = new List();
- OpenSim.Region.Environment.Scenes.Scene scene;
+ Scene scene;
Dictionary compilers = new Dictionary();
private void LoadFromCompiler(Dictionary compiledscripts)
@@ -42,14 +42,14 @@ namespace OpenSim.Region.Enviorment.Scripting
foreach (KeyValuePair script in compiledscripts)
{
ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading " + script.Key);
+ MainLog.Instance.Verbose("Loading " + script.Key);
script.Value.Initialise(scriptInfo);
scripts.Add(script.Value);
}
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");
+ MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");
}
- public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world)
+ public ScriptManager(Scene world)
{
scene = world;
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Enviorment.Scripting
break;
default:
- OpenSim.Framework.Console.MainLog.Instance.Error("Unknown script command");
+ MainLog.Instance.Error("Unknown script command");
break;
}
}
diff --git a/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs b/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
index c3d3d33..f946482 100644
--- a/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
+++ b/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections;
using System.Text;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Capabilities;
using libsecondlife;
-using System.Collections;
+using OpenSim.Region.Capabilities;
namespace OpenSim.Framework.Servers
{
@@ -28,7 +25,7 @@ namespace OpenSim.Framework.Servers
public string Handle(string body, string path)
{
- Encoding _enc = System.Text.Encoding.UTF8;
+ Encoding _enc = Encoding.UTF8;
Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes( body ));
TRequest request = new TRequest();
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 8e6fd8f..3245223 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -1,23 +1,19 @@
-using System;
using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Console;
using libsecondlife;
-using OpenSim.Region.Environment;
-using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
-using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework;
-using OpenSim.Region.Caches;
using OpenSim.Framework.Communications;
+using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
+using OpenSim.Region.Caches;
+using OpenSim.Region.Environment.Scenes;
+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
namespace SimpleApp
{
public class MyWorld : Scene
{
- private List m_avatars;
+ private List m_avatars;
public MyWorld(Dictionary clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
: base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 6bf6657..bc84c35 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -1,23 +1,18 @@
using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim;
-using OpenSim.Region.GridInterfaces.Local;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Servers;
-using OpenSim.Assets;
+using System.Net;
using libsecondlife;
+using OpenSim.Assets;
using OpenSim.Framework;
-using OpenSim.Region.Caches;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Communications.Local;
-using OpenSim.Region.ClientStack;
-using System.Net;
-using libsecondlife.Packets;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
using OpenSim.Physics.Manager;
+using OpenSim.Region.Caches;
using OpenSim.Region.Capabilities;
+using OpenSim.Region.ClientStack;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Region.GridInterfaces.Local;
namespace SimpleApp
{
diff --git a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
index 0f9bf0f..3b0de8a 100644
--- a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
diff --git a/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
index 52ecd6b..b5fc1ef 100644
--- a/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
+++ b/OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs
@@ -26,9 +26,7 @@
*
*/
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// Information about this assembly is defined by the following
// attributes.
//
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index 95d03f1..bd303e1 100644
--- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -26,17 +26,15 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
using System.IO;
+using System.Threading;
+using Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+using libsecondlife;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Console;
-using libsecondlife;
-using Db4objects.Db4o;
-using Db4objects.Db4o.Query;
namespace OpenSim.Region.GridInterfaces.Local
{
@@ -64,19 +62,19 @@ namespace OpenSim.Region.GridInterfaces.Local
{
bool yapfile;
this._assetRequests = new BlockingQueue();
- yapfile = System.IO.File.Exists("assets.yap");
+ yapfile = File.Exists("assets.yap");
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "Local Asset Server class created");
+ MainLog.Instance.Verbose( "Local Asset Server class created");
try
{
db = Db4oFactory.OpenFile("assets.yap");
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "Db4 Asset database creation");
+ MainLog.Instance.Verbose( "Db4 Asset database creation");
}
catch (Exception e)
{
db.Close();
- OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");
- OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+ MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");
+ MainLog.Instance.Warn(e.ToString());
}
if (!yapfile)
{
@@ -124,7 +122,7 @@ namespace OpenSim.Region.GridInterfaces.Local
{
if (db != null)
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "Closing local asset server database");
+ MainLog.Instance.Verbose( "Closing local asset server database");
db.Close();
}
}
@@ -168,7 +166,7 @@ namespace OpenSim.Region.GridInterfaces.Local
try
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose( "Setting up asset database");
+ MainLog.Instance.Verbose( "Setting up asset database");
AssetBase Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
@@ -281,7 +279,7 @@ namespace OpenSim.Region.GridInterfaces.Local
//should request Asset from storage manager
//but for now read from file
- string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
+ string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
string fileName = Path.Combine(dataPath, filename);
FileInfo fInfo = new FileInfo(fileName);
long numBytes = fInfo.Length;
diff --git a/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
index 51596d0..1e15c5e 100644
--- a/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
+++ b/OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs
@@ -26,9 +26,7 @@
*
*/
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// Information about this assembly is defined by the following
// attributes.
//
diff --git a/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
index 4652f70..8643736 100644
--- a/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
@@ -25,14 +25,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
+using System.IO;
+using System.Net;
using System.Text;
using System.Threading;
-using System.Net;
-using System.Net.Sockets;
-using System.IO;
using libsecondlife;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
@@ -53,7 +51,7 @@ namespace OpenSim.Region.GridInterfaces.Remote
this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
this._remoteAssetServerThread.IsBackground = true;
this._remoteAssetServerThread.Start();
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Remote Asset Server class created");
+ MainLog.Instance.Verbose("Remote Asset Server class created");
}
public void SetReceiver(IAssetReceiver receiver)
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index 177c49d..ce567a9 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
@@ -26,9 +26,7 @@
*
*/
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// Information about this assembly is defined by the following
// attributes.
//
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index e3f34da..393796f 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
using System.Collections.Generic;
+using Axiom.MathLib;
using OpenSim.Physics.Manager;
namespace OpenSim.Region.Physics.BasicPhysicsPlugin
@@ -250,11 +250,11 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
}
}
- public override Axiom.MathLib.Quaternion Orientation
+ public override Quaternion Orientation
{
get
{
- return Axiom.MathLib.Quaternion.Identity;
+ return Quaternion.Identity;
}
set
{
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
index 132f64a..9415db9 100644
--- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
@@ -26,9 +26,7 @@
*
*/
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// Information about this assembly is defined by the following
// attributes.
//
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 502d8e6..8c286e0 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -25,15 +25,13 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Axiom.MathLib;
namespace OpenSim.Physics.Manager
{
public delegate void PositionUpdate(PhysicsVector position);
public delegate void VelocityUpdate(PhysicsVector velocity);
- public delegate void OrientationUpdate(Axiom.MathLib.Quaternion orientation);
+ public delegate void OrientationUpdate(Quaternion orientation);
public abstract class PhysicsActor
{
@@ -66,7 +64,7 @@ namespace OpenSim.Physics.Manager
get;
}
- public abstract Axiom.MathLib.Quaternion Orientation
+ public abstract Quaternion Orientation
{
get;
set;
@@ -115,11 +113,11 @@ namespace OpenSim.Physics.Manager
}
}
- public override Axiom.MathLib.Quaternion Orientation
+ public override Quaternion Orientation
{
get
{
- return Axiom.MathLib.Quaternion.Identity;
+ return Quaternion.Identity;
}
set
{
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
index 0e28522..265bce6 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
@@ -27,10 +27,8 @@
*/
using System;
using System.Collections.Generic;
-using System.Collections;
using System.IO;
using System.Reflection;
-using Axiom.MathLib;
using OpenSim.Framework.Console;
namespace OpenSim.Physics.Manager
@@ -56,19 +54,19 @@ namespace OpenSim.Physics.Manager
if(_plugins.ContainsKey(engineName))
{
- OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
+ MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
return _plugins[engineName].GetScene();
}
else
{
- OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
+ MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
}
}
public void LoadPlugins()
{
- string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics");
+ string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics");
string[] pluginFiles = Directory.GetFiles(path, "*.dll");
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 3f22585..d44da00 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,9 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
using OpenSim.Framework.Console;
namespace OpenSim.Physics.Manager
@@ -67,7 +64,7 @@ namespace OpenSim.Physics.Manager
public override PhysicsActor AddAvatar(PhysicsVector position)
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
+ MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
return PhysicsActor.Null;
}
@@ -78,7 +75,7 @@ namespace OpenSim.Physics.Manager
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
+ MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
return PhysicsActor.Null;
}
@@ -91,12 +88,12 @@ namespace OpenSim.Physics.Manager
public override void GetResults()
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
+ MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
}
public override void SetTerrain(float[] heightMap)
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
+ MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
}
public override void DeleteTerrain()
diff --git a/OpenSim/Region/Physics/Manager/PhysicsVector.cs b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
index c60da9d..e75f29b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsVector.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsVector.cs
@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
namespace OpenSim.Physics.Manager
{
public class PhysicsVector
diff --git a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
index b49c8da..ee10430 100644
--- a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
@@ -26,9 +26,7 @@
*
*/
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// Information about this assembly is defined by the following
// attributes.
//
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 8aca851..b85c052 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -27,8 +27,9 @@
*/
using System;
using System.Collections.Generic;
-using OpenSim.Physics.Manager;
+using Axiom.MathLib;
using Ode.NET;
+using OpenSim.Physics.Manager;
namespace OpenSim.Region.Physics.OdePlugin
{
@@ -194,13 +195,13 @@ namespace OpenSim.Region.Physics.OdePlugin
LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
d.Matrix3 R = new d.Matrix3();
- Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0));
- Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0));
+ Quaternion q1 =Quaternion.FromAngleAxis(1.5707f, new Vector3(1,0,0));
+ Quaternion q2 =Quaternion.FromAngleAxis(1.5707f, new Vector3(0,1,0));
//Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));
q1 = q1 * q2;
//q1 = q1 * q3;
- Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3();
+ Vector3 v3 = new Vector3();
float angle = 0;
q1.ToAngleAxis(ref angle, ref v3);
@@ -287,11 +288,11 @@ namespace OpenSim.Region.Physics.OdePlugin
}
}
- public override Axiom.MathLib.Quaternion Orientation
+ public override Quaternion Orientation
{
get
{
- return Axiom.MathLib.Quaternion.Identity;
+ return Quaternion.Identity;
}
set
{
@@ -414,11 +415,11 @@ namespace OpenSim.Region.Physics.OdePlugin
}
}
- public override Axiom.MathLib.Quaternion Orientation
+ public override Quaternion Orientation
{
get
{
- Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
+ Quaternion res = new Quaternion();
return res;
}
set
diff --git a/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
index b49c8da..ee10430 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
@@ -26,9 +26,7 @@
*
*/
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// Information about this assembly is defined by the following
// attributes.
//
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 8bf794b..a75e5c7 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -29,6 +29,7 @@ using System;
using System.Collections.Generic;
using OpenSim.Physics.Manager;
using PhysXWrapper;
+using Quaternion=Axiom.MathLib.Quaternion;
namespace OpenSim.Region.Physics.PhysXPlugin
{
@@ -240,11 +241,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin
}
}
- public override Axiom.MathLib.Quaternion Orientation
+ public override Quaternion Orientation
{
get
{
- return Axiom.MathLib.Quaternion.Identity;
+ return Quaternion.Identity;
}
set
{
@@ -377,11 +378,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin
}
}
- public override Axiom.MathLib.Quaternion Orientation
+ public override Quaternion Orientation
{
get
{
- Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
+ Quaternion res = new Quaternion();
PhysXWrapper.Quaternion quat = this._prim.GetOrientation();
res.w = quat.W;
res.x = quat.X;
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index 3bc6f25..39ba6e4 100644
--- a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -29,15 +29,10 @@
// BDB Support
// Apparently broken on Mono
-using System;
-using System.Collections.Generic;
-using System.Data;
+using BerkeleyDb;
using libsecondlife;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using BerkeleyDb;
-using Kds.Serialization;
-using Kds.Serialization.Buffer;
namespace OpenSim.Region.Storage.LocalStorageBDB
{
@@ -52,7 +47,7 @@ namespace OpenSim.Region.Storage.LocalStorageBDB
public BDBLocalStorage()
{
DB = new Db(DbCreateFlags.None);
- sim = (DbHash)DB.Open(null, simDbName, null, BerkeleyDb.DbType.Hash, Db.OpenFlags.Create, 0);
+ sim = (DbHash)DB.Open(null, simDbName, null, DbType.Hash, Db.OpenFlags.Create, 0);
//vendorDb = (DbBTree)db.Open(null, VendorDbName, null, DbType.BTree, Db.OpenFlags.Create, 0);
}
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
index ea2b62e..4463ac9 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
@@ -26,9 +26,7 @@
*
*/
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// Information about this assembly is defined by the following
// attributes.
//
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 5cb4861..8214bc8 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -26,15 +26,11 @@
*
*/
using System;
-using System.Collections.Generic;
using Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-
using libsecondlife;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using OpenSim.Framework.Console;
-
namespace OpenSim.Region.Storage.LocalStorageDb4o
{
@@ -53,18 +49,18 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
public void Initialise(string dfile)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage Opening " + dfile);
+ MainLog.Instance.Warn("Db4LocalStorage Opening " + dfile);
datastore = dfile;
try
{
db = Db4oFactory.OpenFile(datastore);
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage creation");
+ MainLog.Instance.Verbose("Db4LocalStorage creation");
}
catch (Exception e)
{
db.Close();
- OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");
- OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+ MainLog.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");
+ MainLog.Instance.Warn(e.ToString());
}
}
@@ -123,7 +119,7 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
public void LoadPrimitives(ILocalStorageReceiver receiver)
{
IObjectSet result = db.Get(typeof(PrimData));
- OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count);
+ MainLog.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count);
foreach (PrimData prim in result)
{
receiver.PrimFromStorage(prim);
@@ -132,13 +128,13 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
public float[] LoadWorld()
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Loading world....");
+ MainLog.Instance.Verbose("LoadWorld() - Loading world....");
float[] heightmap = null;
- OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");
+ MainLog.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");
IObjectSet world_result = db.Get(typeof(MapStorage));
if (world_result.Count > 0)
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");
+ MainLog.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");
MapStorage map = (MapStorage)world_result.Next();
//blank.LandMap = map.Map;
heightmap = map.Map;
@@ -151,7 +147,7 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
IObjectSet world_result = db.Get(typeof(MapStorage));
if (world_result.Count > 0)
{
- OpenSim.Framework.Console.MainLog.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");
+ MainLog.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");
MapStorage map = (MapStorage)world_result.Next();
db.Delete(map);
}
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
index 22f3392..ec82d02 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
@@ -25,10 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-
namespace OpenSim.Region.Storage.LocalStorageDb4o
{
public class MapStorage
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
index dcbe639..6e6768c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
@@ -25,13 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Db4objects.Db4o;
using Db4objects.Db4o.Query;
using libsecondlife;
-using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
namespace OpenSim.Region.Storage.LocalStorageDb4o
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
index 23de6dd..eb309cb 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
@@ -25,13 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Db4objects.Db4o;
using Db4objects.Db4o.Query;
using libsecondlife;
-using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
namespace OpenSim.Region.Storage.LocalStorageDb4o
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index 80158d5..ea9cda8 100644
--- a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
@@ -26,9 +26,7 @@
*
*/
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index b407be4..9900a98 100644
--- a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -30,10 +30,10 @@
// A bad idea, but the IRC people told me to!
using System;
-using System.Collections.Generic;
using System.Data;
using System.Data.SQLite;
using libsecondlife;
+using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
@@ -54,8 +54,8 @@ namespace OpenSim.Region.Storage.LocalStorageSQLite
catch (Exception e)
{
db.Close();
- OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");
- OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+ MainLog.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");
+ MainLog.Instance.Warn(e.ToString());
}
}
@@ -117,8 +117,8 @@ namespace OpenSim.Region.Storage.LocalStorageSQLite
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");
- OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+ MainLog.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");
+ MainLog.Instance.Warn(e.ToString());
}
cmd.Dispose();
@@ -144,8 +144,8 @@ namespace OpenSim.Region.Storage.LocalStorageSQLite
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");
- OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
+ MainLog.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");
+ MainLog.Instance.Warn(e.ToString());
}
cmd.Dispose();
diff --git a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
index 7d10ae3..9c721d1 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs
@@ -26,9 +26,7 @@
*
*/
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 0f450c3..6c9ec26 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -27,8 +27,9 @@
*/
using System;
using System.Collections.Generic;
-using System.Text;
using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
using libTerrain;
using OpenJPEGNet;
@@ -421,9 +422,9 @@ namespace OpenSim.Region.Terrain
/// The filename of the double array to import
public void loadFromFileF64(string filename)
{
- System.IO.FileInfo file = new System.IO.FileInfo(filename);
- System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read);
- System.IO.BinaryReader bs = new System.IO.BinaryReader(s);
+ FileInfo file = new FileInfo(filename);
+ FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+ BinaryReader bs = new BinaryReader(s);
int x, y;
for (x = 0; x < w; x++)
{
@@ -446,9 +447,9 @@ namespace OpenSim.Region.Terrain
/// The filename of the float array to import
public void loadFromFileF32(string filename)
{
- System.IO.FileInfo file = new System.IO.FileInfo(filename);
- System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read);
- System.IO.BinaryReader bs = new System.IO.BinaryReader(s);
+ FileInfo file = new FileInfo(filename);
+ FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+ BinaryReader bs = new BinaryReader(s);
int x, y;
for (x = 0; x < w; x++)
{
@@ -471,9 +472,9 @@ namespace OpenSim.Region.Terrain
/// A path to the .RAW format
public void loadFromFileSLRAW(string filename)
{
- System.IO.FileInfo file = new System.IO.FileInfo(filename);
- System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read);
- System.IO.BinaryReader bs = new System.IO.BinaryReader(s);
+ FileInfo file = new FileInfo(filename);
+ FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+ BinaryReader bs = new BinaryReader(s);
int x, y;
for (x = 0; x < w; x++)
{
@@ -496,9 +497,9 @@ namespace OpenSim.Region.Terrain
/// The desired output filename
public void writeToFileF64(string filename)
{
- System.IO.FileInfo file = new System.IO.FileInfo(filename);
- System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write);
- System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s);
+ FileInfo file = new FileInfo(filename);
+ FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
+ BinaryWriter bs = new BinaryWriter(s);
int x, y;
for (x = 0; x < w; x++)
@@ -519,9 +520,9 @@ namespace OpenSim.Region.Terrain
/// The desired output filename
public void writeToFileF32(string filename)
{
- System.IO.FileInfo file = new System.IO.FileInfo(filename);
- System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write);
- System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s);
+ FileInfo file = new FileInfo(filename);
+ FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
+ BinaryWriter bs = new BinaryWriter(s);
int x, y;
for (x = 0; x < w; x++)
@@ -543,9 +544,9 @@ namespace OpenSim.Region.Terrain
/// Filename to write to
public void writeToFileRAW(string filename)
{
- System.IO.FileInfo file = new System.IO.FileInfo(filename);
- System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write);
- System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s);
+ FileInfo file = new FileInfo(filename);
+ FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
+ BinaryWriter bs = new BinaryWriter(s);
int x, y;
@@ -608,9 +609,9 @@ namespace OpenSim.Region.Terrain
/// The filename to output to
public void writeToFileHiRAW(string filename)
{
- System.IO.FileInfo file = new System.IO.FileInfo(filename);
- System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write);
- System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s);
+ FileInfo file = new FileInfo(filename);
+ FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
+ BinaryWriter bs = new BinaryWriter(s);
// Generate a smegging big lookup table to speed the operation up (it needs it)
double[] lookupTable = new double[65536];
@@ -872,7 +873,7 @@ namespace OpenSim.Region.Terrain
}
}
- bmp.Save(filename, System.Drawing.Imaging.ImageFormat.Png);
+ bmp.Save(filename, ImageFormat.Png);
}
catch (Exception e)
{
@@ -913,7 +914,7 @@ namespace OpenSim.Region.Terrain
}
//bmp.Save(filename, System.Drawing.Imaging.ImageFormat.Png);
- imageData = OpenJPEGNet.OpenJPEG.EncodeFromImage(bmp, "map");
+ imageData = OpenJPEG.EncodeFromImage(bmp, "map");
}
catch (Exception e)
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
index e0ae586..feb9327 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
@@ -26,16 +26,12 @@
*
*/
using System;
-using System.Collections.Generic;
-using System.Text;
-
using System.CodeDom.Compiler;
-using System.CodeDom;
+using System.Collections.Generic;
+using libTerrain;
using Microsoft.CSharp;
using Microsoft.JScript;
-using libTerrain;
-
namespace OpenSim.Region.Terrain
{
public interface ITerrainFilter
--
cgit v1.1