aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorlbsa712007-07-03 14:37:29 +0000
committerlbsa712007-07-03 14:37:29 +0000
commit9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch)
tree8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region
parent* Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff)
downloadopensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/Application.cs8
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs52
-rw-r--r--OpenSim/Region/Application/VersionInfo.cs2
-rw-r--r--OpenSim/Region/Caches/AssetCache.cs17
-rw-r--r--OpenSim/Region/Caches/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Capabilities/Caps.cs11
-rw-r--r--OpenSim/Region/Capabilities/LLSDArray.cs3
-rw-r--r--OpenSim/Region/Capabilities/LLSDCapEvent.cs4
-rw-r--r--OpenSim/Region/Capabilities/LLSDCapsDetails.cs4
-rw-r--r--OpenSim/Region/Capabilities/LLSDEmpty.cs4
-rw-r--r--OpenSim/Region/Capabilities/LLSDHelpers.cs9
-rw-r--r--OpenSim/Region/Capabilities/LLSDMapLayer.cs4
-rw-r--r--OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs4
-rw-r--r--OpenSim/Region/Capabilities/LLSDMapRequest.cs4
-rw-r--r--OpenSim/Region/Capabilities/LLSDTest.cs4
-rw-r--r--OpenSim/Region/Capabilities/LLSDType.cs2
-rw-r--r--OpenSim/Region/Capabilities/LLSDUploadReply.cs5
-rw-r--r--OpenSim/Region/ClientStack/Assets/InventoryCache.cs17
-rw-r--r--OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs6
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs44
-rw-r--r--OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs7
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs23
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs16
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs30
-rw-r--r--OpenSim/Region/ClientStack/ClientViewBase.cs23
-rw-r--r--OpenSim/Region/ClientStack/PacketServer.cs8
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs23
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs19
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs9
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs10
-rw-r--r--OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs26
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs11
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs33
-rw-r--r--OpenSim/Region/Environment/ParcelManager.cs13
-rw-r--r--OpenSim/Region/Environment/RegionManager.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Entity.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityBase.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/Primitive.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/PrimitiveOld.cs13
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs70
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs17
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs17
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs11
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs11
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/Script.cs9
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs14
-rw-r--r--OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs9
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs16
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs25
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/GridInterfaces/Local/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs28
-rw-r--r--OpenSim/Region/GridInterfaces/Remote/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs10
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs6
-rw-r--r--OpenSim/Region/Physics/Manager/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs12
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsManager.cs8
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs11
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsVector.cs4
-rw-r--r--OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs17
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs9
-rw-r--r--OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs9
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs24
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs4
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs5
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs5
-rw-r--r--OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs14
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs49
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs8
88 files changed, 366 insertions, 641 deletions
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Console; 29using OpenSim.Framework.Console;
32using OpenSim.Region.ClientStack; 30using OpenSim.Region.Environment.Scenes;
33 31
34namespace OpenSim 32namespace OpenSim
35{ 33{
@@ -109,13 +107,13 @@ namespace OpenSim
109 sim.m_sandbox = sandBoxMode; 107 sim.m_sandbox = sandBoxMode;
110 sim.user_accounts = userAccounts; 108 sim.user_accounts = userAccounts;
111 sim.gridLocalAsset = gridLocalAsset; 109 sim.gridLocalAsset = gridLocalAsset;
112 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying; 110 ScenePresence.PhysicsEngineFlying = allowFlying;
113 111
114 sim.StartUp(); 112 sim.StartUp();
115 113
116 while (true) 114 while (true)
117 { 115 {
118 OpenSim.Framework.Console.MainLog.Instance.MainLogPrompt(); 116 MainLog.Instance.MainLogPrompt();
119 } 117 }
120 } 118 }
121 } 119 }
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 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Text;
31using System.IO; 30using System.IO;
32using System.Threading;
33using System.Net;
34using System.Net.Sockets;
35using System.Timers;
36using System.Reflection;
37using System.Collections;
38using System.Collections.Generic;
39using libsecondlife; 31using libsecondlife;
40using libsecondlife.Packets;
41using OpenSim.Region.Environment;
42using OpenSim.Region.Environment.Scenes;
43using OpenSim.Region.Terrain;
44using OpenSim.Framework.Interfaces;
45using OpenSim.Framework.Data;
46
47using OpenSim.Framework.Types;
48using OpenSim.Framework;
49using OpenSim.Assets; 32using OpenSim.Assets;
50using OpenSim.Region.Caches; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
51using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
52using OpenSim.Physics.Manager; 36using OpenSim.Framework.Data;
53using Nwc.XmlRpc; 37using OpenSim.Framework.Interfaces;
54using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Types;
55using OpenSim.GenericConfig; 40using OpenSim.GenericConfig;
56using OpenSim.Framework.Communications; 41using OpenSim.Physics.Manager;
57using OpenSim.Region.Communications.OGS1; 42using OpenSim.Region.Caches;
58using OpenSim.Region.Communications.Local;
59
60using OpenSim.Region.ClientStack; 43using OpenSim.Region.ClientStack;
44using OpenSim.Region.Communications.Local;
45using OpenSim.Region.Communications.OGS1;
46using OpenSim.Region.Environment.Scenes;
61 47
62namespace OpenSim 48namespace OpenSim
63{ 49{
@@ -96,7 +82,7 @@ namespace OpenSim
96 } 82 }
97 83
98 m_log = new LogBase(m_logFilename, "Region", this, m_silent); 84 m_log = new LogBase(m_logFilename, "Region", this, m_silent);
99 OpenSim.Framework.Console.MainLog.Instance = m_log; 85 MainLog.Instance = m_log;
100 86
101 m_log.Verbose( "Main.cs:Startup() - Loading configuration"); 87 m_log.Verbose( "Main.cs:Startup() - Loading configuration");
102 this.serversData.InitConfig(this.m_sandbox, this.localConfig); 88 this.serversData.InitConfig(this.m_sandbox, this.localConfig);
@@ -121,7 +107,7 @@ namespace OpenSim
121 107
122 startuptime = DateTime.Now; 108 startuptime = DateTime.Now;
123 109
124 this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); 110 this.physManager = new PhysicsManager();
125 this.physManager.LoadPlugins(); 111 this.physManager.LoadPlugins();
126 112
127 this.SetupHttpListener(); 113 this.SetupHttpListener();
@@ -187,12 +173,12 @@ namespace OpenSim
187 RegionInfo regionDat = new RegionInfo(); 173 RegionInfo regionDat = new RegionInfo();
188 AuthenticateSessionsBase authenBase; 174 AuthenticateSessionsBase authenBase;
189 175
190 string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions"); 176 string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
191 string[] configFiles = Directory.GetFiles(path, "*.xml"); 177 string[] configFiles = Directory.GetFiles(path, "*.xml");
192 178
193 if (configFiles.Length == 0) 179 if (configFiles.Length == 0)
194 { 180 {
195 string path2 = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "Regions"); 181 string path2 = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
196 string path3 = Path.Combine(path2, "default.xml"); 182 string path3 = Path.Combine(path2, "default.xml");
197 Console.WriteLine("Creating default region config file"); 183 Console.WriteLine("Creating default region config file");
198 //TODO create default region 184 //TODO create default region
@@ -361,23 +347,23 @@ namespace OpenSim
361 case "": 347 case "":
362 this.m_physicsEngine = "basicphysics"; 348 this.m_physicsEngine = "basicphysics";
363 configData.SetAttribute("PhysicsEngine", "basicphysics"); 349 configData.SetAttribute("PhysicsEngine", "basicphysics");
364 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false; 350 ScenePresence.PhysicsEngineFlying = false;
365 break; 351 break;
366 352
367 case "basicphysics": 353 case "basicphysics":
368 this.m_physicsEngine = "basicphysics"; 354 this.m_physicsEngine = "basicphysics";
369 configData.SetAttribute("PhysicsEngine", "basicphysics"); 355 configData.SetAttribute("PhysicsEngine", "basicphysics");
370 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false; 356 ScenePresence.PhysicsEngineFlying = false;
371 break; 357 break;
372 358
373 case "RealPhysX": 359 case "RealPhysX":
374 this.m_physicsEngine = "RealPhysX"; 360 this.m_physicsEngine = "RealPhysX";
375 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true; 361 ScenePresence.PhysicsEngineFlying = true;
376 break; 362 break;
377 363
378 case "OpenDynamicsEngine": 364 case "OpenDynamicsEngine":
379 this.m_physicsEngine = "OpenDynamicsEngine"; 365 this.m_physicsEngine = "OpenDynamicsEngine";
380 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true; 366 ScenePresence.PhysicsEngineFlying = true;
381 break; 367 break;
382 } 368 }
383 369
@@ -459,7 +445,7 @@ namespace OpenSim
459 m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); 445 m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
460 break; 446 break;
461 case "users": 447 case "users":
462 OpenSim.Region.Environment.Scenes.ScenePresence TempAv; 448 ScenePresence TempAv;
463 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")); 449 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"));
464 /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) 450 /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
465 { 451 {
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29
30namespace OpenSim 28namespace OpenSim
31{ 29{
32 /// <summary> 30 /// <summary>
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 @@
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Threading;
32using System.Reflection; 31using System.Reflection;
32using System.Threading;
33using libsecondlife; 33using libsecondlife;
34using libsecondlife.Packets; 34using libsecondlife.Packets;
35using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Utilities;
38 37
39namespace OpenSim.Region.Caches 38namespace OpenSim.Region.Caches
40{ 39{
@@ -45,8 +44,8 @@ namespace OpenSim.Region.Caches
45 /// </summary> 44 /// </summary>
46 public class AssetCache : IAssetReceiver 45 public class AssetCache : IAssetReceiver
47 { 46 {
48 public Dictionary<libsecondlife.LLUUID, AssetInfo> Assets; 47 public Dictionary<LLUUID, AssetInfo> Assets;
49 public Dictionary<libsecondlife.LLUUID, TextureImage> Textures; 48 public Dictionary<LLUUID, TextureImage> Textures;
50 49
51 public List<AssetRequest> AssetRequests = new List<AssetRequest>(); //assets ready to be sent to viewers 50 public List<AssetRequest> AssetRequests = new List<AssetRequest>(); //assets ready to be sent to viewers
52 public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent 51 public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent
@@ -67,8 +66,8 @@ namespace OpenSim.Region.Caches
67 Console.WriteLine("Creating Asset cache"); 66 Console.WriteLine("Creating Asset cache");
68 _assetServer = assetServer; 67 _assetServer = assetServer;
69 _assetServer.SetReceiver(this); 68 _assetServer.SetReceiver(this);
70 Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>(); 69 Assets = new Dictionary<LLUUID, AssetInfo>();
71 Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>(); 70 Textures = new Dictionary<LLUUID, TextureImage>();
72 this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); 71 this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
73 this._assetCacheThread.IsBackground = true; 72 this._assetCacheThread.IsBackground = true;
74 this._assetCacheThread.Start(); 73 this._assetCacheThread.Start();
@@ -81,8 +80,8 @@ namespace OpenSim.Region.Caches
81 _assetServer = this.LoadAssetDll(assetServerDLLName); 80 _assetServer = this.LoadAssetDll(assetServerDLLName);
82 _assetServer.SetServerInfo(assetServerURL, assetServerKey); 81 _assetServer.SetServerInfo(assetServerURL, assetServerKey);
83 _assetServer.SetReceiver(this); 82 _assetServer.SetReceiver(this);
84 Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>(); 83 Assets = new Dictionary<LLUUID, AssetInfo>();
85 Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>(); 84 Textures = new Dictionary<LLUUID, TextureImage>();
86 this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager)); 85 this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
87 this._assetCacheThread.IsBackground = true; 86 this._assetCacheThread.IsBackground = true;
88 this._assetCacheThread.Start(); 87 this._assetCacheThread.Start();
@@ -216,7 +215,7 @@ namespace OpenSim.Region.Caches
216 /// Event handler, called by a TextureSender object to say that texture has been sent 215 /// Event handler, called by a TextureSender object to say that texture has been sent
217 /// </summary> 216 /// </summary>
218 /// <param name="sender"></param> 217 /// <param name="sender"></param>
219 public void TextureSent(AssetCache.TextureSender sender) 218 public void TextureSent(TextureSender sender)
220 { 219 {
221 if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID)) 220 if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
222 { 221 {
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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using System.IO; 32using libsecondlife;
33using System.Xml;
34using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
35using OpenSim.Framework;
36using OpenSim.Framework.Utilities;
37using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
35using OpenSim.Framework.Utilities;
38using OpenSim.Region.Caches; 36using OpenSim.Region.Caches;
39using libsecondlife;
40 37
41namespace OpenSim.Region.Capabilities 38namespace OpenSim.Region.Capabilities
42{ 39{
@@ -126,7 +123,7 @@ namespace OpenSim.Region.Capabilities
126 /// <returns></returns> 123 /// <returns></returns>
127 public string MapLayer(string request, string path, string param) 124 public string MapLayer(string request, string path, string param)
128 { 125 {
129 Encoding _enc = System.Text.Encoding.UTF8; 126 Encoding _enc = Encoding.UTF8;
130 Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request)); 127 Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
131 LLSDMapRequest mapReq = new LLSDMapRequest(); 128 LLSDMapRequest mapReq = new LLSDMapRequest();
132 LLSDHelpers.DeserialiseLLSDMap(hash, mapReq ); 129 LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
@@ -252,7 +249,7 @@ namespace OpenSim.Region.Capabilities
252 249
253 public string uploaderCaps(string request, string path, string param) 250 public string uploaderCaps(string request, string path, string param)
254 { 251 {
255 Encoding _enc = System.Text.Encoding.UTF8; 252 Encoding _enc = Encoding.UTF8;
256 byte[] data = _enc.GetBytes(request); 253 byte[] data = _enc.GetBytes(request);
257 //Console.WriteLine("recieved upload " + Util.FieldToString(data)); 254 //Console.WriteLine("recieved upload " + Util.FieldToString(data));
258 LLUUID inv = this.inventoryItemID; 255 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32 29
33namespace OpenSim.Region.Capabilities 30namespace OpenSim.Region.Capabilities
34{ 31{
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Region.Capabilities 28namespace OpenSim.Region.Capabilities
33{ 29{
34 [LLSDType("MAP")] 30 [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 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Region.Capabilities 1namespace OpenSim.Region.Capabilities
6{ 2{
7 [LLSDType("MAP")] 3 [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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Region.Capabilities 28namespace OpenSim.Region.Capabilities
33{ 29{
34 [LLSDType("MAP")] 30 [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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using System.IO; 30using System.IO;
31using System.Reflection;
33using System.Xml; 32using System.Xml;
34using libsecondlife; 33using libsecondlife;
35 34
@@ -43,7 +42,7 @@ namespace OpenSim.Region.Capabilities
43 XmlTextWriter writer = new XmlTextWriter(sw); 42 XmlTextWriter writer = new XmlTextWriter(sw);
44 writer.Formatting = Formatting.None; 43 writer.Formatting = Formatting.None;
45 writer.WriteStartElement(String.Empty, "llsd", String.Empty); 44 writer.WriteStartElement(String.Empty, "llsd", String.Empty);
46 LLSDHelpers.SerializeLLSDType(writer, obj); 45 SerializeLLSDType(writer, obj);
47 writer.WriteEndElement(); 46 writer.WriteEndElement();
48 writer.Close(); 47 writer.Close();
49 return sw.ToString(); 48 return sw.ToString();
@@ -59,7 +58,7 @@ namespace OpenSim.Region.Capabilities
59 { 58 {
60 case "MAP": 59 case "MAP":
61 writer.WriteStartElement(String.Empty, "map", String.Empty); 60 writer.WriteStartElement(String.Empty, "map", String.Empty);
62 System.Reflection.FieldInfo[] fields = myType.GetFields(); 61 FieldInfo[] fields = myType.GetFields();
63 for (int i = 0; i < fields.Length; i++) 62 for (int i = 0; i < fields.Length; i++)
64 { 63 {
65 object fieldValue = fields[i].GetValue(obj); 64 object fieldValue = fields[i].GetValue(obj);
@@ -115,7 +114,7 @@ namespace OpenSim.Region.Capabilities
115 IDictionaryEnumerator enumerator = llsd.GetEnumerator(); 114 IDictionaryEnumerator enumerator = llsd.GetEnumerator();
116 while (enumerator.MoveNext()) 115 while (enumerator.MoveNext())
117 { 116 {
118 System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key); 117 FieldInfo field = myType.GetField((string)enumerator.Key);
119 if (field != null) 118 if (field != null)
120 { 119 {
121 if (enumerator.Value is Hashtable) 120 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using libsecondlife; 28using libsecondlife;
33 29
34namespace OpenSim.Region.Capabilities 30namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Region.Capabilities 28namespace OpenSim.Region.Capabilities
33{ 29{
34 [LLSDType("MAP")] 30 [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 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Region.Capabilities 1namespace OpenSim.Region.Capabilities
6{ 2{
7 [LLSDType("MAP")] 3 [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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Region.Capabilities 28namespace OpenSim.Region.Capabilities
33{ 29{
34 [LLSDType("MAP")] 30 [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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Region.Capabilities 30namespace OpenSim.Region.Capabilities
33{ 31{
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using libsecondlife; 28using libsecondlife;
29
33namespace OpenSim.Region.Capabilities 30namespace OpenSim.Region.Capabilities
34{ 31{
35 [LLSDType("MAP")] 32 [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 @@
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text;
31using libsecondlife; 32using libsecondlife;
32using OpenSim;
33using libsecondlife.Packets; 33using libsecondlife.Packets;
34//using OpenSim.GridServers; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Inventory; 35using OpenSim.Framework.Inventory;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Interfaces;
38using OpenSim.Region.ClientStack; 37using OpenSim.Region.ClientStack;
39 38
40namespace OpenSim.Assets 39namespace OpenSim.Assets
@@ -46,7 +45,7 @@ namespace OpenSim.Assets
46 { 45 {
47 private Dictionary<LLUUID, AgentInventory> _agentsInventory; 46 private Dictionary<LLUUID, AgentInventory> _agentsInventory;
48 private List<UserServerRequest> _serverRequests; //list of requests made to user server. 47 private List<UserServerRequest> _serverRequests; //list of requests made to user server.
49 private System.Text.Encoding _enc = System.Text.Encoding.ASCII; 48 private Encoding _enc = Encoding.ASCII;
50 private const uint FULL_MASK_PERMISSIONS = 2147483647; 49 private const uint FULL_MASK_PERMISSIONS = 2147483647;
51 50
52 public InventoryCache() 51 public InventoryCache()
@@ -127,7 +126,7 @@ namespace OpenSim.Assets
127 return res; 126 return res;
128 } 127 }
129 128
130 public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset) 129 public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, AssetBase asset)
131 { 130 {
132 LLUUID newItem = null; 131 LLUUID newItem = null;
133 if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) 132 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
@@ -163,7 +162,7 @@ namespace OpenSim.Assets
163 return res; 162 return res;
164 } 163 }
165 164
166 public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset) 165 public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, AssetBase asset)
167 { 166 {
168 if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) 167 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
169 { 168 {
@@ -238,7 +237,7 @@ namespace OpenSim.Assets
238 Descend.ItemData[i].SalePrice = 100; 237 Descend.ItemData[i].SalePrice = 100;
239 Descend.ItemData[i].SaleType = 0; 238 Descend.ItemData[i].SaleType = 0;
240 Descend.ItemData[i].Type = Item.Type; 239 Descend.ItemData[i].Type = Item.Type;
241 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); 240 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);
242 } 241 }
243 242
244 userInfo.OutPacket(Descend); 243 userInfo.OutPacket(Descend);
@@ -286,7 +285,7 @@ namespace OpenSim.Assets
286 InventoryReply.InventoryData[0].SalePrice = 100; 285 InventoryReply.InventoryData[0].SalePrice = 100;
287 InventoryReply.InventoryData[0].SaleType = 0; 286 InventoryReply.InventoryData[0].SaleType = 0;
288 InventoryReply.InventoryData[0].Type = Item.Type; 287 InventoryReply.InventoryData[0].Type = Item.Type;
289 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); 288 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);
290 userInfo.OutPacket(InventoryReply); 289 userInfo.OutPacket(InventoryReply);
291 } 290 }
292 } 291 }
@@ -320,7 +319,7 @@ namespace OpenSim.Assets
320 InventoryReply.InventoryData[0].SalePrice = 100; 319 InventoryReply.InventoryData[0].SalePrice = 100;
321 InventoryReply.InventoryData[0].SaleType = 0; 320 InventoryReply.InventoryData[0].SaleType = 0;
322 InventoryReply.InventoryData[0].Type = Item.Type; 321 InventoryReply.InventoryData[0].Type = Item.Type;
323 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); 322 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);
324 323
325 remoteClient.OutPacket(InventoryReply); 324 remoteClient.OutPacket(InventoryReply);
326 } 325 }
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Net;
32using System.Net.Sockets; 28using System.Net.Sockets;
33using libsecondlife;
34
35 29
36namespace OpenSim.Region.ClientStack 30namespace OpenSim.Region.ClientStack
37{ 31{
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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net;
30using System.Text; 31using System.Text;
31using OpenSim.Framework.Interfaces; 32using Axiom.MathLib;
32using OpenSim.Framework.Inventory;
33using OpenSim.Framework.Types;
34
35using libsecondlife; 33using libsecondlife;
36using libsecondlife.Packets; 34using libsecondlife.Packets;
37using System.Net; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types;
38 38
39namespace OpenSim.Region.ClientStack 39namespace OpenSim.Region.ClientStack
40{ 40{
@@ -137,7 +137,7 @@ namespace OpenSim.Region.ClientStack
137 /// <param name="regionInfo"></param> 137 /// <param name="regionInfo"></param>
138 public void SendRegionHandshake(RegionInfo regionInfo) 138 public void SendRegionHandshake(RegionInfo regionInfo)
139 { 139 {
140 System.Text.Encoding _enc = System.Text.Encoding.ASCII; 140 Encoding _enc = Encoding.ASCII;
141 RegionHandshakePacket handshake = new RegionHandshakePacket(); 141 RegionHandshakePacket handshake = new RegionHandshakePacket();
142 142
143 handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor; 143 handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;
@@ -219,8 +219,8 @@ namespace OpenSim.Region.ClientStack
219 /// <param name="fromAgentID"></param> 219 /// <param name="fromAgentID"></param>
220 public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) 220 public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
221 { 221 {
222 System.Text.Encoding enc = System.Text.Encoding.ASCII; 222 Encoding enc = Encoding.ASCII;
223 libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket(); 223 ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
224 reply.ChatData.Audible = 1; 224 reply.ChatData.Audible = 1;
225 reply.ChatData.Message = message; 225 reply.ChatData.Message = message;
226 reply.ChatData.ChatType = type; 226 reply.ChatData.ChatType = type;
@@ -260,7 +260,7 @@ namespace OpenSim.Region.ClientStack
260 } 260 }
261 catch (Exception e) 261 catch (Exception e)
262 { 262 {
263 OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString()); 263 MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
264 } 264 }
265 } 265 }
266 266
@@ -286,7 +286,7 @@ namespace OpenSim.Region.ClientStack
286 } 286 }
287 catch (Exception e) 287 catch (Exception e)
288 { 288 {
289 OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString()); 289 MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
290 } 290 }
291 } 291 }
292 292
@@ -298,7 +298,7 @@ namespace OpenSim.Region.ClientStack
298 /// <param name="neighbourPort"></param> 298 /// <param name="neighbourPort"></param>
299 public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint ) 299 public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint )
300 { 300 {
301 System.Net.IPAddress neighbourIP = neighbourEndPoint.Address; 301 IPAddress neighbourIP = neighbourEndPoint.Address;
302 ushort neighbourPort = (ushort) neighbourEndPoint.Port; 302 ushort neighbourPort = (ushort) neighbourEndPoint.Port;
303 303
304 EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket(); 304 EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
@@ -343,7 +343,7 @@ namespace OpenSim.Region.ClientStack
343 newSimPack.Info = new CrossedRegionPacket.InfoBlock(); 343 newSimPack.Info = new CrossedRegionPacket.InfoBlock();
344 newSimPack.Info.Position = pos; 344 newSimPack.Info.Position = pos;
345 newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!! 345 newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
346 newSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock(); 346 newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock();
347 newSimPack.RegionData.RegionHandle = newRegionHandle; 347 newSimPack.RegionData.RegionHandle = newRegionHandle;
348 byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes(); 348 byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes();
349 newSimPack.RegionData.SimIP = (uint)byteIP[3] << 24; 349 newSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
@@ -359,7 +359,7 @@ namespace OpenSim.Region.ClientStack
359 359
360 public void SendMapBlock(List<MapBlockData> mapBlocks) 360 public void SendMapBlock(List<MapBlockData> mapBlocks)
361 { 361 {
362 System.Text.Encoding _enc = System.Text.Encoding.ASCII; 362 Encoding _enc = Encoding.ASCII;
363 363
364 MapBlockReplyPacket mapReply = new MapBlockReplyPacket(); 364 MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
365 mapReply.AgentData.AgentID = this.AgentID; 365 mapReply.AgentData.AgentID = this.AgentID;
@@ -514,20 +514,20 @@ namespace OpenSim.Region.ClientStack
514 /// <param name="Pos"></param> 514 /// <param name="Pos"></param>
515 public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry) 515 public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry)
516 { 516 {
517 System.Text.Encoding _enc = System.Text.Encoding.ASCII; 517 Encoding _enc = Encoding.ASCII;
518 //send a objectupdate packet with information about the clients avatar 518 //send a objectupdate packet with information about the clients avatar
519 519
520 ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); 520 ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
521 objupdate.RegionData.RegionHandle = regionHandle; 521 objupdate.RegionData.RegionHandle = regionHandle;
522 objupdate.RegionData.TimeDilation = 64096; 522 objupdate.RegionData.TimeDilation = 64096;
523 objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; 523 objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
524 objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry); 524 objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry);
525 //give this avatar object a local id and assign the user a name 525 //give this avatar object a local id and assign the user a name
526 526
527 objupdate.ObjectData[0].ID = avatarLocalID; 527 objupdate.ObjectData[0].ID = avatarLocalID;
528 objupdate.ObjectData[0].FullID = avatarID; 528 objupdate.ObjectData[0].FullID = avatarID;
529 objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + " \0"); 529 objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + " \0");
530 libsecondlife.LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z); 530 LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);
531 byte[] pb = pos2.GetBytes(); 531 byte[] pb = pos2.GetBytes();
532 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length); 532 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
533 533
@@ -716,9 +716,9 @@ namespace OpenSim.Region.ClientStack
716 ushort InternVelocityX; 716 ushort InternVelocityX;
717 ushort InternVelocityY; 717 ushort InternVelocityY;
718 ushort InternVelocityZ; 718 ushort InternVelocityZ;
719 Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0); 719 Vector3 internDirec = new Vector3(0, 0, 0);
720 720
721 internDirec = new Axiom.MathLib.Vector3(velocity.X, velocity.Y, velocity.Z); 721 internDirec = new Vector3(velocity.X, velocity.Y, velocity.Z);
722 722
723 internDirec = internDirec / 128.0f; 723 internDirec = internDirec / 128.0f;
724 internDirec.x += 1; 724 internDirec.x += 1;
@@ -961,7 +961,7 @@ namespace OpenSim.Region.ClientStack
961 /// <returns></returns> 961 /// <returns></returns>
962 protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry) 962 protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
963 { 963 {
964 libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i); 964 ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
965 965
966 SetDefaultAvatarPacketValues(ref objdata); 966 SetDefaultAvatarPacketValues(ref objdata);
967 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24); 967 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
@@ -977,12 +977,12 @@ namespace OpenSim.Region.ClientStack
977 { 977 {
978 objdata.TextureEntry = textureEntry; 978 objdata.TextureEntry = textureEntry;
979 } 979 }
980 System.Text.Encoding enc = System.Text.Encoding.ASCII; 980 Encoding enc = Encoding.ASCII;
981 libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16); 981 LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
982 pos.X = 100f; 982 pos.X = 100f;
983 objdata.ID = 8880000; 983 objdata.ID = 8880000;
984 objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0"); 984 objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
985 libsecondlife.LLVector3 pos2 = new LLVector3(100f, 100f, 23f); 985 LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
986 //objdata.FullID=user.AgentID; 986 //objdata.FullID=user.AgentID;
987 byte[] pb = pos.GetBytes(); 987 byte[] pb = pos.GetBytes();
988 Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length); 988 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using libsecondlife;
31using libsecondlife.Packets;
31using OpenSim.Assets; 32using OpenSim.Assets;
32using OpenSim.Framework.Types;
33using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Types;
34using OpenSim.Framework.Utilities; 35using OpenSim.Framework.Utilities;
35using OpenSim.Region.Caches; 36using OpenSim.Region.Caches;
36using libsecondlife;
37using libsecondlife.Packets;
38 37
39namespace OpenSim.Region.ClientStack 38namespace OpenSim.Region.ClientStack
40{ 39{
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using libsecondlife; 28using libsecondlife;
32using libsecondlife.Packets; 29using libsecondlife.Packets;
33using Nwc.XmlRpc; 30using OpenSim.Framework.Console;
34using System.Net;
35using System.Net.Sockets;
36using System.IO;
37using System.Threading;
38using System.Timers;
39using OpenSim.Framework.Interfaces;
40using OpenSim.Framework.Types;
41using OpenSim.Framework.Inventory;
42using OpenSim.Framework.Utilities;
43using OpenSim.Assets;
44 31
45namespace OpenSim.Region.ClientStack 32namespace OpenSim.Region.ClientStack
46{ 33{
@@ -55,7 +42,7 @@ namespace OpenSim.Region.ClientStack
55 42
56 protected virtual bool Logout(ClientView simClient, Packet packet) 43 protected virtual bool Logout(ClientView simClient, Packet packet)
57 { 44 {
58 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request"); 45 MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
59 //send reply to let the client logout 46 //send reply to let the client logout
60 LogoutReplyPacket logReply = new LogoutReplyPacket(); 47 LogoutReplyPacket logReply = new LogoutReplyPacket();
61 logReply.AgentData.AgentID = this.AgentID; 48 logReply.AgentData.AgentID = this.AgentID;
@@ -120,7 +107,7 @@ namespace OpenSim.Region.ClientStack
120 { 107 {
121 if (OnUpdatePrimPosition != null) 108 if (OnUpdatePrimPosition != null)
122 { 109 {
123 libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); 110 LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
124 OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this); 111 OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
125 } 112 }
126 //should update stored position of the prim 113 //should update stored position of the prim
@@ -129,7 +116,7 @@ namespace OpenSim.Region.ClientStack
129 { 116 {
130 if (OnUpdatePrimRotation != null) 117 if (OnUpdatePrimRotation != null)
131 { 118 {
132 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true); 119 LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
133 OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this); 120 OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
134 } 121 }
135 } 122 }
@@ -137,7 +124,7 @@ namespace OpenSim.Region.ClientStack
137 { 124 {
138 if (OnUpdatePrimScale != null) 125 if (OnUpdatePrimScale != null)
139 { 126 {
140 libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12); 127 LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
141 OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this); 128 OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
142 } 129 }
143 } 130 }
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 31using libsecondlife;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33using Nwc.XmlRpc;
34using System.Net;
35using System.Net.Sockets;
36using System.IO;
37using System.Threading;
38using System.Timers;
39using OpenSim.Framework.Interfaces;
40using OpenSim.Framework.Types;
41using OpenSim.Framework.Inventory; 33using OpenSim.Framework.Inventory;
34using OpenSim.Framework.Types;
42using OpenSim.Framework.Utilities; 35using OpenSim.Framework.Utilities;
43using OpenSim.Assets;
44 36
45namespace OpenSim.Region.ClientStack 37namespace OpenSim.Region.ClientStack
46{ 38{
@@ -64,7 +56,7 @@ namespace OpenSim.Region.ClientStack
64 } 56 }
65 else 57 else
66 { 58 {
67 System.Text.Encoding _enc = System.Text.Encoding.ASCII; 59 Encoding _enc = Encoding.ASCII;
68 60
69 switch (Pack.Type) 61 switch (Pack.Type)
70 { 62 {
@@ -452,7 +444,7 @@ namespace OpenSim.Region.ClientStack
452 this.OutPacket(tpStart); 444 this.OutPacket(tpStart);
453 445
454 TeleportProgressPacket tpProgress = new TeleportProgressPacket(); 446 TeleportProgressPacket tpProgress = new TeleportProgressPacket();
455 tpProgress.Info.Message = (new System.Text.ASCIIEncoding()).GetBytes("sending_landmark"); 447 tpProgress.Info.Message = (new ASCIIEncoding()).GetBytes("sending_landmark");
456 tpProgress.Info.TeleportFlags = 8; 448 tpProgress.Info.TeleportFlags = 8;
457 tpProgress.AgentData.AgentID = tpReq.Info.AgentID; 449 tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
458 this.OutPacket(tpProgress); 450 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections;
30using System.Collections.Generic; 28using System.Collections.Generic;
31using libsecondlife;
32using libsecondlife.Packets;
33using Nwc.XmlRpc;
34using System.Net; 29using System.Net;
35using System.Net.Sockets; 30using System.Text;
36using System.IO;
37using System.Threading; 31using System.Threading;
38using System.Timers; 32using System.Timers;
33using libsecondlife;
34using libsecondlife.Packets;
35using OpenSim.Assets;
39using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console;
40using OpenSim.Framework.Interfaces; 38using OpenSim.Framework.Interfaces;
41using OpenSim.Framework.Types;
42using OpenSim.Framework.Inventory; 39using OpenSim.Framework.Inventory;
40using OpenSim.Framework.Types;
43using OpenSim.Framework.Utilities; 41using OpenSim.Framework.Utilities;
44using OpenSim.Assets;
45using OpenSim.Region.Caches; 42using OpenSim.Region.Caches;
43using Timer=System.Timers.Timer;
46 44
47namespace OpenSim.Region.ClientStack 45namespace OpenSim.Region.ClientStack
48{ 46{
@@ -79,7 +77,7 @@ namespace OpenSim.Region.ClientStack
79 private int cachedtextureserial = 0; 77 private int cachedtextureserial = 0;
80 private RegionInfo m_regionData; 78 private RegionInfo m_regionData;
81 protected AuthenticateSessionsBase m_authenticateSessionsHandler; 79 protected AuthenticateSessionsBase m_authenticateSessionsHandler;
82 private System.Text.Encoding enc = System.Text.Encoding.ASCII; 80 private Encoding enc = Encoding.ASCII;
83 81
84 public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions ) 82 public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
85 { 83 {
@@ -91,7 +89,7 @@ namespace OpenSim.Region.ClientStack
91 m_inventoryCache = inventoryCache; 89 m_inventoryCache = inventoryCache;
92 m_authenticateSessionsHandler = authenSessions; 90 m_authenticateSessionsHandler = authenSessions;
93 91
94 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request"); 92 MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
95 cirpack = initialcirpack; 93 cirpack = initialcirpack;
96 userEP = remoteEP; 94 userEP = remoteEP;
97 95
@@ -100,7 +98,7 @@ namespace OpenSim.Region.ClientStack
100 PacketQueue = new BlockingQueue<QueItem>(); 98 PacketQueue = new BlockingQueue<QueItem>();
101 99
102 this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache); 100 this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
103 AckTimer = new System.Timers.Timer(500); 101 AckTimer = new Timer(500);
104 AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed); 102 AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
105 AckTimer.Start(); 103 AckTimer.Start();
106 104
@@ -189,7 +187,7 @@ namespace OpenSim.Region.ClientStack
189 187
190 protected virtual void ClientLoop() 188 protected virtual void ClientLoop()
191 { 189 {
192 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop"); 190 MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");
193 while (true) 191 while (true)
194 { 192 {
195 QueItem nextPacket = PacketQueue.Dequeue(); 193 QueItem nextPacket = PacketQueue.Dequeue();
@@ -211,7 +209,7 @@ namespace OpenSim.Region.ClientStack
211 209
212 protected virtual void InitNewClient() 210 protected virtual void InitNewClient()
213 { 211 {
214 OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); 212 MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
215 this.m_world.AddNewClient(this, false); 213 this.m_world.AddNewClient(this, false);
216 } 214 }
217 215
@@ -222,12 +220,12 @@ namespace OpenSim.Region.ClientStack
222 if (!sessionInfo.Authorised) 220 if (!sessionInfo.Authorised)
223 { 221 {
224 //session/circuit not authorised 222 //session/circuit not authorised
225 OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); 223 MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
226 ClientThread.Abort(); 224 ClientThread.Abort();
227 } 225 }
228 else 226 else
229 { 227 {
230 OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); 228 MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
231 //session is authorised 229 //session is authorised
232 this.AgentID = cirpack.CircuitCode.ID; 230 this.AgentID = cirpack.CircuitCode.ID;
233 this.SessionID = cirpack.CircuitCode.SessionID; 231 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 @@
27* 27*
28*/ 28*/
29using System; 29using System;
30using System.Collections;
31using System.Collections.Generic; 30using System.Collections.Generic;
32using libsecondlife;
33using libsecondlife.Packets;
34using System.Net; 31using System.Net;
35using System.Net.Sockets; 32using System.Net.Sockets;
36using System.IO;
37using System.Threading;
38using System.Timers; 33using System.Timers;
34using libsecondlife;
35using libsecondlife.Packets;
36using OpenSim.Framework.Console;
39using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
40using OpenSim.Framework.Interfaces;
41 38
42namespace OpenSim.Region.ClientStack 39namespace OpenSim.Region.ClientStack
43{ 40{
@@ -47,7 +44,7 @@ namespace OpenSim.Region.ClientStack
47 protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>(); 44 protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
48 protected Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>(); 45 protected Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>();
49 46
50 protected System.Timers.Timer AckTimer; 47 protected Timer AckTimer;
51 protected uint Sequence = 0; 48 protected uint Sequence = 0;
52 protected object SequenceLock = new object(); 49 protected object SequenceLock = new object();
53 protected const int MAX_APPENDED_ACKS = 10; 50 protected const int MAX_APPENDED_ACKS = 10;
@@ -159,7 +156,7 @@ namespace OpenSim.Region.ClientStack
159 } 156 }
160 catch (Exception) 157 catch (Exception)
161 { 158 {
162 OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); 159 MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
163 this.KillThread(); 160 this.KillThread();
164 } 161 }
165 162
@@ -195,8 +192,8 @@ namespace OpenSim.Region.ClientStack
195 else if ((NewPack.Type == PacketType.StartPingCheck)) 192 else if ((NewPack.Type == PacketType.StartPingCheck))
196 { 193 {
197 //reply to pingcheck 194 //reply to pingcheck
198 libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack; 195 StartPingCheckPacket startPing = (StartPingCheckPacket)NewPack;
199 libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket(); 196 CompletePingCheckPacket endPing = new CompletePingCheckPacket();
200 endPing.PingID.PingID = startPing.PingID.PingID; 197 endPing.PingID.PingID = startPing.PingID.PingID;
201 OutPacket(endPing); 198 OutPacket(endPing);
202 } 199 }
@@ -224,7 +221,7 @@ namespace OpenSim.Region.ClientStack
224 { 221 {
225 if (Pack.Header.Reliable) 222 if (Pack.Header.Reliable)
226 { 223 {
227 libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket(); 224 PacketAckPacket ack_it = new PacketAckPacket();
228 ack_it.Packets = new PacketAckPacket.PacketsBlock[1]; 225 ack_it.Packets = new PacketAckPacket.PacketsBlock[1];
229 ack_it.Packets[0] = new PacketAckPacket.PacketsBlock(); 226 ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();
230 ack_it.Packets[0].ID = Pack.Header.Sequence; 227 ack_it.Packets[0].ID = Pack.Header.Sequence;
@@ -254,7 +251,7 @@ namespace OpenSim.Region.ClientStack
254 { 251 {
255 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) 252 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
256 { 253 {
257 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " + 254 MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +
258 (now - packet.TickCount) + "ms have passed"); 255 (now - packet.TickCount) + "ms have passed");
259 256
260 packet.Header.Resent = true; 257 packet.Header.Resent = true;
@@ -273,7 +270,7 @@ namespace OpenSim.Region.ClientStack
273 if (PendingAcks.Count > 250) 270 if (PendingAcks.Count > 250)
274 { 271 {
275 // FIXME: Handle the odd case where we have too many pending ACKs queued up 272 // FIXME: Handle the odd case where we have too many pending ACKs queued up
276 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Too many ACKs queued up!"); 273 MainLog.Instance.Verbose( "Too many ACKs queued up!");
277 return; 274 return;
278 } 275 }
279 276
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31using libsecondlife.Packets;
32using OpenSim.Framework.Interfaces;
33using OpenSim.Framework;
34using System.Net; 29using System.Net;
35using System.Net.Sockets; 30using System.Net.Sockets;
31using libsecondlife.Packets;
36using OpenSim.Assets; 32using OpenSim.Assets;
33using OpenSim.Framework;
34using OpenSim.Framework.Interfaces;
37using OpenSim.Region.Caches; 35using OpenSim.Region.Caches;
38 36
39namespace OpenSim.Region.ClientStack 37namespace 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Text;
30using System.IO;
31using System.Threading;
32using System.Net;
33using System.Net.Sockets;
34using System.Timers;
35using System.Reflection;
36using System.Collections;
37using System.Collections.Generic; 29using System.Collections.Generic;
38using libsecondlife; 30using System.Net;
39using libsecondlife.Packets;
40using OpenSim.Region.Terrain;
41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types;
43using OpenSim.Framework;
44using OpenSim.Assets; 31using OpenSim.Assets;
45using OpenSim.Region.Caches; 32using OpenSim.Framework;
46using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
47using OpenSim.Physics.Manager; 34using OpenSim.Framework.Interfaces;
48using Nwc.XmlRpc;
49using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Framework.Types;
37using OpenSim.Physics.Manager;
38using OpenSim.Region.Caches;
50 39
51namespace OpenSim.Region.ClientStack 40namespace OpenSim.Region.ClientStack
52{ 41{
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Text; 29using System.Collections.Generic;
30using System.IO;
31using System.Threading;
32using System.Net; 30using System.Net;
33using System.Net.Sockets; 31using System.Net.Sockets;
34using System.Timers;
35using System.Reflection;
36using System.Collections;
37using System.Collections.Generic;
38using libsecondlife;
39using libsecondlife.Packets; 32using libsecondlife.Packets;
40using OpenSim.Region.Terrain;
41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types;
43using OpenSim.Assets; 33using OpenSim.Assets;
44using OpenSim.Region.Caches;
45using OpenSim.Framework.Console;
46using OpenSim.Framework; 34using OpenSim.Framework;
47using Nwc.XmlRpc; 35using OpenSim.Framework.Console;
48using OpenSim.Framework.Servers; 36using OpenSim.Framework.Interfaces;
37using OpenSim.Region.Caches;
49 38
50namespace OpenSim.Region.ClientStack 39namespace OpenSim.Region.ClientStack
51{ 40{
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using libsecondlife;
33using OpenSim.Framework;
34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types;
36using OpenSim.Framework.Communications; 28using OpenSim.Framework.Communications;
29using OpenSim.Framework.Types;
37 30
38namespace OpenSim.Region.Communications.Local 31namespace OpenSim.Region.Communications.Local
39{ 32{
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32using OpenSim.Framework.Types;
33using OpenSim.Framework; 30using OpenSim.Framework;
34using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Types;
35 33
36namespace OpenSim.Region.Communications.Local 34namespace OpenSim.Region.Communications.Local
37{ 35{
@@ -163,7 +161,7 @@ namespace OpenSim.Region.Communications.Local
163 /// <param name="agentID"></param> 161 /// <param name="agentID"></param>
164 /// <param name="position"></param> 162 /// <param name="position"></param>
165 /// <returns></returns> 163 /// <returns></returns>
166 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 164 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
167 { 165 {
168 if (this.regionHosts.ContainsKey(regionHandle)) 166 if (this.regionHosts.ContainsKey(regionHandle))
169 { 167 {
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 @@
1using System; 1using System;
2using System.Collections; 2using libsecondlife;
3using System.Collections.Generic;
4using System.Text;
5
6using OpenSim.Framework.Communications; 3using OpenSim.Framework.Communications;
7//using OpenSim.Framework.User;
8using OpenSim.Framework.UserManagement;
9using OpenSim.Framework.Data; 4using OpenSim.Framework.Data;
10using OpenSim.Framework.Types; 5using OpenSim.Framework.Types;
6using OpenSim.Framework.UserManagement;
11using OpenSim.Framework.Utilities; 7using OpenSim.Framework.Utilities;
12 8
13using libsecondlife;
14
15namespace OpenSim.Region.Communications.Local 9namespace OpenSim.Region.Communications.Local
16{ 10{
17 public class LocalUserServices : UserManagerBase, IUserServices 11 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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Types;
5using OpenSim.Framework.Communications; 1using OpenSim.Framework.Communications;
2using OpenSim.Framework.Types;
3
6namespace OpenSim.Region.Communications.OGS1 4namespace OpenSim.Region.Communications.OGS1
7{ 5{
8 public class CommunicationsOGS1 : CommunicationsManager 6 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 @@
1using System; 1using System;
2using System.Collections.Generic;
3using System.Collections; 2using System.Collections;
4using System.Text; 3using System.Collections.Generic;
4using System.Net;
5using System.Runtime.Remoting; 5using System.Runtime.Remoting;
6using System.Runtime.Remoting.Channels; 6using System.Runtime.Remoting.Channels;
7using System.Runtime.Remoting.Channels.Tcp; 7using System.Runtime.Remoting.Channels.Tcp;
8 8using libsecondlife;
9using OpenSim.Framework.Servers; 9using Nwc.XmlRpc;
10using OpenSim.Framework; 10using OpenSim.Framework;
11using OpenSim.Framework.Types;
12using OpenSim.Framework.Communications; 11using OpenSim.Framework.Communications;
13 12using OpenSim.Framework.Console;
14using Nwc.XmlRpc; 13using OpenSim.Framework.Servers;
15using libsecondlife; 14using OpenSim.Framework.Types;
16using System.Net;
17 15
18namespace OpenSim.Region.Communications.OGS1 16namespace OpenSim.Region.Communications.OGS1
19{ 17{
@@ -52,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
52 if (GridRespData.ContainsKey("error")) 50 if (GridRespData.ContainsKey("error"))
53 { 51 {
54 string errorstring = (string)GridRespData["error"]; 52 string errorstring = (string)GridRespData["error"];
55 OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring); 53 MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
56 return null; 54 return null;
57 } 55 }
58 56
@@ -103,7 +101,7 @@ namespace OpenSim.Region.Communications.OGS1
103 101
104 public RegionInfo RequestNeighbourInfo(ulong regionHandle) 102 public RegionInfo RequestNeighbourInfo(ulong regionHandle)
105 { 103 {
106 OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()"); 104 MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");
107 return null; 105 return null;
108 } 106 }
109 107
@@ -184,7 +182,7 @@ namespace OpenSim.Region.Communications.OGS1
184 } 182 }
185 else 183 else
186 { 184 {
187 OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString()); 185 MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
188 } 186 }
189 187
190 return new XmlRpcResponse(); 188 return new XmlRpcResponse();
@@ -215,7 +213,7 @@ namespace OpenSim.Region.Communications.OGS1
215 return false; 213 return false;
216 } 214 }
217 215
218 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 216 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
219 { 217 {
220 if (this.listeners.ContainsKey(regionHandle)) 218 if (this.listeners.ContainsKey(regionHandle))
221 { 219 {
@@ -239,7 +237,7 @@ namespace OpenSim.Region.Communications.OGS1
239 return false; 237 return false;
240 } 238 }
241 239
242 public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 240 public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position)
243 { 241 {
244 if (this.listeners.ContainsKey(regionHandle)) 242 if (this.listeners.ContainsKey(regionHandle))
245 { 243 {
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 @@
1using System; 1using System;
2using System.Collections.Generic; 2using libsecondlife;
3using System.Text;
4using OpenSim.Framework.Types; 3using OpenSim.Framework.Types;
5using OpenSim.Framework.Communications; 4
6namespace OpenSim.Region.Communications.OGS1 5namespace OpenSim.Region.Communications.OGS1
7{ 6{
8 public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); 7 public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
9 public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 8 public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position);
10 9
11 public sealed class InterRegionSingleton 10 public sealed class InterRegionSingleton
12 { 11 {
@@ -40,7 +39,7 @@ namespace OpenSim.Region.Communications.OGS1
40 return false; 39 return false;
41 } 40 }
42 41
43 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 42 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
44 { 43 {
45 if (OnArrival != null) 44 if (OnArrival != null)
46 { 45 {
@@ -62,7 +61,7 @@ namespace OpenSim.Region.Communications.OGS1
62 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData); 61 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
63 } 62 }
64 63
65 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 64 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
66 { 65 {
67 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position); 66 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
68 } 67 }
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 @@
1using System; 1using System;
2using System.Collections; 2using System.Collections;
3using System.Collections.Generic;
4using System.Text;
5using OpenSim.Framework.Types;
6using OpenSim.Framework.Communications;
7using OpenSim.Framework.Data;
8using libsecondlife; 3using libsecondlife;
9
10using Nwc.XmlRpc; 4using Nwc.XmlRpc;
5using OpenSim.Framework.Communications;
6using OpenSim.Framework.Data;
11 7
12namespace OpenSim.Region.Communications.OGS1 8namespace OpenSim.Region.Communications.OGS1
13{ 9{
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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenSim.Framework.Types;
32using OpenSim.Framework.Interfaces;
33using OpenSim.Region.Environment;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim;
36using libsecondlife; 31using libsecondlife;
37using libsecondlife.Packets; 32using libsecondlife.Packets;
33using OpenSim.Framework.Console;
34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types;
36using OpenSim.Region.Environment.Scenes;
38using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence; 37using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
39 38
40 39
@@ -79,30 +78,30 @@ namespace OpenSim.Region.Environment
79 case "setregioninfo": 78 case "setregioninfo":
80 if (packet.ParamList.Length != 9) 79 if (packet.ParamList.Length != 9)
81 { 80 {
82 OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length"); 81 MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
83 } 82 }
84 else 83 else
85 { 84 {
86 m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None; 85 m_regInfo.estateSettings.regionFlags = Simulator.RegionFlags.None;
87 86
88 if (convertParamStringToBool(packet.ParamList[0].Parameter)) 87 if (convertParamStringToBool(packet.ParamList[0].Parameter))
89 { 88 {
90 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform; 89 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.BlockTerraform;
91 } 90 }
92 91
93 if (convertParamStringToBool(packet.ParamList[1].Parameter)) 92 if (convertParamStringToBool(packet.ParamList[1].Parameter))
94 { 93 {
95 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly; 94 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.NoFly;
96 } 95 }
97 96
98 if (convertParamStringToBool(packet.ParamList[2].Parameter)) 97 if (convertParamStringToBool(packet.ParamList[2].Parameter))
99 { 98 {
100 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage; 99 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.AllowDamage;
101 } 100 }
102 101
103 if (convertParamStringToBool(packet.ParamList[3].Parameter) == false) 102 if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
104 { 103 {
105 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell; 104 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.BlockLandResell;
106 } 105 }
107 106
108 107
@@ -113,17 +112,17 @@ namespace OpenSim.Region.Environment
113 m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor; 112 m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
114 113
115 int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter)); 114 int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
116 m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel; 115 m_regInfo.estateSettings.simAccess = (Simulator.SimAccess)tempMatureLevel;
117 116
118 117
119 if (convertParamStringToBool(packet.ParamList[7].Parameter)) 118 if (convertParamStringToBool(packet.ParamList[7].Parameter))
120 { 119 {
121 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject; 120 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.RestrictPushObject;
122 } 121 }
123 122
124 if (convertParamStringToBool(packet.ParamList[8].Parameter)) 123 if (convertParamStringToBool(packet.ParamList[8].Parameter))
125 { 124 {
126 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges; 125 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.AllowParcelChanges;
127 } 126 }
128 127
129 sendRegionInfoPacketToAll(); 128 sendRegionInfoPacketToAll();
@@ -223,7 +222,7 @@ namespace OpenSim.Region.Environment
223 case "setregionterrain": 222 case "setregionterrain":
224 if (packet.ParamList.Length != 9) 223 if (packet.ParamList.Length != 9)
225 { 224 {
226 OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length"); 225 MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
227 } 226 }
228 else 227 else
229 { 228 {
@@ -237,7 +236,7 @@ namespace OpenSim.Region.Environment
237 } 236 }
238 break; 237 break;
239 default: 238 default:
240 OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString()); 239 MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
241 break; 240 break;
242 } 241 }
243 } 242 }
@@ -265,7 +264,7 @@ namespace OpenSim.Region.Environment
265 264
266 public void sendRegionInfoPacket(IClientAPI remote_client) 265 public void sendRegionInfoPacket(IClientAPI remote_client)
267 { 266 {
268 Encoding _enc = System.Text.Encoding.ASCII; 267 Encoding _enc = Encoding.ASCII;
269 268
270 AgentCircuitData circuitData = remote_client.RequestClientInfo(); 269 AgentCircuitData circuitData = remote_client.RequestClientInfo();
271 270
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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 30using libsecondlife;
32using libsecondlife.Packets; 31using libsecondlife.Packets;
33using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
@@ -43,7 +42,7 @@ namespace OpenSim.Region.Environment
43 /// <summary> 42 /// <summary>
44 /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc) 43 /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
45 /// </summary> 44 /// </summary>
46 public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver 45 public class ParcelManager : ILocalStorageParcelReceiver
47 { 46 {
48 47
49 #region Constants 48 #region Constants
@@ -420,7 +419,7 @@ namespace OpenSim.Region.Environment
420 { 419 {
421 for (y = 0; y < inc_y; y++) 420 for (y = 0; y < inc_y; y++)
422 { 421 {
423 OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y); 422 Parcel currentParcel = getParcel(start_x + x, start_y + y);
424 if (!temp.Contains(currentParcel)) 423 if (!temp.Contains(currentParcel))
425 { 424 {
426 currentParcel.forceUpdateParcelInfo(); 425 currentParcel.forceUpdateParcelInfo();
@@ -429,10 +428,10 @@ namespace OpenSim.Region.Environment
429 } 428 }
430 } 429 }
431 430
432 int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL; 431 int requestResult = PARCEL_RESULT_ONE_PARCEL;
433 if (temp.Count > 1) 432 if (temp.Count > 1)
434 { 433 {
435 requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS; 434 requestResult = PARCEL_RESULT_MULTIPLE_PARCELS;
436 } 435 }
437 436
438 for (i = 0; i < temp.Count; i++) 437 for (i = 0; i < temp.Count; i++)
@@ -571,7 +570,7 @@ namespace OpenSim.Region.Environment
571 570
572 updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray; 571 updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
573 572
574 updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc); 573 updatePacket.ParcelData.Desc = Helpers.StringToField(parcelData.parcelDesc);
575 updatePacket.ParcelData.Category = (byte)parcelData.category; 574 updatePacket.ParcelData.Category = (byte)parcelData.category;
576 updatePacket.ParcelData.ClaimDate = parcelData.claimDate; 575 updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
577 updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice; 576 updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
@@ -631,7 +630,7 @@ namespace OpenSim.Region.Environment
631 parcelData.mediaID = packet.ParcelData.MediaID; 630 parcelData.mediaID = packet.ParcelData.MediaID;
632 parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL); 631 parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
633 parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL); 632 parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
634 parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name); 633 parcelData.parcelName = Helpers.FieldToUTF8String(packet.ParcelData.Name);
635 parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags; 634 parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
636 parcelData.passHours = packet.ParcelData.PassHours; 635 parcelData.passHours = packet.ParcelData.PassHours;
637 parcelData.passPrice = packet.ParcelData.PassPrice; 636 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 @@
1using System;
2using System.Collections.Generic; 1using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Communications;
5using OpenSim.Framework; 2using OpenSim.Framework;
6using OpenSim.Framework.Types; 3using OpenSim.Framework.Communications;
7using OpenSim.Framework.Servers; 4using OpenSim.Framework.Servers;
8using OpenSim.Region.Capabilities; 5using OpenSim.Region.Capabilities;
6using OpenSim.Region.Environment.Scenes;
9 7
10namespace OpenSim.Region.Environment 8namespace OpenSim.Region.Environment
11{ 9{
@@ -17,7 +15,7 @@ namespace OpenSim.Region.Environment
17 protected List<Caps> capsHandlers = new List<Caps>(); 15 protected List<Caps> capsHandlers = new List<Caps>();
18 protected BaseHttpServer httpListener; 16 protected BaseHttpServer httpListener;
19 17
20 protected Scenes.Scene m_Scene; 18 protected Scene m_Scene;
21 19
22 public ParcelManager parcelManager; 20 public ParcelManager parcelManager;
23 public EstateManager estateManager; 21 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using Axiom.MathLib;
32using OpenSim.Physics.Manager;
33using libsecondlife; 29using libsecondlife;
30using OpenSim.Physics.Manager;
34 31
35namespace OpenSim.Region.Environment.Scenes 32namespace OpenSim.Region.Environment.Scenes
36{ 33{
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 @@
1using System;
2using System.Collections.Generic; 1using System.Collections.Generic;
3using System.Text;
4using Axiom.MathLib; 2using Axiom.MathLib;
5using libsecondlife; 3using libsecondlife;
6 4
@@ -8,7 +6,7 @@ namespace OpenSim.Region.Environment.Scenes
8{ 6{
9 public abstract class EntityBase 7 public abstract class EntityBase
10 { 8 {
11 public libsecondlife.LLUUID uuid; 9 public LLUUID uuid;
12 10
13 protected List<EntityBase> children; 11 protected List<EntityBase> children;
14 12
@@ -83,7 +81,7 @@ namespace OpenSim.Region.Environment.Scenes
83 /// </summary> 81 /// </summary>
84 public EntityBase() 82 public EntityBase()
85 { 83 {
86 uuid = new libsecondlife.LLUUID(); 84 uuid = new LLUUID();
87 85
88 m_pos = new LLVector3(); 86 m_pos = new LLVector3();
89 velocity = new LLVector3(); 87 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 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife; 1using libsecondlife;
5using libsecondlife.Packets; 2using libsecondlife.Packets;
6using OpenSim.Physics.Manager;
7using OpenSim.Framework.Interfaces; 3using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types;
9 4
10namespace OpenSim.Region.Environment.Scenes 5namespace OpenSim.Region.Environment.Scenes
11{ 6{
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 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using Axiom.MathLib;
4using libsecondlife; 4using libsecondlife;
5using libsecondlife.Packets; 5using libsecondlife.Packets;
6using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
7using OpenSim.Physics.Manager;
8using OpenSim.Framework.Types;
9using OpenSim.Framework.Inventory; 7using OpenSim.Framework.Inventory;
8using OpenSim.Framework.Types;
10 9
11namespace OpenSim.Region.Environment.Scenes 10namespace OpenSim.Region.Environment.Scenes
12{ 11{
@@ -266,7 +265,7 @@ namespace OpenSim.Region.Environment.Scenes
266 public void SendTerseUpdateToClient(IClientAPI RemoteClient) 265 public void SendTerseUpdateToClient(IClientAPI RemoteClient)
267 { 266 {
268 LLVector3 lPos; 267 LLVector3 lPos;
269 Axiom.MathLib.Quaternion lRot; 268 Quaternion lRot;
270 269
271 lPos = this.Pos; 270 lPos = this.Pos;
272 lRot = this.rotation; 271 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 @@
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using Axiom.MathLib;
32using libsecondlife; 33using libsecondlife;
33using libsecondlife.Packets; 34using libsecondlife.Packets;
34using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
35using OpenSim.Physics.Manager;
36using OpenSim.Framework.Types;
37using OpenSim.Framework.Inventory; 36using OpenSim.Framework.Inventory;
37using OpenSim.Framework.Types;
38using OpenSim.Physics.Manager;
38 39
39namespace OpenSim.Region.Environment.Scenes 40namespace OpenSim.Region.Environment.Scenes
40{ 41{
@@ -174,9 +175,9 @@ namespace OpenSim.Region.Environment.Scenes
174 dataArrays.Add(primData.ToBytes()); 175 dataArrays.Add(primData.ToBytes());
175 foreach (Entity child in children) 176 foreach (Entity child in children)
176 { 177 {
177 if (child is OpenSim.Region.Environment.Scenes.PrimitiveOld) 178 if (child is PrimitiveOld)
178 { 179 {
179 dataArrays.Add(((OpenSim.Region.Environment.Scenes.PrimitiveOld)child).GetByteArray()); 180 dataArrays.Add(((PrimitiveOld)child).GetByteArray());
180 } 181 }
181 } 182 }
182 byte[] primstart = Helpers.StringToField("<Prim>"); 183 byte[] primstart = Helpers.StringToField("<Prim>");
@@ -351,7 +352,7 @@ namespace OpenSim.Region.Environment.Scenes
351 /// <returns></returns> 352 /// <returns></returns>
352 public byte[] ConvertInventoryToBytes() 353 public byte[] ConvertInventoryToBytes()
353 { 354 {
354 System.Text.Encoding enc = System.Text.Encoding.ASCII; 355 Encoding enc = Encoding.ASCII;
355 byte[] result = new byte[0]; 356 byte[] result = new byte[0];
356 List<byte[]> inventoryData = new List<byte[]>(); 357 List<byte[]> inventoryData = new List<byte[]>();
357 int totallength = 0; 358 int totallength = 0;
@@ -434,7 +435,7 @@ namespace OpenSim.Region.Environment.Scenes
434 public void SendTerseUpdateToClient(IClientAPI RemoteClient) 435 public void SendTerseUpdateToClient(IClientAPI RemoteClient)
435 { 436 {
436 LLVector3 lPos; 437 LLVector3 lPos;
437 Axiom.MathLib.Quaternion lRot; 438 Quaternion lRot;
438 if (this._physActor != null && this.physicsEnabled) //is this needed ? doesn't the property fields do this for us? 439 if (this._physActor != null && this.physicsEnabled) //is this needed ? doesn't the property fields do this for us?
439 { 440 {
440 PhysicsVector pPos = this._physActor.Position; 441 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 30using libsecondlife;
32using libsecondlife.Packets; 31using libsecondlife.Packets;
33using OpenSim.Physics.Manager;
34using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 33using OpenSim.Framework.Types;
36using OpenSim.Framework.Inventory;
37using OpenSim.Framework.Utilities;
38 34
39namespace OpenSim.Region.Environment.Scenes 35namespace OpenSim.Region.Environment.Scenes
40{ 36{
@@ -253,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes
253 { 249 {
254 if (((SceneObject)ent).rootLocalID == primLocalID) 250 if (((SceneObject)ent).rootLocalID == primLocalID)
255 { 251 {
256 ((OpenSim.Region.Environment.Scenes.SceneObject)ent).GetProperites(remoteClient); 252 ((SceneObject)ent).GetProperites(remoteClient);
257 break; 253 break;
258 } 254 }
259 } 255 }
@@ -349,7 +345,7 @@ namespace OpenSim.Region.Environment.Scenes
349 { 345 {
350 if (ent.LocalId == localID) 346 if (ent.LocalId == localID)
351 { 347 {
352 ((OpenSim.Region.Environment.Scenes.PrimitiveOld)ent).UpdatePosition(pos); 348 ((PrimitiveOld)ent).UpdatePosition(pos);
353 break; 349 break;
354 } 350 }
355 } 351 }
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using libsecondlife;
30using libsecondlife.Packets;
31using System.Collections.Generic; 29using System.Collections.Generic;
32using System.Text;
33using System.Reflection;
34using System.IO;
35using System.Threading; 30using System.Threading;
36using System.Timers; 31using System.Timers;
37using OpenSim.Physics.Manager; 32using libsecondlife;
38using OpenSim.Framework.Interfaces; 33using libsecondlife.Packets;
39using OpenSim.Framework.Types;
40using OpenSim.Framework.Inventory;
41using OpenSim.Framework; 34using OpenSim.Framework;
42using OpenSim.Region.Terrain;
43using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
44using OpenSim.Region.Caches; 36using OpenSim.Framework.Console;
45using OpenSim.Region.Environment; 37using OpenSim.Framework.Interfaces;
46using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Types;
40using OpenSim.Physics.Manager;
41using OpenSim.Region.Caches;
47using OpenSim.Region.Enviorment.Scripting; 42using OpenSim.Region.Enviorment.Scripting;
48using OpenSim.Region.Capabilities; 43using OpenSim.Region.Terrain;
49using Caps = OpenSim.Region.Capabilities.Caps; 44using Caps=OpenSim.Region.Capabilities.Caps;
45using Timer=System.Timers.Timer;
50 46
51namespace OpenSim.Region.Environment.Scenes 47namespace OpenSim.Region.Environment.Scenes
52{ 48{
@@ -54,9 +50,9 @@ namespace OpenSim.Region.Environment.Scenes
54 50
55 public partial class Scene : SceneBase, ILocalStorageReceiver 51 public partial class Scene : SceneBase, ILocalStorageReceiver
56 { 52 {
57 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); 53 protected Timer m_heartbeatTimer = new Timer();
58 protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars; 54 protected Dictionary<LLUUID, ScenePresence> Avatars;
59 protected Dictionary<libsecondlife.LLUUID, SceneObject> Prims; 55 protected Dictionary<LLUUID, SceneObject> Prims;
60 private PhysicsScene phyScene; 56 private PhysicsScene phyScene;
61 private float timeStep = 0.1f; 57 private float timeStep = 0.1f;
62 private Random Rand = new Random(); 58 private Random Rand = new Random();
@@ -119,12 +115,12 @@ namespace OpenSim.Region.Environment.Scenes
119 scriptManager = new ScriptManager(this); 115 scriptManager = new ScriptManager(this);
120 eventManager = new EventManager(); 116 eventManager = new EventManager();
121 117
122 OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs - creating new entitities instance"); 118 MainLog.Instance.Verbose("World.cs - creating new entitities instance");
123 Entities = new Dictionary<libsecondlife.LLUUID, EntityBase>(); 119 Entities = new Dictionary<LLUUID, EntityBase>();
124 Avatars = new Dictionary<LLUUID, ScenePresence>(); 120 Avatars = new Dictionary<LLUUID, ScenePresence>();
125 Prims = new Dictionary<LLUUID, SceneObject>(); 121 Prims = new Dictionary<LLUUID, SceneObject>();
126 122
127 OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs - creating LandMap"); 123 MainLog.Instance.Verbose("World.cs - creating LandMap");
128 Terrain = new TerrainEngine(); 124 Terrain = new TerrainEngine();
129 125
130 ScenePresence.LoadAnims(); 126 ScenePresence.LoadAnims();
@@ -151,7 +147,7 @@ namespace OpenSim.Region.Environment.Scenes
151 /// </summary> 147 /// </summary>
152 /// <param name="sender"></param> 148 /// <param name="sender"></param>
153 /// <param name="e"></param> 149 /// <param name="e"></param>
154 void Heartbeat(object sender, System.EventArgs e) 150 void Heartbeat(object sender, EventArgs e)
155 { 151 {
156 this.Update(); 152 this.Update();
157 } 153 }
@@ -170,7 +166,7 @@ namespace OpenSim.Region.Environment.Scenes
170 166
171 } 167 }
172 168
173 foreach (libsecondlife.LLUUID UUID in Entities.Keys) 169 foreach (LLUUID UUID in Entities.Keys)
174 { 170 {
175 Entities[UUID].updateMovement(); 171 Entities[UUID].updateMovement();
176 } 172 }
@@ -180,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes
180 this.phyScene.Simulate(timeStep); 176 this.phyScene.Simulate(timeStep);
181 } 177 }
182 178
183 foreach (libsecondlife.LLUUID UUID in Entities.Keys) 179 foreach (LLUUID UUID in Entities.Keys)
184 { 180 {
185 Entities[UUID].update(); 181 Entities[UUID].update();
186 } 182 }
@@ -198,7 +194,7 @@ namespace OpenSim.Region.Environment.Scenes
198 } 194 }
199 catch (Exception e) 195 catch (Exception e)
200 { 196 {
201 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString()); 197 MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
202 } 198 }
203 updateLock.ReleaseMutex(); 199 updateLock.ReleaseMutex();
204 200
@@ -237,14 +233,14 @@ namespace OpenSim.Region.Environment.Scenes
237 this.SendLayerData(client); 233 this.SendLayerData(client);
238 } 234 }
239 235
240 foreach (libsecondlife.LLUUID UUID in Entities.Keys) 236 foreach (LLUUID UUID in Entities.Keys)
241 { 237 {
242 Entities[UUID].LandRenegerated(); 238 Entities[UUID].LandRenegerated();
243 } 239 }
244 } 240 }
245 catch (Exception e) 241 catch (Exception e)
246 { 242 {
247 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 243 MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
248 } 244 }
249 } 245 }
250 246
@@ -268,14 +264,14 @@ namespace OpenSim.Region.Environment.Scenes
268 this.SendLayerData(client); 264 this.SendLayerData(client);
269 } 265 }
270 266
271 foreach (libsecondlife.LLUUID UUID in Entities.Keys) 267 foreach (LLUUID UUID in Entities.Keys)
272 { 268 {
273 Entities[UUID].LandRenegerated(); 269 Entities[UUID].LandRenegerated();
274 } 270 }
275 } 271 }
276 catch (Exception e) 272 catch (Exception e)
277 { 273 {
278 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 274 MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
279 } 275 }
280 } 276 }
281 277
@@ -301,7 +297,7 @@ namespace OpenSim.Region.Environment.Scenes
301 } 297 }
302 catch (Exception e) 298 catch (Exception e)
303 { 299 {
304 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 300 MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
305 } 301 }
306 } 302 }
307 303
@@ -351,7 +347,7 @@ namespace OpenSim.Region.Environment.Scenes
351 } 347 }
352 catch (Exception e) 348 catch (Exception e)
353 { 349 {
354 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); 350 MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
355 } 351 }
356 } 352 }
357 353
@@ -382,12 +378,12 @@ namespace OpenSim.Region.Environment.Scenes
382 { 378 {
383 try 379 try
384 { 380 {
385 OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives"); 381 MainLog.Instance.Verbose("World.cs: LoadPrimsFromStorage() - Loading primitives");
386 this.localStorage.LoadPrimitives(this); 382 this.localStorage.LoadPrimitives(this);
387 } 383 }
388 catch (Exception e) 384 catch (Exception e)
389 { 385 {
390 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString()); 386 MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
391 } 387 }
392 } 388 }
393 389
@@ -428,7 +424,7 @@ namespace OpenSim.Region.Environment.Scenes
428 } 424 }
429 catch (Exception e) 425 catch (Exception e)
430 { 426 {
431 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString()); 427 MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
432 } 428 }
433 } 429 }
434 430
@@ -482,10 +478,10 @@ namespace OpenSim.Region.Environment.Scenes
482 { 478 {
483 ScenePresence newAvatar = null; 479 ScenePresence newAvatar = null;
484 480
485 OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); 481 MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
486 newAvatar = new ScenePresence(client, this, this.m_regInfo); 482 newAvatar = new ScenePresence(client, this, this.m_regInfo);
487 OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Adding new avatar to world"); 483 MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Adding new avatar to world");
488 OpenSim.Framework.Console.MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Starting RegionHandshake "); 484 MainLog.Instance.Verbose("World.cs:AddViewerAgent() - Starting RegionHandshake ");
489 485
490 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); 486 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
491 lock (this.m_syncRoot) 487 lock (this.m_syncRoot)
@@ -638,7 +634,7 @@ namespace OpenSim.Region.Environment.Scenes
638 } 634 }
639 } 635 }
640 636
641 public void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 637 public void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
642 { 638 {
643 if (regionHandle == this.m_regInfo.RegionHandle) 639 if (regionHandle == this.m_regInfo.RegionHandle)
644 { 640 {
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using libsecondlife;
30using libsecondlife.Packets;
31using System.Collections.Generic; 29using System.Collections.Generic;
32using System.Text;
33using System.Reflection; 30using System.Reflection;
34using System.IO; 31using libsecondlife;
35using System.Threading; 32using OpenSim.Framework.Console;
36using OpenSim.Physics.Manager;
37using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
38using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
39using OpenSim.Framework.Inventory;
40using OpenSim.Region.Terrain;
41using OpenSim.Region.Caches; 35using OpenSim.Region.Caches;
36using OpenSim.Region.Terrain;
42 37
43namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Environment.Scenes
44{ 39{
45 public abstract class SceneBase : IWorld 40 public abstract class SceneBase : IWorld
46 { 41 {
47 public Dictionary<libsecondlife.LLUUID, EntityBase> Entities; 42 public Dictionary<LLUUID, EntityBase> Entities;
48 protected Dictionary<uint, IClientAPI> m_clientThreads; 43 protected Dictionary<uint, IClientAPI> m_clientThreads;
49 protected ulong m_regionHandle; 44 protected ulong m_regionHandle;
50 protected string m_regionName; 45 protected string m_regionName;
@@ -113,7 +108,7 @@ namespace OpenSim.Region.Environment.Scenes
113 } 108 }
114 catch (Exception e) 109 catch (Exception e)
115 { 110 {
116 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); 111 MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
117 return false; 112 return false;
118 } 113 }
119 } 114 }
@@ -191,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
191 } 186 }
192 catch (Exception e) 187 catch (Exception e)
193 { 188 {
194 OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString()); 189 MainLog.Instance.WriteLine(LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
195 } 190 }
196 } 191 }
197 192
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 @@
1using System; 1using libsecondlife;
2using System.Collections.Generic;
3using System.Text;
4 2
5namespace OpenSim.Region.Environment.Scenes 3namespace OpenSim.Region.Environment.Scenes
6{ 4{
@@ -18,7 +16,7 @@ namespace OpenSim.Region.Environment.Scenes
18 public delegate void OnNewPrimitiveDelegate(PrimitiveOld prim); 16 public delegate void OnNewPrimitiveDelegate(PrimitiveOld prim);
19 public event OnNewPrimitiveDelegate OnNewPrimitive; 17 public event OnNewPrimitiveDelegate OnNewPrimitive;
20 18
21 public delegate void OnRemovePresenceDelegate(libsecondlife.LLUUID uuid); 19 public delegate void OnRemovePresenceDelegate(LLUUID uuid);
22 public event OnRemovePresenceDelegate OnRemovePresence; 20 public event OnRemovePresenceDelegate OnRemovePresence;
23 21
24 public void TriggerOnFrame() 22 public void TriggerOnFrame()
@@ -41,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
41 OnNewPresence(presence); 39 OnNewPresence(presence);
42 } 40 }
43 41
44 public void TriggerOnRemovePresence(libsecondlife.LLUUID uuid) 42 public void TriggerOnRemovePresence(LLUUID uuid)
45 { 43 {
46 if (OnRemovePresence != null) 44 if (OnRemovePresence != null)
47 { 45 {
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text; 29using System.Text;
31using libsecondlife; 30using libsecondlife;
32using libsecondlife.Packets; 31using libsecondlife.Packets;
33using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
34using OpenSim.Physics.Manager; 33using OpenSim.Physics.Manager;
35using OpenSim.Framework.Types;
36using OpenSim.Framework.Inventory;
37 34
38namespace OpenSim.Region.Environment.Scenes 35namespace OpenSim.Region.Environment.Scenes
39{ 36{
40 public class SceneObject : EntityBase 37 public class SceneObject : EntityBase
41 { 38 {
42 private System.Text.Encoding enc = System.Text.Encoding.ASCII; 39 private Encoding enc = Encoding.ASCII;
43 private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group 40 private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>(); //list of all primitive id's that are part of this group
44 public Primitive rootPrimitive; 41 public Primitive rootPrimitive;
45 private Scene m_world; 42 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31using libsecondlife;
32using System.Xml; 29using System.Xml;
30using libsecondlife;
33 31
34namespace OpenSim.Region.Environment.Scenes 32namespace OpenSim.Region.Environment.Scenes
35{ 33{
@@ -66,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
66 64
67 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 65 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
68 66
69 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID) 67 foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
70 { 68 {
71 AnimsNames.Add(kp.Value, kp.Key); 69 AnimsNames.Add(kp.Value, kp.Key);
72 } 70 }
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32using libsecondlife.Packets; 29using libsecondlife.Packets;
33using OpenSim.Physics.Manager;
34using OpenSim.Framework.Interfaces; 30using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types;
36 31
37namespace OpenSim.Region.Environment.Scenes 32namespace OpenSim.Region.Environment.Scenes
38{ 33{
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 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Text; 31using Axiom.MathLib;
32using libsecondlife; 32using libsecondlife;
33using libsecondlife.Packets; 33using libsecondlife.Packets;
34using OpenSim.Physics.Manager; 34using OpenSim.Framework.Console;
35using OpenSim.Framework.Inventory;
36using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
38using Axiom.MathLib; 37using OpenSim.Physics.Manager;
39 38
40namespace OpenSim.Region.Environment.Scenes 39namespace OpenSim.Region.Environment.Scenes
41{ 40{
@@ -53,7 +52,7 @@ namespace OpenSim.Region.Environment.Scenes
53 private byte movementflag = 0; 52 private byte movementflag = 0;
54 private List<NewForce> forcesList = new List<NewForce>(); 53 private List<NewForce> forcesList = new List<NewForce>();
55 private short _updateCount = 0; 54 private short _updateCount = 0;
56 private Axiom.MathLib.Quaternion bodyRot; 55 private Quaternion bodyRot;
57 private LLObject.TextureEntry avatarAppearanceTexture = null; 56 private LLObject.TextureEntry avatarAppearanceTexture = null;
58 private byte[] visualParams; 57 private byte[] visualParams;
59 private AvatarWearable[] Wearables; 58 private AvatarWearable[] Wearables;
@@ -110,7 +109,7 @@ namespace OpenSim.Region.Environment.Scenes
110 109
111 m_regionInfo = reginfo; 110 m_regionInfo = reginfo;
112 m_regionHandle = reginfo.RegionHandle; 111 m_regionHandle = reginfo.RegionHandle;
113 OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs "); 112 MainLog.Instance.Verbose("Avatar.cs ");
114 ControllingClient = theClient; 113 ControllingClient = theClient;
115 this.firstname = ControllingClient.FirstName; 114 this.firstname = ControllingClient.FirstName;
116 this.lastname = ControllingClient.LastName; 115 this.lastname = ControllingClient.LastName;
@@ -240,7 +239,7 @@ namespace OpenSim.Region.Environment.Scenes
240 bool update_rotation = false; 239 bool update_rotation = false;
241 bool DCFlagKeyPressed = false; 240 bool DCFlagKeyPressed = false;
242 Vector3 agent_control_v3 = new Vector3(0, 0, 0); 241 Vector3 agent_control_v3 = new Vector3(0, 0, 0);
243 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); 242 Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
244 243
245 this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0); 244 this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
246 245
@@ -278,10 +277,10 @@ namespace OpenSim.Region.Environment.Scenes
278 277
279 } 278 }
280 279
281 protected void AddNewMovement(Axiom.MathLib.Vector3 vec, Axiom.MathLib.Quaternion rotation) 280 protected void AddNewMovement(Vector3 vec, Quaternion rotation)
282 { 281 {
283 NewForce newVelocity = new NewForce(); 282 NewForce newVelocity = new NewForce();
284 Axiom.MathLib.Vector3 direc = rotation * vec; 283 Vector3 direc = rotation * vec;
285 direc.Normalize(); 284 direc.Normalize();
286 285
287 direc = direc * ((0.03f) * 128f); 286 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31
32// Compilation stuff
33using System.CodeDom;
34using System.CodeDom.Compiler; 29using System.CodeDom.Compiler;
30using System.Collections.Generic;
35using Microsoft.CSharp; 31using Microsoft.CSharp;
32using OpenSim.Framework.Console;
36 33
37namespace OpenSim.Region.Enviorment.Scripting 34namespace OpenSim.Region.Enviorment.Scripting
38{ 35{
@@ -60,10 +57,10 @@ namespace OpenSim.Region.Enviorment.Scripting
60 57
61 if (compilerResults.Errors.Count > 0) 58 if (compilerResults.Errors.Count > 0)
62 { 59 {
63 OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors"); 60 MainLog.Instance.Error("Compile errors");
64 foreach (CompilerError error in compilerResults.Errors) 61 foreach (CompilerError error in compilerResults.Errors)
65 { 62 {
66 OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); 63 MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
67 } 64 }
68 } 65 }
69 else 66 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31
32// Compilation stuff
33using System.CodeDom;
34using System.CodeDom.Compiler; 29using System.CodeDom.Compiler;
30using System.Collections.Generic;
35using Microsoft.JScript; 31using Microsoft.JScript;
32using OpenSim.Framework.Console;
36 33
37namespace OpenSim.Region.Enviorment.Scripting 34namespace OpenSim.Region.Enviorment.Scripting
38{ 35{
@@ -60,10 +57,10 @@ namespace OpenSim.Region.Enviorment.Scripting
60 57
61 if (compilerResults.Errors.Count > 0) 58 if (compilerResults.Errors.Count > 0)
62 { 59 {
63 OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors"); 60 MainLog.Instance.Error("Compile errors");
64 foreach (CompilerError error in compilerResults.Errors) 61 foreach (CompilerError error in compilerResults.Errors)
65 { 62 {
66 OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); 63 MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
67 } 64 }
68 } 65 }
69 else 66 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using OpenSim.Framework.Console;
33using OpenSim.Framework;
34using OpenSim.Region.Environment;
35using OpenSim.Region.Environment.Scenes; 28using OpenSim.Region.Environment.Scenes;
36 29
37namespace OpenSim.Region.Enviorment.Scripting 30namespace OpenSim.Region.Enviorment.Scripting
@@ -54,7 +47,7 @@ namespace OpenSim.Region.Enviorment.Scripting
54 public void Initialise(ScriptInfo scriptInfo) 47 public void Initialise(ScriptInfo scriptInfo)
55 { 48 {
56 script = scriptInfo; 49 script = scriptInfo;
57 script.events.OnFrame += new OpenSim.Region.Environment.Scenes.EventManager.OnFrameDelegate(events_OnFrame); 50 script.events.OnFrame += new EventManager.OnFrameDelegate(events_OnFrame);
58 script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence); 51 script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);
59 } 52 }
60 53
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using OpenSim.Region.Environment.Scenes;
33using OpenSim.Framework.Console; 28using OpenSim.Framework.Console;
29using OpenSim.Region.Environment.Scenes;
34 30
35namespace OpenSim.Region.Enviorment.Scripting 31namespace OpenSim.Region.Enviorment.Scripting
36{ 32{
@@ -52,7 +48,7 @@ namespace OpenSim.Region.Enviorment.Scripting
52 { 48 {
53 world = scene; 49 world = scene;
54 events = world.eventManager; 50 events = world.eventManager;
55 logger = OpenSim.Framework.Console.MainLog.Instance; 51 logger = MainLog.Instance;
56 } 52 }
57 } 53 }
58} 54}
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text; 29using OpenSim.Framework.Console;
30using OpenSim.Region.Environment.Scenes;
31 31
32namespace OpenSim.Region.Enviorment.Scripting 32namespace OpenSim.Region.Enviorment.Scripting
33{ 33{
34 public class ScriptManager 34 public class ScriptManager
35 { 35 {
36 List<IScript> scripts = new List<IScript>(); 36 List<IScript> scripts = new List<IScript>();
37 OpenSim.Region.Environment.Scenes.Scene scene; 37 Scene scene;
38 Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>(); 38 Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();
39 39
40 private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts) 40 private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)
@@ -42,14 +42,14 @@ namespace OpenSim.Region.Enviorment.Scripting
42 foreach (KeyValuePair<string, IScript> script in compiledscripts) 42 foreach (KeyValuePair<string, IScript> script in compiledscripts)
43 { 43 {
44 ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script. 44 ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
45 OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading " + script.Key); 45 MainLog.Instance.Verbose("Loading " + script.Key);
46 script.Value.Initialise(scriptInfo); 46 script.Value.Initialise(scriptInfo);
47 scripts.Add(script.Value); 47 scripts.Add(script.Value);
48 } 48 }
49 OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)"); 49 MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");
50 } 50 }
51 51
52 public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world) 52 public ScriptManager(Scene world)
53 { 53 {
54 scene = world; 54 scene = world;
55 55
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Enviorment.Scripting
82 break; 82 break;
83 83
84 default: 84 default:
85 OpenSim.Framework.Console.MainLog.Instance.Error("Unknown script command"); 85 MainLog.Instance.Error("Unknown script command");
86 break; 86 break;
87 } 87 }
88 } 88 }
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 @@
1using System; 1using System.Collections;
2using System.Collections.Generic;
3using System.Text; 2using System.Text;
4using OpenSim.Framework.Servers;
5using OpenSim.Region.Capabilities;
6using libsecondlife; 3using libsecondlife;
7using System.Collections; 4using OpenSim.Region.Capabilities;
8 5
9namespace OpenSim.Framework.Servers 6namespace OpenSim.Framework.Servers
10{ 7{
@@ -28,7 +25,7 @@ namespace OpenSim.Framework.Servers
28 25
29 public string Handle(string body, string path) 26 public string Handle(string body, string path)
30 { 27 {
31 Encoding _enc = System.Text.Encoding.UTF8; 28 Encoding _enc = Encoding.UTF8;
32 Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes( body )); 29 Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes( body ));
33 TRequest request = new TRequest(); 30 TRequest request = new TRequest();
34 31
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 @@
1using System;
2using System.Collections.Generic; 1using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Interfaces;
5using OpenSim.Framework.Types;
6using OpenSim.Framework.Console;
7using libsecondlife; 2using libsecondlife;
8using OpenSim.Region.Environment;
9using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
10using OpenSim.Region.Environment.Scenes;
11using OpenSim.Framework; 3using OpenSim.Framework;
12using OpenSim.Region.Caches;
13using OpenSim.Framework.Communications; 4using OpenSim.Framework.Communications;
5using OpenSim.Framework.Interfaces;
14using OpenSim.Framework.Servers; 6using OpenSim.Framework.Servers;
7using OpenSim.Framework.Types;
8using OpenSim.Region.Caches;
9using OpenSim.Region.Environment.Scenes;
10using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
15 11
16namespace SimpleApp 12namespace SimpleApp
17{ 13{
18 public class MyWorld : Scene 14 public class MyWorld : Scene
19 { 15 {
20 private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars; 16 private List<ScenePresence> m_avatars;
21 17
22 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) 18 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
23 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer) 19 : 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 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Net;
3using System.Text;
4using OpenSim;
5using OpenSim.Region.GridInterfaces.Local;
6using OpenSim.Framework.Interfaces;
7using OpenSim.Framework.Types;
8using OpenSim.Framework.Console;
9using OpenSim.Framework.Servers;
10using OpenSim.Assets;
11using libsecondlife; 3using libsecondlife;
4using OpenSim.Assets;
12using OpenSim.Framework; 5using OpenSim.Framework;
13using OpenSim.Region.Caches; 6using OpenSim.Framework.Console;
14using OpenSim.Framework.Communications; 7using OpenSim.Framework.Interfaces;
15using OpenSim.Region.Communications.Local; 8using OpenSim.Framework.Servers;
16using OpenSim.Region.ClientStack; 9using OpenSim.Framework.Types;
17using System.Net;
18using libsecondlife.Packets;
19using OpenSim.Physics.Manager; 10using OpenSim.Physics.Manager;
11using OpenSim.Region.Caches;
20using OpenSim.Region.Capabilities; 12using OpenSim.Region.Capabilities;
13using OpenSim.Region.ClientStack;
14using OpenSim.Region.Communications.Local;
15using OpenSim.Region.GridInterfaces.Local;
21 16
22namespace SimpleApp 17namespace SimpleApp
23{ 18{
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 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// 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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Threading;
32using System.IO; 29using System.IO;
30using System.Threading;
31using Db4objects.Db4o;
32using Db4objects.Db4o.Query;
33using libsecondlife;
34using OpenSim.Framework.Console;
33using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
35using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
36using OpenSim.Framework.Console;
37using libsecondlife;
38using Db4objects.Db4o;
39using Db4objects.Db4o.Query;
40 38
41namespace OpenSim.Region.GridInterfaces.Local 39namespace OpenSim.Region.GridInterfaces.Local
42{ 40{
@@ -64,19 +62,19 @@ namespace OpenSim.Region.GridInterfaces.Local
64 { 62 {
65 bool yapfile; 63 bool yapfile;
66 this._assetRequests = new BlockingQueue<ARequest>(); 64 this._assetRequests = new BlockingQueue<ARequest>();
67 yapfile = System.IO.File.Exists("assets.yap"); 65 yapfile = File.Exists("assets.yap");
68 66
69 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Local Asset Server class created"); 67 MainLog.Instance.Verbose( "Local Asset Server class created");
70 try 68 try
71 { 69 {
72 db = Db4oFactory.OpenFile("assets.yap"); 70 db = Db4oFactory.OpenFile("assets.yap");
73 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Db4 Asset database creation"); 71 MainLog.Instance.Verbose( "Db4 Asset database creation");
74 } 72 }
75 catch (Exception e) 73 catch (Exception e)
76 { 74 {
77 db.Close(); 75 db.Close();
78 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured"); 76 MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");
79 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 77 MainLog.Instance.Warn(e.ToString());
80 } 78 }
81 if (!yapfile) 79 if (!yapfile)
82 { 80 {
@@ -124,7 +122,7 @@ namespace OpenSim.Region.GridInterfaces.Local
124 { 122 {
125 if (db != null) 123 if (db != null)
126 { 124 {
127 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Closing local asset server database"); 125 MainLog.Instance.Verbose( "Closing local asset server database");
128 db.Close(); 126 db.Close();
129 } 127 }
130 } 128 }
@@ -168,7 +166,7 @@ namespace OpenSim.Region.GridInterfaces.Local
168 try 166 try
169 { 167 {
170 168
171 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Setting up asset database"); 169 MainLog.Instance.Verbose( "Setting up asset database");
172 170
173 AssetBase Image = new AssetBase(); 171 AssetBase Image = new AssetBase();
174 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001"); 172 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
@@ -281,7 +279,7 @@ namespace OpenSim.Region.GridInterfaces.Local
281 //should request Asset from storage manager 279 //should request Asset from storage manager
282 //but for now read from file 280 //but for now read from file
283 281
284 string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder; 282 string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
285 string fileName = Path.Combine(dataPath, filename); 283 string fileName = Path.Combine(dataPath, filename);
286 FileInfo fInfo = new FileInfo(fileName); 284 FileInfo fInfo = new FileInfo(fileName);
287 long numBytes = fInfo.Length; 285 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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System; 28using System.IO;
29using System.Collections.Generic; 29using System.Net;
30using System.Text; 30using System.Text;
31using System.Threading; 31using System.Threading;
32using System.Net;
33using System.Net.Sockets;
34using System.IO;
35using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Console;
36using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
38using OpenSim.Framework.Utilities; 36using OpenSim.Framework.Utilities;
@@ -53,7 +51,7 @@ namespace OpenSim.Region.GridInterfaces.Remote
53 this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests)); 51 this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
54 this._remoteAssetServerThread.IsBackground = true; 52 this._remoteAssetServerThread.IsBackground = true;
55 this._remoteAssetServerThread.Start(); 53 this._remoteAssetServerThread.Start();
56 OpenSim.Framework.Console.MainLog.Instance.Verbose("Remote Asset Server class created"); 54 MainLog.Instance.Verbose("Remote Asset Server class created");
57 } 55 }
58 56
59 public void SetReceiver(IAssetReceiver receiver) 57 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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
29using Axiom.MathLib;
30using OpenSim.Physics.Manager; 30using OpenSim.Physics.Manager;
31 31
32namespace OpenSim.Region.Physics.BasicPhysicsPlugin 32namespace OpenSim.Region.Physics.BasicPhysicsPlugin
@@ -250,11 +250,11 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
250 } 250 }
251 } 251 }
252 252
253 public override Axiom.MathLib.Quaternion Orientation 253 public override Quaternion Orientation
254 { 254 {
255 get 255 get
256 { 256 {
257 return Axiom.MathLib.Quaternion.Identity; 257 return Quaternion.Identity;
258 } 258 }
259 set 259 set
260 { 260 {
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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System; 28using Axiom.MathLib;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Physics.Manager 30namespace OpenSim.Physics.Manager
33{ 31{
34 public delegate void PositionUpdate(PhysicsVector position); 32 public delegate void PositionUpdate(PhysicsVector position);
35 public delegate void VelocityUpdate(PhysicsVector velocity); 33 public delegate void VelocityUpdate(PhysicsVector velocity);
36 public delegate void OrientationUpdate(Axiom.MathLib.Quaternion orientation); 34 public delegate void OrientationUpdate(Quaternion orientation);
37 35
38 public abstract class PhysicsActor 36 public abstract class PhysicsActor
39 { 37 {
@@ -66,7 +64,7 @@ namespace OpenSim.Physics.Manager
66 get; 64 get;
67 } 65 }
68 66
69 public abstract Axiom.MathLib.Quaternion Orientation 67 public abstract Quaternion Orientation
70 { 68 {
71 get; 69 get;
72 set; 70 set;
@@ -115,11 +113,11 @@ namespace OpenSim.Physics.Manager
115 } 113 }
116 } 114 }
117 115
118 public override Axiom.MathLib.Quaternion Orientation 116 public override Quaternion Orientation
119 { 117 {
120 get 118 get
121 { 119 {
122 return Axiom.MathLib.Quaternion.Identity; 120 return Quaternion.Identity;
123 } 121 }
124 set 122 set
125 { 123 {
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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Collections;
31using System.IO; 30using System.IO;
32using System.Reflection; 31using System.Reflection;
33using Axiom.MathLib;
34using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
35 33
36namespace OpenSim.Physics.Manager 34namespace OpenSim.Physics.Manager
@@ -56,19 +54,19 @@ namespace OpenSim.Physics.Manager
56 54
57 if(_plugins.ContainsKey(engineName)) 55 if(_plugins.ContainsKey(engineName))
58 { 56 {
59 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName); 57 MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
60 return _plugins[engineName].GetScene(); 58 return _plugins[engineName].GetScene();
61 } 59 }
62 else 60 else
63 { 61 {
64 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName); 62 MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
65 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName)); 63 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
66 } 64 }
67 } 65 }
68 66
69 public void LoadPlugins() 67 public void LoadPlugins()
70 { 68 {
71 string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics"); 69 string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics");
72 string[] pluginFiles = Directory.GetFiles(path, "*.dll"); 70 string[] pluginFiles = Directory.GetFiles(path, "*.dll");
73 71
74 72
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Console; 28using OpenSim.Framework.Console;
32 29
33namespace OpenSim.Physics.Manager 30namespace OpenSim.Physics.Manager
@@ -67,7 +64,7 @@ namespace OpenSim.Physics.Manager
67 64
68 public override PhysicsActor AddAvatar(PhysicsVector position) 65 public override PhysicsActor AddAvatar(PhysicsVector position)
69 { 66 {
70 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); 67 MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
71 return PhysicsActor.Null; 68 return PhysicsActor.Null;
72 } 69 }
73 70
@@ -78,7 +75,7 @@ namespace OpenSim.Physics.Manager
78 75
79 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) 76 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
80 { 77 {
81 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); 78 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
82 return PhysicsActor.Null; 79 return PhysicsActor.Null;
83 } 80 }
84 81
@@ -91,12 +88,12 @@ namespace OpenSim.Physics.Manager
91 88
92 public override void GetResults() 89 public override void GetResults()
93 { 90 {
94 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : GetResults()"); 91 MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
95 } 92 }
96 93
97 public override void SetTerrain(float[] heightMap) 94 public override void SetTerrain(float[] heightMap)
98 { 95 {
99 OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 96 MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
100 } 97 }
101 98
102 public override void DeleteTerrain() 99 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Physics.Manager 28namespace OpenSim.Physics.Manager
33{ 29{
34 public class PhysicsVector 30 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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Physics.Manager; 30using Axiom.MathLib;
31using Ode.NET; 31using Ode.NET;
32using OpenSim.Physics.Manager;
32 33
33namespace OpenSim.Region.Physics.OdePlugin 34namespace OpenSim.Region.Physics.OdePlugin
34{ 35{
@@ -194,13 +195,13 @@ namespace OpenSim.Region.Physics.OdePlugin
194 LandGeom = d.CreateHeightfield(space, HeightmapData, 1); 195 LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
195 d.Matrix3 R = new d.Matrix3(); 196 d.Matrix3 R = new d.Matrix3();
196 197
197 Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0)); 198 Quaternion q1 =Quaternion.FromAngleAxis(1.5707f, new Vector3(1,0,0));
198 Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0)); 199 Quaternion q2 =Quaternion.FromAngleAxis(1.5707f, new Vector3(0,1,0));
199 //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1)); 200 //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));
200 201
201 q1 = q1 * q2; 202 q1 = q1 * q2;
202 //q1 = q1 * q3; 203 //q1 = q1 * q3;
203 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(); 204 Vector3 v3 = new Vector3();
204 float angle = 0; 205 float angle = 0;
205 q1.ToAngleAxis(ref angle, ref v3); 206 q1.ToAngleAxis(ref angle, ref v3);
206 207
@@ -287,11 +288,11 @@ namespace OpenSim.Region.Physics.OdePlugin
287 } 288 }
288 } 289 }
289 290
290 public override Axiom.MathLib.Quaternion Orientation 291 public override Quaternion Orientation
291 { 292 {
292 get 293 get
293 { 294 {
294 return Axiom.MathLib.Quaternion.Identity; 295 return Quaternion.Identity;
295 } 296 }
296 set 297 set
297 { 298 {
@@ -414,11 +415,11 @@ namespace OpenSim.Region.Physics.OdePlugin
414 } 415 }
415 } 416 }
416 417
417 public override Axiom.MathLib.Quaternion Orientation 418 public override Quaternion Orientation
418 { 419 {
419 get 420 get
420 { 421 {
421 Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion(); 422 Quaternion res = new Quaternion();
422 return res; 423 return res;
423 } 424 }
424 set 425 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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Physics.Manager; 30using OpenSim.Physics.Manager;
31using PhysXWrapper; 31using PhysXWrapper;
32using Quaternion=Axiom.MathLib.Quaternion;
32 33
33namespace OpenSim.Region.Physics.PhysXPlugin 34namespace OpenSim.Region.Physics.PhysXPlugin
34{ 35{
@@ -240,11 +241,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin
240 } 241 }
241 } 242 }
242 243
243 public override Axiom.MathLib.Quaternion Orientation 244 public override Quaternion Orientation
244 { 245 {
245 get 246 get
246 { 247 {
247 return Axiom.MathLib.Quaternion.Identity; 248 return Quaternion.Identity;
248 } 249 }
249 set 250 set
250 { 251 {
@@ -377,11 +378,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin
377 } 378 }
378 } 379 }
379 380
380 public override Axiom.MathLib.Quaternion Orientation 381 public override Quaternion Orientation
381 { 382 {
382 get 383 get
383 { 384 {
384 Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion(); 385 Quaternion res = new Quaternion();
385 PhysXWrapper.Quaternion quat = this._prim.GetOrientation(); 386 PhysXWrapper.Quaternion quat = this._prim.GetOrientation();
386 res.w = quat.W; 387 res.w = quat.W;
387 res.x = quat.X; 388 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 @@
29// BDB Support 29// BDB Support
30// Apparently broken on Mono 30// Apparently broken on Mono
31 31
32using System; 32using BerkeleyDb;
33using System.Collections.Generic;
34using System.Data;
35using libsecondlife; 33using libsecondlife;
36using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
38using BerkeleyDb;
39using Kds.Serialization;
40using Kds.Serialization.Buffer;
41 36
42namespace OpenSim.Region.Storage.LocalStorageBDB 37namespace OpenSim.Region.Storage.LocalStorageBDB
43{ 38{
@@ -52,7 +47,7 @@ namespace OpenSim.Region.Storage.LocalStorageBDB
52 public BDBLocalStorage() 47 public BDBLocalStorage()
53 { 48 {
54 DB = new Db(DbCreateFlags.None); 49 DB = new Db(DbCreateFlags.None);
55 sim = (DbHash)DB.Open(null, simDbName, null, BerkeleyDb.DbType.Hash, Db.OpenFlags.Create, 0); 50 sim = (DbHash)DB.Open(null, simDbName, null, DbType.Hash, Db.OpenFlags.Create, 0);
56 //vendorDb = (DbBTree)db.Open(null, VendorDbName, null, DbType.BTree, Db.OpenFlags.Create, 0); 51 //vendorDb = (DbBTree)db.Open(null, VendorDbName, null, DbType.BTree, Db.OpenFlags.Create, 0);
57 } 52 }
58 53
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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// Information about this assembly is defined by the following 30// Information about this assembly is defined by the following
33// attributes. 31// attributes.
34// 32//
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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using Db4objects.Db4o; 29using Db4objects.Db4o;
31using Db4objects.Db4o.Query;
32
33using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework.Console;
34using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 33using OpenSim.Framework.Types;
36using OpenSim.Framework.Console;
37
38 34
39namespace OpenSim.Region.Storage.LocalStorageDb4o 35namespace OpenSim.Region.Storage.LocalStorageDb4o
40{ 36{
@@ -53,18 +49,18 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
53 49
54 public void Initialise(string dfile) 50 public void Initialise(string dfile)
55 { 51 {
56 OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage Opening " + dfile); 52 MainLog.Instance.Warn("Db4LocalStorage Opening " + dfile);
57 datastore = dfile; 53 datastore = dfile;
58 try 54 try
59 { 55 {
60 db = Db4oFactory.OpenFile(datastore); 56 db = Db4oFactory.OpenFile(datastore);
61 OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage creation"); 57 MainLog.Instance.Verbose("Db4LocalStorage creation");
62 } 58 }
63 catch (Exception e) 59 catch (Exception e)
64 { 60 {
65 db.Close(); 61 db.Close();
66 OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage :Constructor - Exception occured"); 62 MainLog.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");
67 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 63 MainLog.Instance.Warn(e.ToString());
68 } 64 }
69 } 65 }
70 66
@@ -123,7 +119,7 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
123 public void LoadPrimitives(ILocalStorageReceiver receiver) 119 public void LoadPrimitives(ILocalStorageReceiver receiver)
124 { 120 {
125 IObjectSet result = db.Get(typeof(PrimData)); 121 IObjectSet result = db.Get(typeof(PrimData));
126 OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count); 122 MainLog.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count);
127 foreach (PrimData prim in result) 123 foreach (PrimData prim in result)
128 { 124 {
129 receiver.PrimFromStorage(prim); 125 receiver.PrimFromStorage(prim);
@@ -132,13 +128,13 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
132 128
133 public float[] LoadWorld() 129 public float[] LoadWorld()
134 { 130 {
135 OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Loading world...."); 131 MainLog.Instance.Verbose("LoadWorld() - Loading world....");
136 float[] heightmap = null; 132 float[] heightmap = null;
137 OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB"); 133 MainLog.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");
138 IObjectSet world_result = db.Get(typeof(MapStorage)); 134 IObjectSet world_result = db.Get(typeof(MapStorage));
139 if (world_result.Count > 0) 135 if (world_result.Count > 0)
140 { 136 {
141 OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading"); 137 MainLog.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");
142 MapStorage map = (MapStorage)world_result.Next(); 138 MapStorage map = (MapStorage)world_result.Next();
143 //blank.LandMap = map.Map; 139 //blank.LandMap = map.Map;
144 heightmap = map.Map; 140 heightmap = map.Map;
@@ -151,7 +147,7 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
151 IObjectSet world_result = db.Get(typeof(MapStorage)); 147 IObjectSet world_result = db.Get(typeof(MapStorage));
152 if (world_result.Count > 0) 148 if (world_result.Count > 0)
153 { 149 {
154 OpenSim.Framework.Console.MainLog.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database"); 150 MainLog.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");
155 MapStorage map = (MapStorage)world_result.Next(); 151 MapStorage map = (MapStorage)world_result.Next();
156 db.Delete(map); 152 db.Delete(map);
157 } 153 }
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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Region.Storage.LocalStorageDb4o 28namespace OpenSim.Region.Storage.LocalStorageDb4o
33{ 29{
34 public class MapStorage 30 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using Db4objects.Db4o;
32using Db4objects.Db4o.Query; 28using Db4objects.Db4o.Query;
33using libsecondlife; 29using libsecondlife;
34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 30using OpenSim.Framework.Types;
36 31
37namespace OpenSim.Region.Storage.LocalStorageDb4o 32namespace 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 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using Db4objects.Db4o;
32using Db4objects.Db4o.Query; 28using Db4objects.Db4o.Query;
33using libsecondlife; 29using libsecondlife;
34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 30using OpenSim.Framework.Types;
36 31
37namespace OpenSim.Region.Storage.LocalStorageDb4o 32namespace 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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// General Information about an assembly is controlled through the following 30// General Information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information 31// set of attributes. Change these attribute values to modify the information
34// associated with an assembly. 32// 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 @@
30// A bad idea, but the IRC people told me to! 30// A bad idea, but the IRC people told me to!
31 31
32using System; 32using System;
33using System.Collections.Generic;
34using System.Data; 33using System.Data;
35using System.Data.SQLite; 34using System.Data.SQLite;
36using libsecondlife; 35using libsecondlife;
36using OpenSim.Framework.Console;
37using OpenSim.Framework.Interfaces; 37using OpenSim.Framework.Interfaces;
38using OpenSim.Framework.Types; 38using OpenSim.Framework.Types;
39 39
@@ -54,8 +54,8 @@ namespace OpenSim.Region.Storage.LocalStorageSQLite
54 catch (Exception e) 54 catch (Exception e)
55 { 55 {
56 db.Close(); 56 db.Close();
57 OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured"); 57 MainLog.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");
58 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 58 MainLog.Instance.Warn(e.ToString());
59 } 59 }
60 } 60 }
61 61
@@ -117,8 +117,8 @@ namespace OpenSim.Region.Storage.LocalStorageSQLite
117 } 117 }
118 catch (Exception e) 118 catch (Exception e)
119 { 119 {
120 OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured"); 120 MainLog.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");
121 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 121 MainLog.Instance.Warn(e.ToString());
122 } 122 }
123 123
124 cmd.Dispose(); 124 cmd.Dispose();
@@ -144,8 +144,8 @@ namespace OpenSim.Region.Storage.LocalStorageSQLite
144 } 144 }
145 catch (Exception e) 145 catch (Exception e)
146 { 146 {
147 OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured"); 147 MainLog.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");
148 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 148 MainLog.Instance.Warn(e.ToString());
149 } 149 }
150 150
151 cmd.Dispose(); 151 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 @@
26* 26*
27*/ 27*/
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
31
32// General Information about an assembly is controlled through the following 30// General Information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information 31// set of attributes. Change these attribute values to modify the information
34// associated with an assembly. 32// 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 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using System.Drawing; 30using System.Drawing;
31using System.Drawing.Imaging;
32using System.IO;
32using libTerrain; 33using libTerrain;
33using OpenJPEGNet; 34using OpenJPEGNet;
34 35
@@ -421,9 +422,9 @@ namespace OpenSim.Region.Terrain
421 /// <param name="filename">The filename of the double array to import</param> 422 /// <param name="filename">The filename of the double array to import</param>
422 public void loadFromFileF64(string filename) 423 public void loadFromFileF64(string filename)
423 { 424 {
424 System.IO.FileInfo file = new System.IO.FileInfo(filename); 425 FileInfo file = new FileInfo(filename);
425 System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read); 426 FileStream s = file.Open(FileMode.Open, FileAccess.Read);
426 System.IO.BinaryReader bs = new System.IO.BinaryReader(s); 427 BinaryReader bs = new BinaryReader(s);
427 int x, y; 428 int x, y;
428 for (x = 0; x < w; x++) 429 for (x = 0; x < w; x++)
429 { 430 {
@@ -446,9 +447,9 @@ namespace OpenSim.Region.Terrain
446 /// <param name="filename">The filename of the float array to import</param> 447 /// <param name="filename">The filename of the float array to import</param>
447 public void loadFromFileF32(string filename) 448 public void loadFromFileF32(string filename)
448 { 449 {
449 System.IO.FileInfo file = new System.IO.FileInfo(filename); 450 FileInfo file = new FileInfo(filename);
450 System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read); 451 FileStream s = file.Open(FileMode.Open, FileAccess.Read);
451 System.IO.BinaryReader bs = new System.IO.BinaryReader(s); 452 BinaryReader bs = new BinaryReader(s);
452 int x, y; 453 int x, y;
453 for (x = 0; x < w; x++) 454 for (x = 0; x < w; x++)
454 { 455 {
@@ -471,9 +472,9 @@ namespace OpenSim.Region.Terrain
471 /// <param name="filename">A path to the .RAW format</param> 472 /// <param name="filename">A path to the .RAW format</param>
472 public void loadFromFileSLRAW(string filename) 473 public void loadFromFileSLRAW(string filename)
473 { 474 {
474 System.IO.FileInfo file = new System.IO.FileInfo(filename); 475 FileInfo file = new FileInfo(filename);
475 System.IO.FileStream s = file.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read); 476 FileStream s = file.Open(FileMode.Open, FileAccess.Read);
476 System.IO.BinaryReader bs = new System.IO.BinaryReader(s); 477 BinaryReader bs = new BinaryReader(s);
477 int x, y; 478 int x, y;
478 for (x = 0; x < w; x++) 479 for (x = 0; x < w; x++)
479 { 480 {
@@ -496,9 +497,9 @@ namespace OpenSim.Region.Terrain
496 /// <param name="filename">The desired output filename</param> 497 /// <param name="filename">The desired output filename</param>
497 public void writeToFileF64(string filename) 498 public void writeToFileF64(string filename)
498 { 499 {
499 System.IO.FileInfo file = new System.IO.FileInfo(filename); 500 FileInfo file = new FileInfo(filename);
500 System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write); 501 FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
501 System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s); 502 BinaryWriter bs = new BinaryWriter(s);
502 503
503 int x, y; 504 int x, y;
504 for (x = 0; x < w; x++) 505 for (x = 0; x < w; x++)
@@ -519,9 +520,9 @@ namespace OpenSim.Region.Terrain
519 /// <param name="filename">The desired output filename</param> 520 /// <param name="filename">The desired output filename</param>
520 public void writeToFileF32(string filename) 521 public void writeToFileF32(string filename)
521 { 522 {
522 System.IO.FileInfo file = new System.IO.FileInfo(filename); 523 FileInfo file = new FileInfo(filename);
523 System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write); 524 FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
524 System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s); 525 BinaryWriter bs = new BinaryWriter(s);
525 526
526 int x, y; 527 int x, y;
527 for (x = 0; x < w; x++) 528 for (x = 0; x < w; x++)
@@ -543,9 +544,9 @@ namespace OpenSim.Region.Terrain
543 /// <param name="filename">Filename to write to</param> 544 /// <param name="filename">Filename to write to</param>
544 public void writeToFileRAW(string filename) 545 public void writeToFileRAW(string filename)
545 { 546 {
546 System.IO.FileInfo file = new System.IO.FileInfo(filename); 547 FileInfo file = new FileInfo(filename);
547 System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write); 548 FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
548 System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s); 549 BinaryWriter bs = new BinaryWriter(s);
549 550
550 int x, y; 551 int x, y;
551 552
@@ -608,9 +609,9 @@ namespace OpenSim.Region.Terrain
608 /// <param name="filename">The filename to output to</param> 609 /// <param name="filename">The filename to output to</param>
609 public void writeToFileHiRAW(string filename) 610 public void writeToFileHiRAW(string filename)
610 { 611 {
611 System.IO.FileInfo file = new System.IO.FileInfo(filename); 612 FileInfo file = new FileInfo(filename);
612 System.IO.FileStream s = file.Open(System.IO.FileMode.CreateNew, System.IO.FileAccess.Write); 613 FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write);
613 System.IO.BinaryWriter bs = new System.IO.BinaryWriter(s); 614 BinaryWriter bs = new BinaryWriter(s);
614 615
615 // Generate a smegging big lookup table to speed the operation up (it needs it) 616 // Generate a smegging big lookup table to speed the operation up (it needs it)
616 double[] lookupTable = new double[65536]; 617 double[] lookupTable = new double[65536];
@@ -872,7 +873,7 @@ namespace OpenSim.Region.Terrain
872 } 873 }
873 } 874 }
874 875
875 bmp.Save(filename, System.Drawing.Imaging.ImageFormat.Png); 876 bmp.Save(filename, ImageFormat.Png);
876 } 877 }
877 catch (Exception e) 878 catch (Exception e)
878 { 879 {
@@ -913,7 +914,7 @@ namespace OpenSim.Region.Terrain
913 } 914 }
914 915
915 //bmp.Save(filename, System.Drawing.Imaging.ImageFormat.Png); 916 //bmp.Save(filename, System.Drawing.Imaging.ImageFormat.Png);
916 imageData = OpenJPEGNet.OpenJPEG.EncodeFromImage(bmp, "map"); 917 imageData = OpenJPEG.EncodeFromImage(bmp, "map");
917 918
918 } 919 }
919 catch (Exception e) 920 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 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using System.CodeDom.Compiler; 29using System.CodeDom.Compiler;
33using System.CodeDom; 30using System.Collections.Generic;
31using libTerrain;
34using Microsoft.CSharp; 32using Microsoft.CSharp;
35using Microsoft.JScript; 33using Microsoft.JScript;
36 34
37using libTerrain;
38
39namespace OpenSim.Region.Terrain 35namespace OpenSim.Region.Terrain
40{ 36{
41 public interface ITerrainFilter 37 public interface ITerrainFilter