aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs10
-rw-r--r--OpenSim/Framework/Communications/IGridServices.cs3
-rw-r--r--OpenSim/Framework/Communications/IInterRegionCommunications.cs7
-rw-r--r--OpenSim/Framework/Communications/IUserServices.cs4
-rw-r--r--OpenSim/Framework/Communications/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Console/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Console/ConsoleCallbacksBase.cs4
-rw-r--r--OpenSim/Framework/Console/LogBase.cs12
-rw-r--r--OpenSim/Framework/Console/MainLog.cs2
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oGridData.cs4
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oManager.cs2
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oUserData.cs3
-rw-r--r--OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs22
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLManager.cs7
-rw-r--r--OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLGridData.cs30
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs22
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLLogData.cs2
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs51
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLUserData.cs15
-rw-r--r--OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteGridData.cs22
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteManager.cs7
-rw-r--r--OpenSim/Framework/Data/GridData.cs8
-rw-r--r--OpenSim/Framework/Data/ILogData.cs4
-rw-r--r--OpenSim/Framework/Data/IniConfig.cs4
-rw-r--r--OpenSim/Framework/Data/InventoryData.cs2
-rw-r--r--OpenSim/Framework/Data/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Data/ReservationData.cs4
-rw-r--r--OpenSim/Framework/Data/SimProfileData.cs8
-rw-r--r--OpenSim/Framework/Data/UserData.cs3
-rw-r--r--OpenSim/Framework/Data/UserProfileData.cs2
-rw-r--r--OpenSim/Framework/General/AgentInventory.cs2
-rw-r--r--OpenSim/Framework/General/AuthenticateSessionBase.cs2
-rw-r--r--OpenSim/Framework/General/BlockingQueue.cs4
-rw-r--r--OpenSim/Framework/General/IRegionCommsListener.cs5
-rw-r--r--OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs8
-rw-r--r--OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs4
-rw-r--r--OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs4
-rw-r--r--OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs4
-rw-r--r--OpenSim/Framework/General/Interfaces/IAssetServer.cs5
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs5
-rw-r--r--OpenSim/Framework/General/Interfaces/ILocalStorage.cs1
-rw-r--r--OpenSim/Framework/General/Interfaces/IUserServer.cs5
-rw-r--r--OpenSim/Framework/General/Interfaces/IWorld.cs3
-rw-r--r--OpenSim/Framework/General/LoginService.cs7
-rw-r--r--OpenSim/Framework/General/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/General/RegionCommsListener.cs6
-rw-r--r--OpenSim/Framework/General/Remoting.cs3
-rw-r--r--OpenSim/Framework/General/SimProfile.cs3
-rw-r--r--OpenSim/Framework/General/Types/AgentCiruitData.cs3
-rw-r--r--OpenSim/Framework/General/Types/AgentWearable.cs3
-rw-r--r--OpenSim/Framework/General/Types/AssetBase.cs3
-rw-r--r--OpenSim/Framework/General/Types/AssetLandmark.cs4
-rw-r--r--OpenSim/Framework/General/Types/AssetStorage.cs3
-rw-r--r--OpenSim/Framework/General/Types/EstateSettings.cs8
-rw-r--r--OpenSim/Framework/General/Types/Login.cs3
-rw-r--r--OpenSim/Framework/General/Types/MapBlockData.cs2
-rw-r--r--OpenSim/Framework/General/Types/NeighbourInfo.cs8
-rw-r--r--OpenSim/Framework/General/Types/NetworkServersInfo.cs29
-rw-r--r--OpenSim/Framework/General/Types/ParcelData.cs9
-rw-r--r--OpenSim/Framework/General/Types/PrimData.cs2
-rw-r--r--OpenSim/Framework/General/Types/PrimitiveBaseShape.cs5
-rw-r--r--OpenSim/Framework/General/Types/RegionHandle.cs2
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs41
-rw-r--r--OpenSim/Framework/General/Types/UUID.cs2
-rw-r--r--OpenSim/Framework/General/UserProfile.cs4
-rw-r--r--OpenSim/Framework/General/Util.cs2
-rw-r--r--OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs5
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs19
-rw-r--r--OpenSim/Framework/Servers/CheckSumServer.cs15
-rw-r--r--OpenSim/Framework/Servers/ILlsdMethodHandler.cs30
-rw-r--r--OpenSim/Framework/Servers/LlsdMethod.cs30
-rw-r--r--OpenSim/Framework/Servers/RestMethod.cs4
-rw-r--r--OpenSim/Framework/Servers/UDPServerBase.cs8
-rw-r--r--OpenSim/Framework/Servers/XmlRpcMethod.cs1
-rw-r--r--OpenSim/Framework/UserManager/LoginResponse.cs13
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs37
-rw-r--r--OpenSim/Grid/AssetServer/AssetHttpServer.cs15
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs24
-rw-r--r--OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/Framework.Manager/GridManagementAgent.cs6
-rw-r--r--OpenSim/Grid/Framework.Manager/GridServerManager.cs3
-rw-r--r--OpenSim/Grid/GridServer.Config/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/GridServer.Config/DbGridConfig.cs55
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs41
-rw-r--r--OpenSim/Grid/GridServer/Main.cs14
-rw-r--r--OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/UserServer.Config/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/UserServer.Config/DbUserConfig.cs35
-rw-r--r--OpenSim/Grid/UserServer/Main.cs17
-rw-r--r--OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs13
-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
184 files changed, 693 insertions, 1195 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 48ff40e..f90e766 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -25,16 +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;
29using System.Collections;
30using System.Collections.Generic;
31using System.Text; 28using System.Text;
32using OpenSim.Framework; 29using libsecondlife;
30using libsecondlife.Packets;
33using OpenSim.Framework.Data; 31using OpenSim.Framework.Data;
34using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 33using OpenSim.Framework.Types;
36using libsecondlife;
37using libsecondlife.Packets;
38 34
39namespace OpenSim.Framework.Communications 35namespace OpenSim.Framework.Communications
40{ 36{
@@ -54,7 +50,7 @@ namespace OpenSim.Framework.Communications
54 #region Packet Handlers 50 #region Packet Handlers
55 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) 51 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
56 { 52 {
57 System.Text.Encoding enc = System.Text.Encoding.ASCII; 53 Encoding enc = Encoding.ASCII;
58 UserProfileData profileData = this.UserServer.GetUserProfile(uuid); 54 UserProfileData profileData = this.UserServer.GetUserProfile(uuid);
59 if (profileData != null) 55 if (profileData != null)
60 { 56 {
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index a4812fb..c168c20 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -26,11 +26,8 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework.Types; 30using OpenSim.Framework.Types;
33using OpenSim.Framework;
34 31
35namespace OpenSim.Framework.Communications 32namespace OpenSim.Framework.Communications
36{ 33{
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index 7b0d340..55f12ac 100644
--- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -25,17 +25,14 @@
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 libsecondlife;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Types; 29using OpenSim.Framework.Types;
32using OpenSim.Framework;
33 30
34namespace OpenSim.Framework.Communications 31namespace OpenSim.Framework.Communications
35{ 32{
36 public interface IInterRegionCommunications 33 public interface IInterRegionCommunications
37 { 34 {
38 bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); 35 bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
39 bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 36 bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position);
40 } 37 }
41} 38}
diff --git a/OpenSim/Framework/Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
index 37f4942..0b1f86c 100644
--- a/OpenSim/Framework/Communications/IUserServices.cs
+++ b/OpenSim/Framework/Communications/IUserServices.cs
@@ -25,11 +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 libsecondlife; 28using libsecondlife;
32
33using OpenSim.Framework.Data; 29using OpenSim.Framework.Data;
34 30
35namespace OpenSim.Framework.Communications 31namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
index 83e7dd4..09f6473 100644
--- a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Communications/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/Framework/Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
index 8f715d2..30f6167 100644
--- a/OpenSim/Framework/Console/AssemblyInfo.cs
+++ b/OpenSim/Framework/Console/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/Framework/Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
index e3847be..346cfe6 100644
--- a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
+++ b/OpenSim/Framework/Console/ConsoleCallbacksBase.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.Framework.Console 28namespace OpenSim.Framework.Console
33{ 29{
34 public interface conscmd_callback 30 public interface conscmd_callback
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index a4a17e9..f73e15e 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Framework.Console
120 return; 120 return;
121 } 121 }
122 122
123 private void WriteNewLine(System.ConsoleColor color, string format, params object[] args) 123 private void WriteNewLine(ConsoleColor color, string format, params object[] args)
124 { 124 {
125 Log.WriteLine(format, args); 125 Log.WriteLine(format, args);
126 Log.Flush(); 126 Log.Flush();
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Console
132 System.Console.WriteLine(format, args); 132 System.Console.WriteLine(format, args);
133 System.Console.ResetColor(); 133 System.Console.ResetColor();
134 } 134 }
135 catch (System.ArgumentNullException) 135 catch (ArgumentNullException)
136 { 136 {
137 // Some older systems dont support coloured text. 137 // Some older systems dont support coloured text.
138 System.Console.WriteLine(format, args); 138 System.Console.WriteLine(format, args);
@@ -162,14 +162,14 @@ namespace OpenSim.Framework.Console
162 162
163 while (true) 163 while (true)
164 { 164 {
165 addressStr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt(prompt, defaultvalue); 165 addressStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
166 if (IPAddress.TryParse(addressStr, out address)) 166 if (IPAddress.TryParse(addressStr, out address))
167 { 167 {
168 break; 168 break;
169 } 169 }
170 else 170 else
171 { 171 {
172 OpenSim.Framework.Console.MainLog.Instance.Error("Illegal address. Please re-enter."); 172 MainLog.Instance.Error("Illegal address. Please re-enter.");
173 } 173 }
174 } 174 }
175 175
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Console
183 183
184 while (true) 184 while (true)
185 { 185 {
186 portStr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt(prompt, defaultvalue); 186 portStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
187 if (int.TryParse(portStr, out port)) 187 if (int.TryParse(portStr, out port))
188 { 188 {
189 if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort) 189 if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort)
@@ -192,7 +192,7 @@ namespace OpenSim.Framework.Console
192 } 192 }
193 } 193 }
194 194
195 OpenSim.Framework.Console.MainLog.Instance.Error("Illegal address. Please re-enter."); 195 MainLog.Instance.Error("Illegal address. Please re-enter.");
196 } 196 }
197 197
198 return port; 198 return port;
diff --git a/OpenSim/Framework/Console/MainLog.cs b/OpenSim/Framework/Console/MainLog.cs
index d7f945e..7d52622 100644
--- a/OpenSim/Framework/Console/MainLog.cs
+++ b/OpenSim/Framework/Console/MainLog.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.Framework.Console 28namespace OpenSim.Framework.Console
31{ 29{
32 public class MainLog { 30 public class MainLog {
diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index dc8488e..1aaa775 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -27,12 +27,8 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework.Data;
33using libsecondlife; 30using libsecondlife;
34 31
35
36namespace OpenSim.Framework.Data.DB4o 32namespace OpenSim.Framework.Data.DB4o
37{ 33{
38 /// <summary> 34 /// <summary>
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index bd4cea8..0df6350 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -27,9 +27,7 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using Db4objects.Db4o; 30using Db4objects.Db4o;
32using OpenSim.Framework.Data;
33using libsecondlife; 31using libsecondlife;
34 32
35namespace OpenSim.Framework.Data.DB4o 33namespace OpenSim.Framework.Data.DB4o
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 3ab0073..2e33ab0 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -26,9 +26,6 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Data;
32using libsecondlife; 29using libsecondlife;
33 30
34namespace OpenSim.Framework.Data.DB4o 31namespace OpenSim.Framework.Data.DB4o
diff --git a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
index 68395a1..905cd9b 100644
--- a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.DB4o/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/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
index 5bdceaf..ca9196a5 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
@@ -27,8 +27,10 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data;
31using System.Security.Cryptography;
30using System.Text; 32using System.Text;
31using OpenSim.Framework.Data; 33using libsecondlife;
32 34
33namespace OpenSim.Framework.Data.MSSQL 35namespace OpenSim.Framework.Data.MSSQL
34{ 36{
@@ -99,8 +101,8 @@ namespace OpenSim.Framework.Data.MSSQL
99 Dictionary<string, string> param = new Dictionary<string, string>(); 101 Dictionary<string, string> param = new Dictionary<string, string>();
100 param["handle"] = handle.ToString(); 102 param["handle"] = handle.ToString();
101 103
102 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param); 104 IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
103 System.Data.IDataReader reader = result.ExecuteReader(); 105 IDataReader reader = result.ExecuteReader();
104 106
105 SimProfileData row = database.getRow(reader); 107 SimProfileData row = database.getRow(reader);
106 reader.Close(); 108 reader.Close();
@@ -114,13 +116,13 @@ namespace OpenSim.Framework.Data.MSSQL
114 /// </summary> 116 /// </summary>
115 /// <param name="uuid">The region UUID</param> 117 /// <param name="uuid">The region UUID</param>
116 /// <returns>The sim profile</returns> 118 /// <returns>The sim profile</returns>
117 public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid) 119 public SimProfileData GetProfileByLLUUID(LLUUID uuid)
118 { 120 {
119 Dictionary<string, string> param = new Dictionary<string, string>(); 121 Dictionary<string, string> param = new Dictionary<string, string>();
120 param["uuid"] = uuid.ToStringHyphenated(); 122 param["uuid"] = uuid.ToStringHyphenated();
121 123
122 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); 124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
123 System.Data.IDataReader reader = result.ExecuteReader(); 125 IDataReader reader = result.ExecuteReader();
124 126
125 SimProfileData row = database.getRow(reader); 127 SimProfileData row = database.getRow(reader);
126 reader.Close(); 128 reader.Close();
@@ -153,7 +155,7 @@ namespace OpenSim.Framework.Data.MSSQL
153 /// <param name="handle">The attempted regionHandle of the challenger</param> 155 /// <param name="handle">The attempted regionHandle of the challenger</param>
154 /// <param name="authkey">The secret</param> 156 /// <param name="authkey">The secret</param>
155 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 157 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
156 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey) 158 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
157 { 159 {
158 bool throwHissyFit = false; // Should be true by 1.0 160 bool throwHissyFit = false; // Should be true by 1.0
159 161
@@ -174,10 +176,10 @@ namespace OpenSim.Framework.Data.MSSQL
174 /// <param name="authhash"></param> 176 /// <param name="authhash"></param>
175 /// <param name="challenge"></param> 177 /// <param name="challenge"></param>
176 /// <returns></returns> 178 /// <returns></returns>
177 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge) 179 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
178 { 180 {
179 System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed(); 181 SHA512Managed HashProvider = new SHA512Managed();
180 System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding(); 182 ASCIIEncoding TextProvider = new ASCIIEncoding();
181 183
182 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 184 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
183 byte[] hash = HashProvider.ComputeHash(stream); 185 byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index 3c83c1f..49bf31c 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -27,12 +27,9 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using System.Data; 30using System.Data;
32
33using System.Data.SqlClient; 31using System.Data.SqlClient;
34 32using libsecondlife;
35using OpenSim.Framework.Data;
36 33
37namespace OpenSim.Framework.Data.MSSQL 34namespace OpenSim.Framework.Data.MSSQL
38{ 35{
@@ -110,7 +107,7 @@ namespace OpenSim.Framework.Data.MSSQL
110 // Region Main 107 // Region Main
111 regionprofile.regionHandle = (ulong)reader["regionHandle"]; 108 regionprofile.regionHandle = (ulong)reader["regionHandle"];
112 regionprofile.regionName = (string)reader["regionName"]; 109 regionprofile.regionName = (string)reader["regionName"];
113 regionprofile.UUID = new libsecondlife.LLUUID((string)reader["uuid"]); 110 regionprofile.UUID = new LLUUID((string)reader["uuid"]);
114 111
115 // Secrets 112 // Secrets
116 regionprofile.regionRecvKey = (string)reader["regionRecvKey"]; 113 regionprofile.regionRecvKey = (string)reader["regionRecvKey"];
diff --git a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
index af310e8..066c739 100644
--- a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MSSQL/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/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 43e3054..ef643d2 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -27,8 +27,10 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data;
31using System.Security.Cryptography;
30using System.Text; 32using System.Text;
31using OpenSim.Framework.Data; 33using libsecondlife;
32 34
33namespace OpenSim.Framework.Data.MySQL 35namespace OpenSim.Framework.Data.MySQL
34{ 36{
@@ -104,8 +106,8 @@ namespace OpenSim.Framework.Data.MySQL
104 param["?xmax"] = xmax.ToString(); 106 param["?xmax"] = xmax.ToString();
105 param["?ymax"] = ymax.ToString(); 107 param["?ymax"] = ymax.ToString();
106 108
107 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param); 109 IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
108 System.Data.IDataReader reader = result.ExecuteReader(); 110 IDataReader reader = result.ExecuteReader();
109 111
110 SimProfileData row; 112 SimProfileData row;
111 113
@@ -144,8 +146,8 @@ namespace OpenSim.Framework.Data.MySQL
144 Dictionary<string, string> param = new Dictionary<string, string>(); 146 Dictionary<string, string> param = new Dictionary<string, string>();
145 param["?handle"] = handle.ToString(); 147 param["?handle"] = handle.ToString();
146 148
147 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param); 149 IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
148 System.Data.IDataReader reader = result.ExecuteReader(); 150 IDataReader reader = result.ExecuteReader();
149 151
150 SimProfileData row = database.readSimRow(reader); 152 SimProfileData row = database.readSimRow(reader);
151 reader.Close(); 153 reader.Close();
@@ -167,7 +169,7 @@ namespace OpenSim.Framework.Data.MySQL
167 /// </summary> 169 /// </summary>
168 /// <param name="uuid">The region UUID</param> 170 /// <param name="uuid">The region UUID</param>
169 /// <returns>The sim profile</returns> 171 /// <returns>The sim profile</returns>
170 public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid) 172 public SimProfileData GetProfileByLLUUID(LLUUID uuid)
171 { 173 {
172 try 174 try
173 { 175 {
@@ -176,8 +178,8 @@ namespace OpenSim.Framework.Data.MySQL
176 Dictionary<string, string> param = new Dictionary<string, string>(); 178 Dictionary<string, string> param = new Dictionary<string, string>();
177 param["?uuid"] = uuid.ToStringHyphenated(); 179 param["?uuid"] = uuid.ToStringHyphenated();
178 180
179 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param); 181 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
180 System.Data.IDataReader reader = result.ExecuteReader(); 182 IDataReader reader = result.ExecuteReader();
181 183
182 SimProfileData row = database.readSimRow(reader); 184 SimProfileData row = database.readSimRow(reader);
183 reader.Close(); 185 reader.Close();
@@ -221,7 +223,7 @@ namespace OpenSim.Framework.Data.MySQL
221 /// <param name="handle">The attempted regionHandle of the challenger</param> 223 /// <param name="handle">The attempted regionHandle of the challenger</param>
222 /// <param name="authkey">The secret</param> 224 /// <param name="authkey">The secret</param>
223 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 225 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
224 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey) 226 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
225 { 227 {
226 bool throwHissyFit = false; // Should be true by 1.0 228 bool throwHissyFit = false; // Should be true by 1.0
227 229
@@ -242,10 +244,10 @@ namespace OpenSim.Framework.Data.MySQL
242 /// <param name="authhash"></param> 244 /// <param name="authhash"></param>
243 /// <param name="challenge"></param> 245 /// <param name="challenge"></param>
244 /// <returns></returns> 246 /// <returns></returns>
245 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge) 247 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
246 { 248 {
247 System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed(); 249 SHA512Managed HashProvider = new SHA512Managed();
248 System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding(); 250 ASCIIEncoding TextProvider = new ASCIIEncoding();
249 251
250 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 252 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
251 byte[] hash = HashProvider.ComputeHash(stream); 253 byte[] hash = HashProvider.ComputeHash(stream);
@@ -262,8 +264,8 @@ namespace OpenSim.Framework.Data.MySQL
262 Dictionary<string, string> param = new Dictionary<string, string>(); 264 Dictionary<string, string> param = new Dictionary<string, string>();
263 param["?x"] = x.ToString(); 265 param["?x"] = x.ToString();
264 param["?y"] = y.ToString(); 266 param["?y"] = y.ToString();
265 System.Data.IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param); 267 IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);
266 System.Data.IDataReader reader = result.ExecuteReader(); 268 IDataReader reader = result.ExecuteReader();
267 269
268 ReservationData row = database.readReservationRow(reader); 270 ReservationData row = database.readReservationRow(reader);
269 reader.Close(); 271 reader.Close();
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 434df1a..790759a 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -27,7 +27,7 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Data;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Framework.Data.MySQL 33namespace OpenSim.Framework.Data.MySQL
@@ -98,8 +98,8 @@ namespace OpenSim.Framework.Data.MySQL
98 Dictionary<string, string> param = new Dictionary<string, string>(); 98 Dictionary<string, string> param = new Dictionary<string, string>();
99 param["?uuid"] = folderID.ToStringHyphenated(); 99 param["?uuid"] = folderID.ToStringHyphenated();
100 100
101 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param); 101 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
102 System.Data.IDataReader reader = result.ExecuteReader(); 102 IDataReader reader = result.ExecuteReader();
103 103
104 List<InventoryItemBase> items = database.readInventoryItems(reader); 104 List<InventoryItemBase> items = database.readInventoryItems(reader);
105 105
@@ -132,8 +132,8 @@ namespace OpenSim.Framework.Data.MySQL
132 param["?uuid"] = user.ToStringHyphenated(); 132 param["?uuid"] = user.ToStringHyphenated();
133 param["?zero"] = LLUUID.Zero.ToStringHyphenated(); 133 param["?zero"] = LLUUID.Zero.ToStringHyphenated();
134 134
135 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param); 135 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
136 System.Data.IDataReader reader = result.ExecuteReader(); 136 IDataReader reader = result.ExecuteReader();
137 137
138 List<InventoryFolderBase> items = database.readInventoryFolders(reader); 138 List<InventoryFolderBase> items = database.readInventoryFolders(reader);
139 139
@@ -165,8 +165,8 @@ namespace OpenSim.Framework.Data.MySQL
165 Dictionary<string, string> param = new Dictionary<string, string>(); 165 Dictionary<string, string> param = new Dictionary<string, string>();
166 param["?uuid"] = parentID.ToStringHyphenated(); 166 param["?uuid"] = parentID.ToStringHyphenated();
167 167
168 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param); 168 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
169 System.Data.IDataReader reader = result.ExecuteReader(); 169 IDataReader reader = result.ExecuteReader();
170 170
171 List<InventoryFolderBase> items = database.readInventoryFolders(reader); 171 List<InventoryFolderBase> items = database.readInventoryFolders(reader);
172 172
@@ -198,8 +198,8 @@ namespace OpenSim.Framework.Data.MySQL
198 Dictionary<string, string> param = new Dictionary<string, string>(); 198 Dictionary<string, string> param = new Dictionary<string, string>();
199 param["?uuid"] = item.ToStringHyphenated(); 199 param["?uuid"] = item.ToStringHyphenated();
200 200
201 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param); 201 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
202 System.Data.IDataReader reader = result.ExecuteReader(); 202 IDataReader reader = result.ExecuteReader();
203 203
204 List<InventoryItemBase> items = database.readInventoryItems(reader); 204 List<InventoryItemBase> items = database.readInventoryItems(reader);
205 205
@@ -238,8 +238,8 @@ namespace OpenSim.Framework.Data.MySQL
238 Dictionary<string, string> param = new Dictionary<string, string>(); 238 Dictionary<string, string> param = new Dictionary<string, string>();
239 param["?uuid"] = folder.ToStringHyphenated(); 239 param["?uuid"] = folder.ToStringHyphenated();
240 240
241 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param); 241 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
242 System.Data.IDataReader reader = result.ExecuteReader(); 242 IDataReader reader = result.ExecuteReader();
243 243
244 List<InventoryFolderBase> items = database.readInventoryFolders(reader); 244 List<InventoryFolderBase> items = database.readInventoryFolders(reader);
245 245
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index 8265614..66f3399 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -26,8 +26,6 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework.Data.MySQL 30namespace OpenSim.Framework.Data.MySQL
33{ 31{
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index b2f398b..ab478ed 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -27,17 +27,10 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using System.Data; 30using System.Data;
32 31using libsecondlife;
33// MySQL Native
34using MySql;
35using MySql.Data;
36using MySql.Data.Types;
37using MySql.Data.MySqlClient; 32using MySql.Data.MySqlClient;
38 33
39using OpenSim.Framework.Data;
40
41namespace OpenSim.Framework.Data.MySQL 34namespace OpenSim.Framework.Data.MySQL
42{ 35{
43 /// <summary> 36 /// <summary>
@@ -71,7 +64,7 @@ namespace OpenSim.Framework.Data.MySQL
71 64
72 dbcon.Open(); 65 dbcon.Open();
73 66
74 System.Console.WriteLine("MySQL connection established"); 67 Console.WriteLine("MySQL connection established");
75 } 68 }
76 catch (Exception e) 69 catch (Exception e)
77 { 70 {
@@ -187,7 +180,7 @@ namespace OpenSim.Framework.Data.MySQL
187 // Region Main 180 // Region Main
188 retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString()); 181 retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString());
189 retval.regionName = (string)reader["regionName"]; 182 retval.regionName = (string)reader["regionName"];
190 retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]); 183 retval.UUID = new LLUUID((string)reader["uuid"]);
191 184
192 // Secrets 185 // Secrets
193 retval.regionRecvKey = (string)reader["regionRecvKey"]; 186 retval.regionRecvKey = (string)reader["regionRecvKey"];
@@ -226,11 +219,11 @@ namespace OpenSim.Framework.Data.MySQL
226 string tempRegionMap = reader["regionMapTexture"].ToString(); 219 string tempRegionMap = reader["regionMapTexture"].ToString();
227 if (tempRegionMap != "") 220 if (tempRegionMap != "")
228 { 221 {
229 retval.regionMapTextureID = new libsecondlife.LLUUID(tempRegionMap); 222 retval.regionMapTextureID = new LLUUID(tempRegionMap);
230 } 223 }
231 else 224 else
232 { 225 {
233 retval.regionMapTextureID = new libsecondlife.LLUUID(); 226 retval.regionMapTextureID = new LLUUID();
234 } 227 }
235 } 228 }
236 else 229 else
@@ -259,7 +252,7 @@ namespace OpenSim.Framework.Data.MySQL
259 retval.reservationMinY = (int)reader["resYMin"]; 252 retval.reservationMinY = (int)reader["resYMin"];
260 retval.reservationName = (string)reader["resName"]; 253 retval.reservationName = (string)reader["resName"];
261 retval.status = (bool)reader["status"]; 254 retval.status = (bool)reader["status"];
262 retval.userUUID = new libsecondlife.LLUUID((string)reader["userUUID"]); 255 retval.userUUID = new LLUUID((string)reader["userUUID"]);
263 256
264 } 257 }
265 else 258 else
@@ -280,9 +273,9 @@ namespace OpenSim.Framework.Data.MySQL
280 if (reader.Read()) 273 if (reader.Read())
281 { 274 {
282 // Agent IDs 275 // Agent IDs
283 retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]); 276 retval.UUID = new LLUUID((string)reader["UUID"]);
284 retval.sessionID = new libsecondlife.LLUUID((string)reader["sessionID"]); 277 retval.sessionID = new LLUUID((string)reader["sessionID"]);
285 retval.secureSessionID = new libsecondlife.LLUUID((string)reader["secureSessionID"]); 278 retval.secureSessionID = new LLUUID((string)reader["secureSessionID"]);
286 279
287 // Agent Who? 280 // Agent Who?
288 retval.agentIP = (string)reader["agentIP"]; 281 retval.agentIP = (string)reader["agentIP"];
@@ -296,7 +289,7 @@ namespace OpenSim.Framework.Data.MySQL
296 // Current position 289 // Current position
297 retval.currentRegion = (string)reader["currentRegion"]; 290 retval.currentRegion = (string)reader["currentRegion"];
298 retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString()); 291 retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
299 libsecondlife.LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); 292 LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
300 } 293 }
301 else 294 else
302 { 295 {
@@ -316,7 +309,7 @@ namespace OpenSim.Framework.Data.MySQL
316 309
317 if (reader.Read()) 310 if (reader.Read())
318 { 311 {
319 retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]); 312 retval.UUID = new LLUUID((string)reader["UUID"]);
320 retval.username = (string)reader["username"]; 313 retval.username = (string)reader["username"];
321 retval.surname = (string)reader["lastname"]; 314 retval.surname = (string)reader["lastname"];
322 315
@@ -324,11 +317,11 @@ namespace OpenSim.Framework.Data.MySQL
324 retval.passwordSalt = (string)reader["passwordSalt"]; 317 retval.passwordSalt = (string)reader["passwordSalt"];
325 318
326 retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); 319 retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
327 retval.homeLocation = new libsecondlife.LLVector3( 320 retval.homeLocation = new LLVector3(
328 Convert.ToSingle(reader["homeLocationX"].ToString()), 321 Convert.ToSingle(reader["homeLocationX"].ToString()),
329 Convert.ToSingle(reader["homeLocationY"].ToString()), 322 Convert.ToSingle(reader["homeLocationY"].ToString()),
330 Convert.ToSingle(reader["homeLocationZ"].ToString())); 323 Convert.ToSingle(reader["homeLocationZ"].ToString()));
331 retval.homeLookAt = new libsecondlife.LLVector3( 324 retval.homeLookAt = new LLVector3(
332 Convert.ToSingle(reader["homeLookAtX"].ToString()), 325 Convert.ToSingle(reader["homeLookAtX"].ToString()),
333 Convert.ToSingle(reader["homeLookAtY"].ToString()), 326 Convert.ToSingle(reader["homeLookAtY"].ToString()),
334 Convert.ToSingle(reader["homeLookAtZ"].ToString())); 327 Convert.ToSingle(reader["homeLookAtZ"].ToString()));
@@ -345,8 +338,8 @@ namespace OpenSim.Framework.Data.MySQL
345 retval.profileAboutText = (string)reader["profileAboutText"]; 338 retval.profileAboutText = (string)reader["profileAboutText"];
346 retval.profileFirstText = (string)reader["profileFirstText"]; 339 retval.profileFirstText = (string)reader["profileFirstText"];
347 340
348 retval.profileImage = new libsecondlife.LLUUID((string)reader["profileImage"]); 341 retval.profileImage = new LLUUID((string)reader["profileImage"]);
349 retval.profileFirstImage = new libsecondlife.LLUUID((string)reader["profileFirstImage"]); 342 retval.profileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
350 343
351 } 344 }
352 else 345 else
@@ -371,9 +364,9 @@ namespace OpenSim.Framework.Data.MySQL
371 { 364 {
372 InventoryFolderBase folder = new InventoryFolderBase(); 365 InventoryFolderBase folder = new InventoryFolderBase();
373 366
374 folder.agentID = new libsecondlife.LLUUID((string)reader["agentID"]); 367 folder.agentID = new LLUUID((string)reader["agentID"]);
375 folder.parentID = new libsecondlife.LLUUID((string)reader["parentFolderID"]); 368 folder.parentID = new LLUUID((string)reader["parentFolderID"]);
376 folder.folderID = new libsecondlife.LLUUID((string)reader["folderID"]); 369 folder.folderID = new LLUUID((string)reader["folderID"]);
377 folder.name = (string)reader["folderName"]; 370 folder.name = (string)reader["folderName"];
378 371
379 rows.Add(folder); 372 rows.Add(folder);
@@ -402,14 +395,14 @@ namespace OpenSim.Framework.Data.MySQL
402 { 395 {
403 InventoryItemBase item = new InventoryItemBase(); 396 InventoryItemBase item = new InventoryItemBase();
404 397
405 item.assetID = new libsecondlife.LLUUID((string)reader["assetID"]); 398 item.assetID = new LLUUID((string)reader["assetID"]);
406 item.avatarID = new libsecondlife.LLUUID((string)reader["avatarID"]); 399 item.avatarID = new LLUUID((string)reader["avatarID"]);
407 item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString()); 400 item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString());
408 item.inventoryDescription = (string)reader["inventoryDescription"]; 401 item.inventoryDescription = (string)reader["inventoryDescription"];
409 item.inventoryID = new libsecondlife.LLUUID((string)reader["inventoryID"]); 402 item.inventoryID = new LLUUID((string)reader["inventoryID"]);
410 item.inventoryName = (string)reader["inventoryName"]; 403 item.inventoryName = (string)reader["inventoryName"];
411 item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString()); 404 item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
412 item.parentFolderID = new libsecondlife.LLUUID((string)reader["parentFolderID"]); 405 item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);
413 item.type = Convert.ToInt32(reader["type"].ToString()); 406 item.type = Convert.ToInt32(reader["type"].ToString());
414 407
415 rows.Add(item); 408 rows.Add(item);
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 0304452..c116536 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -27,8 +27,7 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Data;
31using OpenSim.Framework.Data;
32using libsecondlife; 31using libsecondlife;
33 32
34namespace OpenSim.Framework.Data.MySQL 33namespace OpenSim.Framework.Data.MySQL
@@ -87,8 +86,8 @@ namespace OpenSim.Framework.Data.MySQL
87 param["?first"] = user; 86 param["?first"] = user;
88 param["?second"] = last; 87 param["?second"] = last;
89 88
90 System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param); 89 IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);
91 System.Data.IDataReader reader = result.ExecuteReader(); 90 IDataReader reader = result.ExecuteReader();
92 91
93 UserProfileData row = database.readUserRow(reader); 92 UserProfileData row = database.readUserRow(reader);
94 93
@@ -120,8 +119,8 @@ namespace OpenSim.Framework.Data.MySQL
120 Dictionary<string, string> param = new Dictionary<string, string>(); 119 Dictionary<string, string> param = new Dictionary<string, string>();
121 param["?uuid"] = uuid.ToStringHyphenated(); 120 param["?uuid"] = uuid.ToStringHyphenated();
122 121
123 System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param); 122 IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
124 System.Data.IDataReader reader = result.ExecuteReader(); 123 IDataReader reader = result.ExecuteReader();
125 124
126 UserProfileData row = database.readUserRow(reader); 125 UserProfileData row = database.readUserRow(reader);
127 126
@@ -175,8 +174,8 @@ namespace OpenSim.Framework.Data.MySQL
175 Dictionary<string, string> param = new Dictionary<string, string>(); 174 Dictionary<string, string> param = new Dictionary<string, string>();
176 param["?uuid"] = uuid.ToStringHyphenated(); 175 param["?uuid"] = uuid.ToStringHyphenated();
177 176
178 System.Data.IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param); 177 IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
179 System.Data.IDataReader reader = result.ExecuteReader(); 178 IDataReader reader = result.ExecuteReader();
180 179
181 UserAgentData row = database.readAgentRow(reader); 180 UserAgentData row = database.readAgentRow(reader);
182 181
diff --git a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
index d67ccf6..52d6a54 100644
--- a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MySQL/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/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index f811825..9de5edb 100644
--- a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.SQLite/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/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index 800e26c..511c5f0 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -27,8 +27,10 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data;
31using System.Security.Cryptography;
30using System.Text; 32using System.Text;
31using OpenSim.Framework.Data; 33using libsecondlife;
32 34
33namespace OpenSim.Framework.Data.SQLite 35namespace OpenSim.Framework.Data.SQLite
34{ 36{
@@ -99,8 +101,8 @@ namespace OpenSim.Framework.Data.SQLite
99 Dictionary<string, string> param = new Dictionary<string, string>(); 101 Dictionary<string, string> param = new Dictionary<string, string>();
100 param["handle"] = handle.ToString(); 102 param["handle"] = handle.ToString();
101 103
102 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param); 104 IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
103 System.Data.IDataReader reader = result.ExecuteReader(); 105 IDataReader reader = result.ExecuteReader();
104 106
105 SimProfileData row = database.getRow(reader); 107 SimProfileData row = database.getRow(reader);
106 reader.Close(); 108 reader.Close();
@@ -114,13 +116,13 @@ namespace OpenSim.Framework.Data.SQLite
114 /// </summary> 116 /// </summary>
115 /// <param name="uuid">The region UUID</param> 117 /// <param name="uuid">The region UUID</param>
116 /// <returns>The sim profile</returns> 118 /// <returns>The sim profile</returns>
117 public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid) 119 public SimProfileData GetProfileByLLUUID(LLUUID uuid)
118 { 120 {
119 Dictionary<string, string> param = new Dictionary<string, string>(); 121 Dictionary<string, string> param = new Dictionary<string, string>();
120 param["uuid"] = uuid.ToStringHyphenated(); 122 param["uuid"] = uuid.ToStringHyphenated();
121 123
122 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); 124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
123 System.Data.IDataReader reader = result.ExecuteReader(); 125 IDataReader reader = result.ExecuteReader();
124 126
125 SimProfileData row = database.getRow(reader); 127 SimProfileData row = database.getRow(reader);
126 reader.Close(); 128 reader.Close();
@@ -153,7 +155,7 @@ namespace OpenSim.Framework.Data.SQLite
153 /// <param name="handle">The attempted regionHandle of the challenger</param> 155 /// <param name="handle">The attempted regionHandle of the challenger</param>
154 /// <param name="authkey">The secret</param> 156 /// <param name="authkey">The secret</param>
155 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 157 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
156 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey) 158 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
157 { 159 {
158 bool throwHissyFit = false; // Should be true by 1.0 160 bool throwHissyFit = false; // Should be true by 1.0
159 161
@@ -174,10 +176,10 @@ namespace OpenSim.Framework.Data.SQLite
174 /// <param name="authhash"></param> 176 /// <param name="authhash"></param>
175 /// <param name="challenge"></param> 177 /// <param name="challenge"></param>
176 /// <returns></returns> 178 /// <returns></returns>
177 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge) 179 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
178 { 180 {
179 System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed(); 181 SHA512Managed HashProvider = new SHA512Managed();
180 System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding(); 182 ASCIIEncoding TextProvider = new ASCIIEncoding();
181 183
182 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 184 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
183 byte[] hash = HashProvider.ComputeHash(stream); 185 byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index 3397e0d..c9931ab 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -27,12 +27,9 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using System.Data; 30using System.Data;
32
33using System.Data.SQLite; 31using System.Data.SQLite;
34 32using libsecondlife;
35using OpenSim.Framework.Data;
36 33
37namespace OpenSim.Framework.Data.SQLite 34namespace OpenSim.Framework.Data.SQLite
38{ 35{
@@ -105,7 +102,7 @@ namespace OpenSim.Framework.Data.SQLite
105 // Region Main 102 // Region Main
106 retval.regionHandle = (ulong)reader["regionHandle"]; 103 retval.regionHandle = (ulong)reader["regionHandle"];
107 retval.regionName = (string)reader["regionName"]; 104 retval.regionName = (string)reader["regionName"];
108 retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]); 105 retval.UUID = new LLUUID((string)reader["uuid"]);
109 106
110 // Secrets 107 // Secrets
111 retval.regionRecvKey = (string)reader["regionRecvKey"]; 108 retval.regionRecvKey = (string)reader["regionRecvKey"];
diff --git a/OpenSim/Framework/Data/GridData.cs b/OpenSim/Framework/Data/GridData.cs
index 7f8fdaf..5a17d20 100644
--- a/OpenSim/Framework/Data/GridData.cs
+++ b/OpenSim/Framework/Data/GridData.cs
@@ -25,9 +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; 28using libsecondlife;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework.Data 30namespace OpenSim.Framework.Data
33{ 31{
@@ -56,7 +54,7 @@ namespace OpenSim.Framework.Data
56 /// </summary> 54 /// </summary>
57 /// <param name="UUID">A 128bit UUID</param> 55 /// <param name="UUID">A 128bit UUID</param>
58 /// <returns>A sim profile</returns> 56 /// <returns>A sim profile</returns>
59 SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID); 57 SimProfileData GetProfileByLLUUID(LLUUID UUID);
60 58
61 /// <summary> 59 /// <summary>
62 /// Returns all profiles within the specified range 60 /// Returns all profiles within the specified range
@@ -76,7 +74,7 @@ namespace OpenSim.Framework.Data
76 /// <param name="regionHandle">The regionhandle sent by the sim</param> 74 /// <param name="regionHandle">The regionhandle sent by the sim</param>
77 /// <param name="simrecvkey">The recieving key sent by the sim</param> 75 /// <param name="simrecvkey">The recieving key sent by the sim</param>
78 /// <returns>Whether the sim has been authenticated</returns> 76 /// <returns>Whether the sim has been authenticated</returns>
79 bool AuthenticateSim(libsecondlife.LLUUID UUID, ulong regionHandle, string simrecvkey); 77 bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
80 78
81 /// <summary> 79 /// <summary>
82 /// Initialises the interface 80 /// Initialises the interface
diff --git a/OpenSim/Framework/Data/ILogData.cs b/OpenSim/Framework/Data/ILogData.cs
index ccb3b84..059fef5 100644
--- a/OpenSim/Framework/Data/ILogData.cs
+++ b/OpenSim/Framework/Data/ILogData.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.Framework.Data 28namespace OpenSim.Framework.Data
33{ 29{
34 /// <summary> 30 /// <summary>
diff --git a/OpenSim/Framework/Data/IniConfig.cs b/OpenSim/Framework/Data/IniConfig.cs
index 2f002c1..2b52fd1 100644
--- a/OpenSim/Framework/Data/IniConfig.cs
+++ b/OpenSim/Framework/Data/IniConfig.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;
31using System.IO; 28using System.IO;
32using System.Text.RegularExpressions; 29using System.Text.RegularExpressions;
33
34/* 30/*
35 Taken from public code listing at by Alex Pinsker 31 Taken from public code listing at by Alex Pinsker
36 http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html 32 http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index 8a3a664..c2a1d06 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -25,9 +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; 28using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework.Data 31namespace OpenSim.Framework.Data
diff --git a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
index 7d749d5..f9260a1 100644
--- a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data/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/Framework/Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs
index f404ebd..0078df0 100644
--- a/OpenSim/Framework/Data/ReservationData.cs
+++ b/OpenSim/Framework/Data/ReservationData.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.Framework.Data 30namespace OpenSim.Framework.Data
diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index 201aa01..3dddfb4 100644
--- a/OpenSim/Framework/Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -25,9 +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; 28using libsecondlife;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework.Data 30namespace OpenSim.Framework.Data
33{ 31{
@@ -49,7 +47,7 @@ namespace OpenSim.Framework.Data
49 /// <summary> 47 /// <summary>
50 /// OGS/OpenSim Specific ID for a region 48 /// OGS/OpenSim Specific ID for a region
51 /// </summary> 49 /// </summary>
52 public libsecondlife.LLUUID UUID; 50 public LLUUID UUID;
53 51
54 /// <summary> 52 /// <summary>
55 /// Coordinates of the region 53 /// Coordinates of the region
@@ -109,6 +107,6 @@ namespace OpenSim.Framework.Data
109 /// <summary> 107 /// <summary>
110 /// Region Map Texture Asset 108 /// Region Map Texture Asset
111 /// </summary> 109 /// </summary>
112 public libsecondlife.LLUUID regionMapTextureID = new libsecondlife.LLUUID("00000000-0000-0000-9999-000000000006"); 110 public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006");
113 } 111 }
114} 112}
diff --git a/OpenSim/Framework/Data/UserData.cs b/OpenSim/Framework/Data/UserData.cs
index 2e15b47..c65f9fd 100644
--- a/OpenSim/Framework/Data/UserData.cs
+++ b/OpenSim/Framework/Data/UserData.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Data 30namespace OpenSim.Framework.Data
diff --git a/OpenSim/Framework/Data/UserProfileData.cs b/OpenSim/Framework/Data/UserProfileData.cs
index ac168e0..bb7d48c 100644
--- a/OpenSim/Framework/Data/UserProfileData.cs
+++ b/OpenSim/Framework/Data/UserProfileData.cs
@@ -26,8 +26,6 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework.Data 31namespace OpenSim.Framework.Data
diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
index fbf4d23..e45a0cd 100644
--- a/OpenSim/Framework/General/AgentInventory.cs
+++ b/OpenSim/Framework/General/AgentInventory.cs
@@ -25,9 +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; 28using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32using libsecondlife.Packets; 30using libsecondlife.Packets;
33using OpenSim.Framework.Types; 31using OpenSim.Framework.Types;
diff --git a/OpenSim/Framework/General/AuthenticateSessionBase.cs b/OpenSim/Framework/General/AuthenticateSessionBase.cs
index 73dd3e2..71616e3 100644
--- a/OpenSim/Framework/General/AuthenticateSessionBase.cs
+++ b/OpenSim/Framework/General/AuthenticateSessionBase.cs
@@ -25,9 +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; 28using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32using OpenSim.Framework.Interfaces; 30using OpenSim.Framework.Interfaces;
33using OpenSim.Framework.Types; 31using OpenSim.Framework.Types;
diff --git a/OpenSim/Framework/General/BlockingQueue.cs b/OpenSim/Framework/General/BlockingQueue.cs
index 667b8d8..0cc8124 100644
--- a/OpenSim/Framework/General/BlockingQueue.cs
+++ b/OpenSim/Framework/General/BlockingQueue.cs
@@ -25,10 +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.Threading;
30using System.Collections.Generic; 28using System.Collections.Generic;
31using System.Text; 29using System.Threading;
32 30
33namespace OpenSim.Framework.Utilities 31namespace OpenSim.Framework.Utilities
34{ 32{
diff --git a/OpenSim/Framework/General/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
index 0e80941..32444f9 100644
--- a/OpenSim/Framework/General/IRegionCommsListener.cs
+++ b/OpenSim/Framework/General/IRegionCommsListener.cs
@@ -25,9 +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;
30using System.Text; 29using libsecondlife;
31using OpenSim.Framework.Interfaces; 30using OpenSim.Framework.Interfaces;
32using OpenSim.Framework.Types; 31using OpenSim.Framework.Types;
33 32
@@ -35,7 +34,7 @@ namespace OpenSim.Framework
35{ 34{
36 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent); 35 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
37 public delegate void UpdateNeighbours(List<RegionInfo> neighbours); 36 public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
38 public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 37 public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position);
39 38
40 public interface IRegionCommsListener 39 public interface IRegionCommsListener
41 { 40 {
diff --git a/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
index 462e2c5..508485b 100644
--- a/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
+++ b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs
@@ -25,14 +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;
30using System.Collections.Generic;
31using System.Net;
32using System.Net.Sockets;
33using System.IO;
34using libsecondlife;
35using OpenSim;
36using OpenSim.Framework.Types; 28using OpenSim.Framework.Types;
37 29
38namespace OpenSim.Framework.Interfaces 30namespace OpenSim.Framework.Interfaces
diff --git a/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
index 13980fe..2c379dd 100644
--- a/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.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.Framework.Interfaces 28namespace OpenSim.Framework.Interfaces
33{ 29{
34 public interface IGenericConfig 30 public interface IGenericConfig
diff --git a/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
index 0fafe1a..81dc293 100644
--- a/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs
@@ -26,10 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.IO;
32using libsecondlife;
33//using OpenSim.world; 29//using OpenSim.world;
34 30
35namespace OpenSim.Framework.Interfaces 31namespace OpenSim.Framework.Interfaces
diff --git a/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
index 2f4b340..ae6cedb 100644
--- a/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
+++ b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs
@@ -26,10 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.IO;
32using libsecondlife;
33//using OpenSim.world; 29//using OpenSim.world;
34 30
35namespace OpenSim.Framework.Interfaces 31namespace OpenSim.Framework.Interfaces
diff --git a/OpenSim/Framework/General/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
index 826392d..ab60dd7 100644
--- a/OpenSim/Framework/General/Interfaces/IAssetServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
@@ -25,11 +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.Net;
30using System.Net.Sockets;
31using System.IO;
32using System.Threading;
33using libsecondlife; 28using libsecondlife;
34using OpenSim.Framework.Types; 29using OpenSim.Framework.Types;
35 30
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index d62247c..b5a0a0b 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -25,14 +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; 29using System.Net;
31using OpenSim.Framework.Inventory;
32using libsecondlife; 30using libsecondlife;
33using libsecondlife.Packets; 31using libsecondlife.Packets;
34using OpenSim.Framework.Types; 32using OpenSim.Framework.Types;
35using System.Net;
36 33
37namespace OpenSim.Framework.Interfaces 34namespace OpenSim.Framework.Interfaces
38{ 35{
diff --git a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
index 4987d10..dbdb25d 100644
--- a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
+++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs
@@ -26,7 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using libsecondlife; 29using libsecondlife;
31using OpenSim.Framework.Types; 30using OpenSim.Framework.Types;
32 31
diff --git a/OpenSim/Framework/General/Interfaces/IUserServer.cs b/OpenSim/Framework/General/Interfaces/IUserServer.cs
index c6e2223..b3700d2 100644
--- a/OpenSim/Framework/General/Interfaces/IUserServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IUserServer.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;
31using OpenSim.Framework.Inventory;
32using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework.Inventory;
33 30
34namespace OpenSim.Framework.Interfaces 31namespace OpenSim.Framework.Interfaces
35{ 32{
diff --git a/OpenSim/Framework/General/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IWorld.cs
index 2edc0b4..204c01b 100644
--- a/OpenSim/Framework/General/Interfaces/IWorld.cs
+++ b/OpenSim/Framework/General/Interfaces/IWorld.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 libsecondlife; 28using libsecondlife;
32using OpenSim.Framework.Types; 29using OpenSim.Framework.Types;
33 30
diff --git a/OpenSim/Framework/General/LoginService.cs b/OpenSim/Framework/General/LoginService.cs
index f14754f..02efcec 100644
--- a/OpenSim/Framework/General/LoginService.cs
+++ b/OpenSim/Framework/General/LoginService.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;
30using System.Collections.Generic;
31using System.Text;
32using Nwc.XmlRpc;
33using libsecondlife;
34
35namespace OpenSim.Framework.Grid 28namespace OpenSim.Framework.Grid
36{ 29{
37 public abstract class LoginService 30 public abstract class LoginService
diff --git a/OpenSim/Framework/General/Properties/AssemblyInfo.cs b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
index 86f5cdb..004040b 100644
--- a/OpenSim/Framework/General/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/General/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/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index 5fa2f58..2b0bc62 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -25,9 +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; 28using libsecondlife;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework.Interfaces; 29using OpenSim.Framework.Interfaces;
32using OpenSim.Framework.Types; 30using OpenSim.Framework.Types;
33 31
@@ -57,7 +55,7 @@ namespace OpenSim.Framework
57 return false; 55 return false;
58 } 56 }
59 57
60 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 58 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
61 { 59 {
62 if (OnAvatarCrossingIntoRegion != null) 60 if (OnAvatarCrossingIntoRegion != null)
63 { 61 {
diff --git a/OpenSim/Framework/General/Remoting.cs b/OpenSim/Framework/General/Remoting.cs
index e6fdf70..df32db2 100644
--- a/OpenSim/Framework/General/Remoting.cs
+++ b/OpenSim/Framework/General/Remoting.cs
@@ -26,9 +26,8 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Security.Cryptography; 29using System.Security.Cryptography;
30using System.Text;
32 31
33namespace OpenSim.Framework 32namespace OpenSim.Framework
34{ 33{
diff --git a/OpenSim/Framework/General/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
index cfa5e50..47f1af3 100644
--- a/OpenSim/Framework/General/SimProfile.cs
+++ b/OpenSim/Framework/General/SimProfile.cs
@@ -26,10 +26,7 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Collections; 29using System.Collections;
31using System.Xml;
32using System.Text;
33using libsecondlife; 30using libsecondlife;
34using Nwc.XmlRpc; 31using Nwc.XmlRpc;
35 32
diff --git a/OpenSim/Framework/General/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs
index a650343..00e9d0a 100644
--- a/OpenSim/Framework/General/Types/AgentCiruitData.cs
+++ b/OpenSim/Framework/General/Types/AgentCiruitData.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace OpenSim.Framework.Types
diff --git a/OpenSim/Framework/General/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 4c93da7..6152b7d 100644
--- a/OpenSim/Framework/General/Types/AgentWearable.cs
+++ b/OpenSim/Framework/General/Types/AgentWearable.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace OpenSim.Framework.Types
diff --git a/OpenSim/Framework/General/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs
index 86586a6..c203f51 100644
--- a/OpenSim/Framework/General/Types/AssetBase.cs
+++ b/OpenSim/Framework/General/Types/AssetBase.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace OpenSim.Framework.Types
diff --git a/OpenSim/Framework/General/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs
index 8a10b70..8aa872e 100644
--- a/OpenSim/Framework/General/Types/AssetLandmark.cs
+++ b/OpenSim/Framework/General/Types/AssetLandmark.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;
29using System.Collections.Generic;
30using System.Text; 28using System.Text;
31using libsecondlife; 29using libsecondlife;
32 30
@@ -51,7 +49,7 @@ namespace OpenSim.Framework.Types
51 49
52 private void InternData() 50 private void InternData()
53 { 51 {
54 string temp = System.Text.Encoding.UTF8.GetString(Data).Trim(); 52 string temp = Encoding.UTF8.GetString(Data).Trim();
55 string[] parts = temp.Split('\n'); 53 string[] parts = temp.Split('\n');
56 int.TryParse(parts[0].Substring(17, 1), out Version); 54 int.TryParse(parts[0].Substring(17, 1), out Version);
57 LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID); 55 LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);
diff --git a/OpenSim/Framework/General/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs
index 8cac23a..3681336 100644
--- a/OpenSim/Framework/General/Types/AssetStorage.cs
+++ b/OpenSim/Framework/General/Types/AssetStorage.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace OpenSim.Framework.Types
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index 778c893..436b109 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
@@ -26,10 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32
33using libsecondlife; 29using libsecondlife;
34 30
35namespace OpenSim.Framework.Types 31namespace OpenSim.Framework.Types
@@ -46,8 +42,8 @@ namespace OpenSim.Framework.Types
46 42
47 public int redirectGridX = 0; //?? 43 public int redirectGridX = 0; //??
48 public int redirectGridY = 0; //?? 44 public int redirectGridY = 0; //??
49 public libsecondlife.Simulator.RegionFlags regionFlags = libsecondlife.Simulator.RegionFlags.None; //Booleam values of various region settings 45 public Simulator.RegionFlags regionFlags = Simulator.RegionFlags.None; //Booleam values of various region settings
50 public libsecondlife.Simulator.SimAccess simAccess = libsecondlife.Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default. 46 public Simulator.SimAccess simAccess = Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
51 public float sunHour = 0; 47 public float sunHour = 0;
52 48
53 public float terrainRaiseLimit = 0; 49 public float terrainRaiseLimit = 0;
diff --git a/OpenSim/Framework/General/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs
index 3180a16..d54c019 100644
--- a/OpenSim/Framework/General/Types/Login.cs
+++ b/OpenSim/Framework/General/Types/Login.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace OpenSim.Framework.Types
diff --git a/OpenSim/Framework/General/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs
index 2e6f56e..fbb3b73 100644
--- a/OpenSim/Framework/General/Types/MapBlockData.cs
+++ b/OpenSim/Framework/General/Types/MapBlockData.cs
@@ -1,6 +1,4 @@
1using System; 1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife; 2using libsecondlife;
5 3
6namespace OpenSim.Framework.Types 4namespace OpenSim.Framework.Types
diff --git a/OpenSim/Framework/General/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs
index 310fd1c..bb67981 100644
--- a/OpenSim/Framework/General/Types/NeighbourInfo.cs
+++ b/OpenSim/Framework/General/Types/NeighbourInfo.cs
@@ -25,14 +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.Interfaces;
32using OpenSim.Framework.Utilities;
33using OpenSim.Framework.Console;
34using libsecondlife;
35
36namespace OpenSim.Framework.Types 28namespace OpenSim.Framework.Types
37{ 29{
38 public class NeighbourInfo 30 public class NeighbourInfo
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index c6b81a7..89ebf94 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -26,8 +26,7 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using OpenSim.Framework.Console;
30using System.Text;
31using OpenSim.Framework.Interfaces; 30using OpenSim.Framework.Interfaces;
32 31
33namespace OpenSim.Framework.Types 32namespace OpenSim.Framework.Types
@@ -63,7 +62,7 @@ namespace OpenSim.Framework.Types
63 attri = configData.GetAttribute("HttpListenerPort"); 62 attri = configData.GetAttribute("HttpListenerPort");
64 if (attri == "") 63 if (attri == "")
65 { 64 {
66 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Http Listener Port", "9000"); 65 string location = MainLog.Instance.CmdPrompt("Http Listener Port", "9000");
67 configData.SetAttribute("HttpListenerPort", location); 66 configData.SetAttribute("HttpListenerPort", location);
68 this.HttpListenerPort = Convert.ToInt32(location); 67 this.HttpListenerPort = Convert.ToInt32(location);
69 } 68 }
@@ -76,7 +75,7 @@ namespace OpenSim.Framework.Types
76 attri = configData.GetAttribute("RemotingListenerPort"); 75 attri = configData.GetAttribute("RemotingListenerPort");
77 if (attri == "") 76 if (attri == "")
78 { 77 {
79 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895"); 78 string location = MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");
80 configData.SetAttribute("RemotingListenerPort", location); 79 configData.SetAttribute("RemotingListenerPort", location);
81 this.RemotingListenerPort = Convert.ToInt32(location); 80 this.RemotingListenerPort = Convert.ToInt32(location);
82 } 81 }
@@ -92,7 +91,7 @@ namespace OpenSim.Framework.Types
92 attri = configData.GetAttribute("DefaultLocationX"); 91 attri = configData.GetAttribute("DefaultLocationX");
93 if (attri == "") 92 if (attri == "")
94 { 93 {
95 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000"); 94 string location = MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
96 configData.SetAttribute("DefaultLocationX", location); 95 configData.SetAttribute("DefaultLocationX", location);
97 this.DefaultHomeLocX = (uint)Convert.ToUInt32(location); 96 this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
98 } 97 }
@@ -106,7 +105,7 @@ namespace OpenSim.Framework.Types
106 attri = configData.GetAttribute("DefaultLocationY"); 105 attri = configData.GetAttribute("DefaultLocationY");
107 if (attri == "") 106 if (attri == "")
108 { 107 {
109 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000"); 108 string location = MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
110 configData.SetAttribute("DefaultLocationY", location); 109 configData.SetAttribute("DefaultLocationY", location);
111 this.DefaultHomeLocY = (uint)Convert.ToUInt32(location); 110 this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
112 } 111 }
@@ -122,7 +121,7 @@ namespace OpenSim.Framework.Types
122 attri = configData.GetAttribute("GridServerURL"); 121 attri = configData.GetAttribute("GridServerURL");
123 if (attri == "") 122 if (attri == "")
124 { 123 {
125 this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/"); 124 this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
126 configData.SetAttribute("GridServerURL", this.GridURL); 125 configData.SetAttribute("GridServerURL", this.GridURL);
127 } 126 }
128 else 127 else
@@ -135,7 +134,7 @@ namespace OpenSim.Framework.Types
135 attri = configData.GetAttribute("GridSendKey"); 134 attri = configData.GetAttribute("GridSendKey");
136 if (attri == "") 135 if (attri == "")
137 { 136 {
138 this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null"); 137 this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
139 configData.SetAttribute("GridSendKey", this.GridSendKey); 138 configData.SetAttribute("GridSendKey", this.GridSendKey);
140 } 139 }
141 else 140 else
@@ -148,7 +147,7 @@ namespace OpenSim.Framework.Types
148 attri = configData.GetAttribute("GridRecvKey"); 147 attri = configData.GetAttribute("GridRecvKey");
149 if (attri == "") 148 if (attri == "")
150 { 149 {
151 this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null"); 150 this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
152 configData.SetAttribute("GridRecvKey", this.GridRecvKey); 151 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
153 } 152 }
154 else 153 else
@@ -161,7 +160,7 @@ namespace OpenSim.Framework.Types
161 attri = configData.GetAttribute("UserServerURL"); 160 attri = configData.GetAttribute("UserServerURL");
162 if (attri == "") 161 if (attri == "")
163 { 162 {
164 this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/"); 163 this.UserURL= MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
165 configData.SetAttribute("UserServerURL", this.UserURL); 164 configData.SetAttribute("UserServerURL", this.UserURL);
166 } 165 }
167 else 166 else
@@ -174,7 +173,7 @@ namespace OpenSim.Framework.Types
174 attri = configData.GetAttribute("UserSendKey"); 173 attri = configData.GetAttribute("UserSendKey");
175 if (attri == "") 174 if (attri == "")
176 { 175 {
177 this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null"); 176 this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server", "null");
178 configData.SetAttribute("UserSendKey", this.UserSendKey); 177 configData.SetAttribute("UserSendKey", this.UserSendKey);
179 } 178 }
180 else 179 else
@@ -187,7 +186,7 @@ namespace OpenSim.Framework.Types
187 attri = configData.GetAttribute("UserRecvKey"); 186 attri = configData.GetAttribute("UserRecvKey");
188 if (attri == "") 187 if (attri == "")
189 { 188 {
190 this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); 189 this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
191 configData.SetAttribute("GridRecvKey", this.UserRecvKey); 190 configData.SetAttribute("GridRecvKey", this.UserRecvKey);
192 } 191 }
193 else 192 else
@@ -199,7 +198,7 @@ namespace OpenSim.Framework.Types
199 attri = configData.GetAttribute("AssetServerURL"); 198 attri = configData.GetAttribute("AssetServerURL");
200 if (attri == "") 199 if (attri == "")
201 { 200 {
202 this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/"); 201 this.AssetURL = MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
203 configData.SetAttribute("AssetServerURL", this.GridURL); 202 configData.SetAttribute("AssetServerURL", this.GridURL);
204 } 203 }
205 else 204 else
@@ -212,8 +211,8 @@ namespace OpenSim.Framework.Types
212 } 211 }
213 catch (Exception e) 212 catch (Exception e)
214 { 213 {
215 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 214 MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
216 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 215 MainLog.Instance.Warn(e.ToString());
217 } 216 }
218 } 217 }
219 } 218 }
diff --git a/OpenSim/Framework/General/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
index 40f128a..761d55e 100644
--- a/OpenSim/Framework/General/Types/ParcelData.cs
+++ b/OpenSim/Framework/General/Types/ParcelData.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 libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Framework.Types 30namespace OpenSim.Framework.Types
@@ -45,14 +42,14 @@ namespace OpenSim.Framework.Types
45 public int area = 0; 42 public int area = 0;
46 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned 43 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
47 public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID 44 public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
48 public libsecondlife.Parcel.ParcelCategory category = new libsecondlife.Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category 45 public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
49 public int claimDate = 0; //Unemplemented 46 public int claimDate = 0; //Unemplemented
50 public int claimPrice = 0; //Unemplemented 47 public int claimPrice = 0; //Unemplemented
51 public LLUUID groupID = new LLUUID(); //Unemplemented 48 public LLUUID groupID = new LLUUID(); //Unemplemented
52 public int groupPrims = 0; //Unemplemented 49 public int groupPrims = 0; //Unemplemented
53 public int salePrice = 0; //Unemeplemented. Parcels price. 50 public int salePrice = 0; //Unemeplemented. Parcels price.
54 public libsecondlife.Parcel.ParcelStatus parcelStatus = libsecondlife.Parcel.ParcelStatus.None; 51 public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.None;
55 public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None; 52 public Parcel.ParcelFlags parcelFlags = Parcel.ParcelFlags.None;
56 public byte landingType = 0; 53 public byte landingType = 0;
57 public byte mediaAutoScale = 0; 54 public byte mediaAutoScale = 0;
58 public LLUUID mediaID = LLUUID.Zero; 55 public LLUUID mediaID = LLUUID.Zero;
diff --git a/OpenSim/Framework/General/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs
index f84ae3e..ff81bcd 100644
--- a/OpenSim/Framework/General/Types/PrimData.cs
+++ b/OpenSim/Framework/General/Types/PrimData.cs
@@ -26,8 +26,6 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 29using libsecondlife;
32 30
33namespace OpenSim.Framework.Types 31namespace OpenSim.Framework.Types
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 584bc9b..1357e06 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -1,9 +1,4 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife; 1using libsecondlife;
5using libsecondlife.Packets;
6using OpenSim.Framework.Interfaces;
7 2
8namespace OpenSim.Framework.Types 3namespace OpenSim.Framework.Types
9{ 4{
diff --git a/OpenSim/Framework/General/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs
index 1271d04..409b05a 100644
--- a/OpenSim/Framework/General/Types/RegionHandle.cs
+++ b/OpenSim/Framework/General/Types/RegionHandle.cs
@@ -1,6 +1,4 @@
1using System; 1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.Net; 2using System.Net;
5 3
6namespace OpenSim.Framework.Types 4namespace OpenSim.Framework.Types
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 7b99d06..4602dcf 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -26,14 +26,13 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Globalization; 29using System.Globalization;
30using System.Net;
31using System.Net.Sockets;
32using libsecondlife;
33using OpenSim.Framework.Console;
32using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
33using OpenSim.Framework.Utilities; 35using OpenSim.Framework.Utilities;
34using OpenSim.Framework.Console;
35using libsecondlife;
36using System.Net;
37 36
38namespace OpenSim.Framework.Types 37namespace OpenSim.Framework.Types
39{ 38{
@@ -65,7 +64,7 @@ namespace OpenSim.Framework.Types
65 if (ia == null) 64 if (ia == null)
66 ia = Adr; 65 ia = Adr;
67 66
68 if (Adr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) 67 if (Adr.AddressFamily == AddressFamily.InterNetwork)
69 { 68 {
70 ia = Adr; 69 ia = Adr;
71 break; 70 break;
@@ -170,7 +169,7 @@ namespace OpenSim.Framework.Types
170 attri = configData.GetAttribute("SimLocationX"); 169 attri = configData.GetAttribute("SimLocationX");
171 if (attri == "") 170 if (attri == "")
172 { 171 {
173 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000"); 172 string location = MainLog.Instance.CmdPrompt("Grid Location X", "1000");
174 configData.SetAttribute("SimLocationX", location); 173 configData.SetAttribute("SimLocationX", location);
175 m_regionLocX = (uint)Convert.ToUInt32(location); 174 m_regionLocX = (uint)Convert.ToUInt32(location);
176 } 175 }
@@ -183,7 +182,7 @@ namespace OpenSim.Framework.Types
183 attri = configData.GetAttribute("SimLocationY"); 182 attri = configData.GetAttribute("SimLocationY");
184 if (attri == "") 183 if (attri == "")
185 { 184 {
186 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000"); 185 string location = MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
187 configData.SetAttribute("SimLocationY", location); 186 configData.SetAttribute("SimLocationY", location);
188 m_regionLocY = (uint)Convert.ToUInt32(location); 187 m_regionLocY = (uint)Convert.ToUInt32(location);
189 } 188 }
@@ -209,7 +208,7 @@ namespace OpenSim.Framework.Types
209 attri = configData.GetAttribute("TerrainMultiplier"); 208 attri = configData.GetAttribute("TerrainMultiplier");
210 if (attri == "") 209 if (attri == "")
211 { 210 {
212 string re = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0"); 211 string re = MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
213 this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture); 212 this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
214 configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString()); 213 configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
215 } 214 }
@@ -222,7 +221,7 @@ namespace OpenSim.Framework.Types
222 attri = configData.GetAttribute("MasterAvatarFirstName"); 221 attri = configData.GetAttribute("MasterAvatarFirstName");
223 if (attri == "") 222 if (attri == "")
224 { 223 {
225 this.MasterAvatarFirstName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test"); 224 this.MasterAvatarFirstName = MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
226 225
227 configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName); 226 configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
228 } 227 }
@@ -235,7 +234,7 @@ namespace OpenSim.Framework.Types
235 attri = configData.GetAttribute("MasterAvatarLastName"); 234 attri = configData.GetAttribute("MasterAvatarLastName");
236 if (attri == "") 235 if (attri == "")
237 { 236 {
238 this.MasterAvatarLastName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User"); 237 this.MasterAvatarLastName = MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
239 238
240 configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName); 239 configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
241 } 240 }
@@ -250,7 +249,7 @@ namespace OpenSim.Framework.Types
250 attri = configData.GetAttribute("MasterAvatarSandboxPassword"); 249 attri = configData.GetAttribute("MasterAvatarSandboxPassword");
251 if (attri == "") 250 if (attri == "")
252 { 251 {
253 this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test"); 252 this.MasterAvatarSandboxPassword = MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
254 253
255 //Should I store this? 254 //Should I store this?
256 configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword); 255 configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
@@ -265,17 +264,17 @@ namespace OpenSim.Framework.Types
265 } 264 }
266 catch (Exception e) 265 catch (Exception e)
267 { 266 {
268 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 267 MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
269 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 268 MainLog.Instance.Warn(e.ToString());
270 } 269 }
271 270
272 OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:"); 271 MainLog.Instance.Verbose("Sim settings loaded:");
273 OpenSim.Framework.Console.MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated()); 272 MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
274 OpenSim.Framework.Console.MainLog.Instance.Verbose("Name: " + this.RegionName); 273 MainLog.Instance.Verbose("Name: " + this.RegionName);
275 OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); 274 MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
276 OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString()); 275 MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
277 OpenSim.Framework.Console.MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() ); 276 MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() );
278 OpenSim.Framework.Console.MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString()); 277 MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
279 278
280 } 279 }
281 280
diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs
index bb9206f..9cde18e 100644
--- a/OpenSim/Framework/General/Types/UUID.cs
+++ b/OpenSim/Framework/General/Types/UUID.cs
@@ -1,6 +1,4 @@
1using System; 1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife; 2using libsecondlife;
5 3
6namespace OpenSim.Framework.Types 4namespace OpenSim.Framework.Types
diff --git a/OpenSim/Framework/General/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
index 263dba2..243208a 100644
--- a/OpenSim/Framework/General/UserProfile.cs
+++ b/OpenSim/Framework/General/UserProfile.cs
@@ -25,12 +25,10 @@
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.Security.Cryptography;
31using libsecondlife; 30using libsecondlife;
32using OpenSim.Framework.Inventory; 31using OpenSim.Framework.Inventory;
33using System.Security.Cryptography;
34 32
35namespace OpenSim.Framework.User 33namespace OpenSim.Framework.User
36{ 34{
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index 8c34c9b..13e3af2 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
@@ -27,10 +27,8 @@
27*/ 27*/
28using System; 28using System;
29using System.Security.Cryptography; 29using System.Security.Cryptography;
30using System.Collections.Generic;
31using System.Text; 30using System.Text;
32using libsecondlife; 31using libsecondlife;
33using libsecondlife.Packets;
34 32
35namespace OpenSim.Framework.Utilities 33namespace OpenSim.Framework.Utilities
36{ 34{
diff --git a/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs b/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
index de5f48d..fcffd67 100644
--- a/OpenSim/Framework/GenericConfig/Xml/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/GenericConfig/Xml/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/Framework/GenericConfig/Xml/XmlConfig.cs b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
index c526aec..7fa085d 100644
--- a/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
+++ b/OpenSim/Framework/GenericConfig/Xml/XmlConfig.cs
@@ -26,8 +26,7 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.IO;
30using System.Text;
31using System.Xml; 30using System.Xml;
32using OpenSim.Framework.Interfaces; 31using OpenSim.Framework.Interfaces;
33 32
@@ -50,7 +49,7 @@ namespace OpenSim.GenericConfig
50 { 49 {
51 doc = new XmlDocument(); 50 doc = new XmlDocument();
52 51
53 if (System.IO.File.Exists(fileName)) 52 if (File.Exists(fileName))
54 { 53 {
55 XmlTextReader reader = new XmlTextReader(fileName); 54 XmlTextReader reader = new XmlTextReader(fileName);
56 reader.WhitespaceHandling = WhitespaceHandling.None; 55 reader.WhitespaceHandling = WhitespaceHandling.None;
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 5dc1f56..713793c 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -26,13 +26,14 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO;
30using System.Net; 32using System.Net;
31using System.Text; 33using System.Text;
32using System.Text.RegularExpressions; 34using System.Text.RegularExpressions;
33using System.Threading; 35using System.Threading;
34using Nwc.XmlRpc; 36using Nwc.XmlRpc;
35using System.Collections;
36using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
37 38
38namespace OpenSim.Framework.Servers 39namespace OpenSim.Framework.Servers
@@ -199,9 +200,9 @@ namespace OpenSim.Framework.Servers
199 response.KeepAlive = false; 200 response.KeepAlive = false;
200 response.SendChunked = false; 201 response.SendChunked = false;
201 202
202 System.IO.Stream body = request.InputStream; 203 Stream body = request.InputStream;
203 System.Text.Encoding encoding = System.Text.Encoding.UTF8; 204 Encoding encoding = Encoding.UTF8;
204 System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); 205 StreamReader reader = new StreamReader(body, encoding);
205 206
206 string requestBody = reader.ReadToEnd(); 207 string requestBody = reader.ReadToEnd();
207 body.Close(); 208 body.Close();
@@ -245,8 +246,8 @@ namespace OpenSim.Framework.Servers
245 246
246 } 247 }
247 248
248 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); 249 byte[] buffer = Encoding.UTF8.GetBytes(responseString);
249 System.IO.Stream output = response.OutputStream; 250 Stream output = response.OutputStream;
250 response.SendChunked = false; 251 response.SendChunked = false;
251 response.ContentLength64 = buffer.Length; 252 response.ContentLength64 = buffer.Length;
252 output.Write(buffer, 0, buffer.Length); 253 output.Write(buffer, 0, buffer.Length);
@@ -260,7 +261,7 @@ namespace OpenSim.Framework.Servers
260 261
261 public void Start() 262 public void Start()
262 { 263 {
263 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server"); 264 MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
264 265
265 m_workerThread = new Thread(new ThreadStart(StartHTTP)); 266 m_workerThread = new Thread(new ThreadStart(StartHTTP));
266 m_workerThread.IsBackground = true; 267 m_workerThread.IsBackground = true;
@@ -271,7 +272,7 @@ namespace OpenSim.Framework.Servers
271 { 272 {
272 try 273 try
273 { 274 {
274 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK"); 275 MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
275 m_httpListener = new HttpListener(); 276 m_httpListener = new HttpListener();
276 277
277 m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 278 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
@@ -286,7 +287,7 @@ namespace OpenSim.Framework.Servers
286 } 287 }
287 catch (Exception e) 288 catch (Exception e)
288 { 289 {
289 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message); 290 MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
290 } 291 }
291 } 292 }
292 293
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
index 6aeb58c..104de94 100644
--- a/OpenSim/Framework/Servers/CheckSumServer.cs
+++ b/OpenSim/Framework/Servers/CheckSumServer.cs
@@ -25,21 +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.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;
38using libsecondlife;
39using libsecondlife.Packets;
40using OpenSim.Framework.Console;
41
42
43namespace OpenSim.Framework.Servers 28namespace OpenSim.Framework.Servers
44{ 29{
45/* public class CheckSumServer : UDPServerBase 30/* public class CheckSumServer : UDPServerBase
diff --git a/OpenSim/Framework/Servers/ILlsdMethodHandler.cs b/OpenSim/Framework/Servers/ILlsdMethodHandler.cs
index f5daa8d..5382f2d 100644
--- a/OpenSim/Framework/Servers/ILlsdMethodHandler.cs
+++ b/OpenSim/Framework/Servers/ILlsdMethodHandler.cs
@@ -1,6 +1,30 @@
1using System; 1/*
2using System.Collections.Generic; 2* Copyright (c) Contributors, http://www.openmetaverse.org/
3using System.Text; 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
4 28
5namespace OpenSim.Framework.Servers 29namespace OpenSim.Framework.Servers
6{ 30{
diff --git a/OpenSim/Framework/Servers/LlsdMethod.cs b/OpenSim/Framework/Servers/LlsdMethod.cs
index bf58a71..d17fa38 100644
--- a/OpenSim/Framework/Servers/LlsdMethod.cs
+++ b/OpenSim/Framework/Servers/LlsdMethod.cs
@@ -1,6 +1,30 @@
1using System; 1/*
2using System.Collections.Generic; 2* Copyright (c) Contributors, http://www.openmetaverse.org/
3using System.Text; 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
4 28
5namespace OpenSim.Framework.Servers 29namespace OpenSim.Framework.Servers
6{ 30{
diff --git a/OpenSim/Framework/Servers/RestMethod.cs b/OpenSim/Framework/Servers/RestMethod.cs
index a2b6bf0..c6cb230 100644
--- a/OpenSim/Framework/Servers/RestMethod.cs
+++ b/OpenSim/Framework/Servers/RestMethod.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.Framework.Servers 28namespace OpenSim.Framework.Servers
33{ 29{
34 public delegate string RestMethod( string request, string path, string param ); 30 public delegate string RestMethod( string request, string path, string param );
diff --git a/OpenSim/Framework/Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs
index 2617c56..508eb9d 100644
--- a/OpenSim/Framework/Servers/UDPServerBase.cs
+++ b/OpenSim/Framework/Servers/UDPServerBase.cs
@@ -26,16 +26,8 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Text;
30using System.IO;
31using System.Threading;
32using System.Net; 29using System.Net;
33using System.Net.Sockets; 30using System.Net.Sockets;
34using System.Timers;
35using System.Reflection;
36using System.Collections;
37using System.Collections.Generic;
38using libsecondlife;
39using libsecondlife.Packets; 31using libsecondlife.Packets;
40 32
41namespace OpenSim.Framework.Servers 33namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/XmlRpcMethod.cs b/OpenSim/Framework/Servers/XmlRpcMethod.cs
index 51b3303..b76ac51 100644
--- a/OpenSim/Framework/Servers/XmlRpcMethod.cs
+++ b/OpenSim/Framework/Servers/XmlRpcMethod.cs
@@ -25,7 +25,6 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using Nwc.XmlRpc; 28using Nwc.XmlRpc;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index d1cd8cf..64504fa 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -1,13 +1,8 @@
1using System; 1using System;
2using System.Text;
3using System.Text.RegularExpressions;
4using System.Threading;
5using System.Collections; 2using System.Collections;
6using System.Xml;
7using libsecondlife; 3using libsecondlife;
8using OpenSim.Framework.Utilities;
9using OpenSim.Framework.Interfaces;
10using Nwc.XmlRpc; 4using Nwc.XmlRpc;
5using OpenSim.Framework.Console;
11 6
12namespace OpenSim.Framework.UserManagement 7namespace OpenSim.Framework.UserManagement
13{ 8{
@@ -227,7 +222,7 @@ namespace OpenSim.Framework.UserManagement
227 222
228 responseData["sim_port"] =(Int32) this.SimPort; 223 responseData["sim_port"] =(Int32) this.SimPort;
229 responseData["sim_ip"] = this.SimAddress; 224 responseData["sim_ip"] = this.SimAddress;
230 Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]); 225 MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
231 responseData["agent_id"] = this.AgentID.ToStringHyphenated(); 226 responseData["agent_id"] = this.AgentID.ToStringHyphenated();
232 responseData["session_id"] = this.SessionID.ToStringHyphenated(); 227 responseData["session_id"] = this.SessionID.ToStringHyphenated();
233 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated(); 228 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
@@ -266,8 +261,8 @@ namespace OpenSim.Framework.UserManagement
266 } 261 }
267 catch (Exception e) 262 catch (Exception e)
268 { 263 {
269 OpenSim.Framework.Console.MainLog.Instance.WriteLine( 264 MainLog.Instance.WriteLine(
270 OpenSim.Framework.Console.LogPriority.LOW, 265 LogPriority.LOW,
271 "LoginResponse: Error creating XML-RPC Response: " + e.Message 266 "LoginResponse: Error creating XML-RPC Response: " + e.Message
272 ); 267 );
273 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false")); 268 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index 560752e..f316cc7 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -28,24 +28,21 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework.Data;
33using libsecondlife;
34using System.Reflection; 31using System.Reflection;
35 32using System.Security.Cryptography;
36using System.Xml; 33using libsecondlife;
37using Nwc.XmlRpc; 34using Nwc.XmlRpc;
38using OpenSim.Framework.Sims; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Data;
37using OpenSim.Framework.Interfaces;
39using OpenSim.Framework.Inventory; 38using OpenSim.Framework.Inventory;
40using OpenSim.Framework.Utilities; 39using OpenSim.Framework.Utilities;
41 40
42using System.Security.Cryptography;
43
44namespace OpenSim.Framework.UserManagement 41namespace OpenSim.Framework.UserManagement
45{ 42{
46 public abstract class UserManagerBase 43 public abstract class UserManagerBase
47 { 44 {
48 public OpenSim.Framework.Interfaces.UserConfig _config; 45 public UserConfig _config;
49 Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); 46 Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
50 47
51 /// <summary> 48 /// <summary>
@@ -54,10 +51,10 @@ namespace OpenSim.Framework.UserManagement
54 /// <param name="FileName">The filename to the user server plugin DLL</param> 51 /// <param name="FileName">The filename to the user server plugin DLL</param>
55 public void AddPlugin(string FileName) 52 public void AddPlugin(string FileName)
56 { 53 {
57 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName); 54 MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
58 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 55 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
59 56
60 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 57 MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
61 foreach (Type pluginType in pluginAssembly.GetTypes()) 58 foreach (Type pluginType in pluginAssembly.GetTypes())
62 { 59 {
63 if (!pluginType.IsAbstract) 60 if (!pluginType.IsAbstract)
@@ -69,7 +66,7 @@ namespace OpenSim.Framework.UserManagement
69 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 66 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise(); 67 plug.Initialise();
71 this._plugins.Add(plug.getName(), plug); 68 this._plugins.Add(plug.getName(), plug);
72 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface"); 69 MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
73 } 70 }
74 71
75 typeInterface = null; 72 typeInterface = null;
@@ -97,7 +94,7 @@ namespace OpenSim.Framework.UserManagement
97 } 94 }
98 catch (Exception e) 95 catch (Exception e)
99 { 96 {
100 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 97 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
101 } 98 }
102 } 99 }
103 100
@@ -122,7 +119,7 @@ namespace OpenSim.Framework.UserManagement
122 } 119 }
123 catch (Exception e) 120 catch (Exception e)
124 { 121 {
125 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 122 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
126 } 123 }
127 } 124 }
128 125
@@ -149,7 +146,7 @@ namespace OpenSim.Framework.UserManagement
149 } 146 }
150 catch (Exception e) 147 catch (Exception e)
151 { 148 {
152 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 149 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
153 } 150 }
154 } 151 }
155 152
@@ -173,7 +170,7 @@ namespace OpenSim.Framework.UserManagement
173 } 170 }
174 catch (Exception e) 171 catch (Exception e)
175 { 172 {
176 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 173 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
177 } 174 }
178 } 175 }
179 176
@@ -195,7 +192,7 @@ namespace OpenSim.Framework.UserManagement
195 } 192 }
196 catch (Exception e) 193 catch (Exception e)
197 { 194 {
198 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 195 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
199 } 196 }
200 } 197 }
201 198
@@ -218,7 +215,7 @@ namespace OpenSim.Framework.UserManagement
218 } 215 }
219 catch (Exception e) 216 catch (Exception e)
220 { 217 {
221 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 218 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
222 } 219 }
223 } 220 }
224 221
@@ -314,7 +311,7 @@ namespace OpenSim.Framework.UserManagement
314 /// <returns>Authenticated?</returns> 311 /// <returns>Authenticated?</returns>
315 public virtual bool AuthenticateUser(UserProfileData profile, string password) 312 public virtual bool AuthenticateUser(UserProfileData profile, string password)
316 { 313 {
317 OpenSim.Framework.Console.MainLog.Instance.Verbose( 314 MainLog.Instance.Verbose(
318 "Authenticating " + profile.username + " " + profile.surname); 315 "Authenticating " + profile.username + " " + profile.surname);
319 316
320 password = password.Remove(0, 3); //remove $1$ 317 password = password.Remove(0, 3); //remove $1$
@@ -517,7 +514,7 @@ namespace OpenSim.Framework.UserManagement
517 } 514 }
518 catch (Exception e) 515 catch (Exception e)
519 { 516 {
520 OpenSim.Framework.Console.MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")"); 517 MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
521 } 518 }
522 } 519 }
523 } 520 }
diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
index 31cb379..9546891 100644
--- a/OpenSim/Grid/AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -26,15 +26,10 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.IO;
30using System.Net; 30using System.Net;
31using System.Text; 31using System.Text;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using System.Threading;
34//using OpenSim.CAPS;
35using Nwc.XmlRpc;
36using System.Collections;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
39 34
40namespace OpenSim.Grid.AssetServer 35namespace OpenSim.Grid.AssetServer
@@ -69,9 +64,9 @@ namespace OpenSim.Grid.AssetServer
69 response.KeepAlive = false; 64 response.KeepAlive = false;
70 response.SendChunked = false; 65 response.SendChunked = false;
71 66
72 System.IO.Stream body = request.InputStream; 67 Stream body = request.InputStream;
73 System.Text.Encoding encoding = System.Text.Encoding.UTF8; 68 Encoding encoding = Encoding.UTF8;
74 System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); 69 StreamReader reader = new StreamReader(body, encoding);
75 70
76 string requestBody = reader.ReadToEnd(); 71 string requestBody = reader.ReadToEnd();
77 body.Close(); 72 body.Close();
@@ -114,7 +109,7 @@ namespace OpenSim.Grid.AssetServer
114 109
115 Encoding Windows1252Encoding = Encoding.GetEncoding(1252); 110 Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
116 byte[] buffer = Windows1252Encoding.GetBytes(responseString); 111 byte[] buffer = Windows1252Encoding.GetBytes(responseString);
117 System.IO.Stream output = response.OutputStream; 112 Stream output = response.OutputStream;
118 response.SendChunked = false; 113 response.SendChunked = false;
119 response.ContentLength64 = buffer.Length; 114 response.ContentLength64 = buffer.Length;
120 output.Write(buffer, 0, buffer.Length); 115 output.Write(buffer, 0, buffer.Length);
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index d06998d..112d72f 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -29,20 +29,10 @@
29using System; 29using System;
30using System.IO; 30using System.IO;
31using System.Text; 31using System.Text;
32using System.Timers; 32using Db4objects.Db4o;
33using System.Net;
34using System.Reflection;
35using System.Threading;
36using libsecondlife; 33using libsecondlife;
37using OpenSim.Framework;
38using OpenSim.Framework.Sims;
39using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
40using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Utilities;
43using OpenSim.Framework.Servers;
44using Db4objects.Db4o;
45using Db4objects.Db4o.Query;
46 36
47namespace OpenSim.Grid.AssetServer 37namespace OpenSim.Grid.AssetServer
48{ 38{
@@ -81,7 +71,7 @@ namespace OpenSim.Grid.AssetServer
81 private OpenAsset_Main() 71 private OpenAsset_Main()
82 { 72 {
83 m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false); 73 m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);
84 OpenSim.Framework.Console.MainLog.Instance = m_console; 74 MainLog.Instance = m_console;
85 } 75 }
86 76
87 public void Startup() 77 public void Startup()
@@ -161,17 +151,17 @@ namespace OpenSim.Grid.AssetServer
161 151
162 public void setupDB() 152 public void setupDB()
163 { 153 {
164 bool yapfile = System.IO.File.Exists("assets.yap"); 154 bool yapfile = File.Exists("assets.yap");
165 try 155 try
166 { 156 {
167 db = Db4oFactory.OpenFile("assets.yap"); 157 db = Db4oFactory.OpenFile("assets.yap");
168 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Main.cs:setupDB() - creation"); 158 MainLog.Instance.Verbose( "Main.cs:setupDB() - creation");
169 } 159 }
170 catch (Exception e) 160 catch (Exception e)
171 { 161 {
172 db.Close(); 162 db.Close();
173 OpenSim.Framework.Console.MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured"); 163 MainLog.Instance.Warn("Main.cs:setupDB() - Exception occured");
174 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 164 MainLog.Instance.Warn(e.ToString());
175 } 165 }
176 if (!yapfile) 166 if (!yapfile)
177 { 167 {
@@ -273,7 +263,7 @@ namespace OpenSim.Grid.AssetServer
273 { 263 {
274 264
275 265
276 string dataPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder; 266 string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
277 string fileName = Path.Combine(dataPath, filename); 267 string fileName = Path.Combine(dataPath, filename);
278 FileInfo fInfo = new FileInfo(fileName); 268 FileInfo fInfo = new FileInfo(fileName);
279 long numBytes = fInfo.Length; 269 long numBytes = fInfo.Length;
diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index f9a18a8..dc39ce2 100644
--- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/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/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index 3f5d7dd..6c916a2 100644
--- a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -25,12 +25,10 @@
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 Nwc.XmlRpc;
29using OpenSim.Framework;
30using OpenSim.Framework.Servers;
31using System.Collections; 28using System.Collections;
32using System.Collections.Generic;
33using libsecondlife; 29using libsecondlife;
30using Nwc.XmlRpc;
31using OpenSim.Framework.Servers;
34 32
35namespace OpenSim.Framework.Manager 33namespace OpenSim.Framework.Manager
36{ 34{
diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
index d5eaf6f..67cd35d 100644
--- a/OpenSim/Grid/Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -28,10 +28,9 @@
28 28
29using System; 29using System;
30using System.Collections; 30using System.Collections;
31using System.Collections.Generic;
32using Nwc.XmlRpc;
33using System.Threading; 31using System.Threading;
34using libsecondlife; 32using libsecondlife;
33using Nwc.XmlRpc;
35 34
36namespace OpenSim.Framework.Manager { 35namespace OpenSim.Framework.Manager {
37 36
diff --git a/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
index c9701d6..39c9e8f 100644
--- a/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer.Config/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/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
index 2218004..4acf81d 100644
--- a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
+++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
@@ -26,10 +26,9 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using Db4objects.Db4o;
30using OpenSim.Framework.Console; 30using OpenSim.Framework.Console;
31using OpenSim.Framework.Interfaces; 31using OpenSim.Framework.Interfaces;
32using Db4objects.Db4o;
33 32
34namespace OpenGrid.Config.GridConfigDb4o 33namespace OpenGrid.Config.GridConfigDb4o
35{ 34{
@@ -44,7 +43,7 @@ namespace OpenGrid.Config.GridConfigDb4o
44 /// <returns>A grid configuration object</returns> 43 /// <returns>A grid configuration object</returns>
45 public GridConfig GetConfigObject() 44 public GridConfig GetConfigObject()
46 { 45 {
47 OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll"); 46 MainLog.Instance.Verbose("Loading Db40Config dll");
48 return ( new DbGridConfig()); 47 return ( new DbGridConfig());
49 } 48 }
50 } 49 }
@@ -63,24 +62,24 @@ namespace OpenGrid.Config.GridConfigDb4o
63 /// User configuration for the Grid Config interfaces 62 /// User configuration for the Grid Config interfaces
64 /// </summary> 63 /// </summary>
65 public void LoadDefaults() { 64 public void LoadDefaults() {
66 OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); 65 MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
67 66
68 // About the grid options 67 // About the grid options
69 this.GridOwner = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); 68 this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
70 69
71 // Asset Options 70 // Asset Options
72 this.DefaultAssetServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/"); 71 this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/");
73 this.AssetSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to asset server","null"); 72 this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null");
74 this.AssetRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from asset server","null"); 73 this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
75 74
76 // User Server Options 75 // User Server Options
77 this.DefaultUserServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/"); 76 this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/");
78 this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server","null"); 77 this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null");
79 this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server","null"); 78 this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
80 79
81 // Region Server Options 80 // Region Server Options
82 this.SimSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to sims","null"); 81 this.SimSendKey = MainLog.Instance.CmdPrompt("Key to send to sims","null");
83 this.SimRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from sims","null"); 82 this.SimRecvKey = MainLog.Instance.CmdPrompt("Key to expect from sims","null");
84 } 83 }
85 84
86 /// <summary> 85 /// <summary>
@@ -95,7 +94,7 @@ namespace OpenGrid.Config.GridConfigDb4o
95 IObjectSet result = db.Get(typeof(DbGridConfig)); 94 IObjectSet result = db.Get(typeof(DbGridConfig));
96 // Found? 95 // Found?
97 if(result.Count==1) { 96 if(result.Count==1) {
98 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); 97 MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
99 foreach (DbGridConfig cfg in result) { 98 foreach (DbGridConfig cfg in result) {
100 // Import each setting into this class 99 // Import each setting into this class
101 // Grid Settings 100 // Grid Settings
@@ -114,40 +113,40 @@ namespace OpenGrid.Config.GridConfigDb4o
114 } 113 }
115 // Create a new configuration object from this class 114 // Create a new configuration object from this class
116 } else { 115 } else {
117 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); 116 MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
118 117
119 // Load default settings into this class 118 // Load default settings into this class
120 LoadDefaults(); 119 LoadDefaults();
121 120
122 // Saves to the database file... 121 // Saves to the database file...
123 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Writing out default settings to local database"); 122 MainLog.Instance.Verbose( "Writing out default settings to local database");
124 db.Set(this); 123 db.Set(this);
125 124
126 // Closes file locks 125 // Closes file locks
127 db.Close(); 126 db.Close();
128 } 127 }
129 } catch(Exception e) { 128 } catch(Exception e) {
130 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 129 MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
131 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 130 MainLog.Instance.Warn(e.ToString());
132 } 131 }
133 132
134 // Grid Settings 133 // Grid Settings
135 OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid settings loaded:"); 134 MainLog.Instance.Verbose("Grid settings loaded:");
136 OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid owner: " + this.GridOwner); 135 MainLog.Instance.Verbose("Grid owner: " + this.GridOwner);
137 136
138 // Asset Settings 137 // Asset Settings
139 OpenSim.Framework.Console.MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer); 138 MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
140 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey); 139 MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
141 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey); 140 MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
142 141
143 // User Settings 142 // User Settings
144 OpenSim.Framework.Console.MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer); 143 MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer);
145 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey); 144 MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
146 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey); 145 MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
147 146
148 // Region Settings 147 // Region Settings
149 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey); 148 MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
150 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey); 149 MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
151 } 150 }
152 151
153 /// <summary> 152 /// <summary>
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index e562721..7986591 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -28,15 +28,14 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text;
32using System.Reflection; 31using System.Reflection;
33using OpenSim.Framework.Data; 32using System.Xml;
34using OpenSim.Framework.Utilities;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Sims;
37using libsecondlife; 33using libsecondlife;
38using Nwc.XmlRpc; 34using Nwc.XmlRpc;
39using System.Xml; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Data;
37using OpenSim.Framework.Interfaces;
38using OpenSim.Framework.Utilities;
40 39
41namespace OpenSim.Grid.GridServer 40namespace OpenSim.Grid.GridServer
42{ 41{
@@ -45,7 +44,7 @@ namespace OpenSim.Grid.GridServer
45 Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>(); 44 Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
46 Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>(); 45 Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>();
47 46
48 public OpenSim.Framework.Interfaces.GridConfig config; 47 public GridConfig config;
49 48
50 /// <summary> 49 /// <summary>
51 /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded. 50 /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
@@ -53,10 +52,10 @@ namespace OpenSim.Grid.GridServer
53 /// <param name="FileName">The filename to the grid server plugin DLL</param> 52 /// <param name="FileName">The filename to the grid server plugin DLL</param>
54 public void AddPlugin(string FileName) 53 public void AddPlugin(string FileName)
55 { 54 {
56 OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Attempting to load " + FileName); 55 MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);
57 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 56 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
58 57
59 OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 58 MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
60 foreach (Type pluginType in pluginAssembly.GetTypes()) 59 foreach (Type pluginType in pluginAssembly.GetTypes())
61 { 60 {
62 if (!pluginType.IsAbstract) 61 if (!pluginType.IsAbstract)
@@ -69,7 +68,7 @@ namespace OpenSim.Grid.GridServer
69 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 68 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise(); 69 plug.Initialise();
71 this._plugins.Add(plug.getName(), plug); 70 this._plugins.Add(plug.getName(), plug);
72 OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Added IGridData Interface"); 71 MainLog.Instance.Verbose("Storage: Added IGridData Interface");
73 } 72 }
74 73
75 typeInterface = null; 74 typeInterface = null;
@@ -82,7 +81,7 @@ namespace OpenSim.Grid.GridServer
82 ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 81 ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
83 plug.Initialise(); 82 plug.Initialise();
84 this._logplugins.Add(plug.getName(), plug); 83 this._logplugins.Add(plug.getName(), plug);
85 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Storage: Added ILogData Interface"); 84 MainLog.Instance.Verbose( "Storage: Added ILogData Interface");
86 } 85 }
87 86
88 typeInterface = null; 87 typeInterface = null;
@@ -110,7 +109,7 @@ namespace OpenSim.Grid.GridServer
110 } 109 }
111 catch (Exception) 110 catch (Exception)
112 { 111 {
113 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key); 112 MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
114 } 113 }
115 } 114 }
116 } 115 }
@@ -120,7 +119,7 @@ namespace OpenSim.Grid.GridServer
120 /// </summary> 119 /// </summary>
121 /// <param name="uuid">A UUID key of the region to return</param> 120 /// <param name="uuid">A UUID key of the region to return</param>
122 /// <returns>A SimProfileData for the region</returns> 121 /// <returns>A SimProfileData for the region</returns>
123 public SimProfileData getRegion(libsecondlife.LLUUID uuid) 122 public SimProfileData getRegion(LLUUID uuid)
124 { 123 {
125 foreach(KeyValuePair<string,IGridData> kvp in _plugins) { 124 foreach(KeyValuePair<string,IGridData> kvp in _plugins) {
126 try 125 try
@@ -129,7 +128,7 @@ namespace OpenSim.Grid.GridServer
129 } 128 }
130 catch (Exception) 129 catch (Exception)
131 { 130 {
132 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); 131 MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
133 } 132 }
134 } 133 }
135 return null; 134 return null;
@@ -150,7 +149,7 @@ namespace OpenSim.Grid.GridServer
150 } 149 }
151 catch 150 catch
152 { 151 {
153 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); 152 MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
154 } 153 }
155 } 154 }
156 return null; 155 return null;
@@ -174,7 +173,7 @@ namespace OpenSim.Grid.GridServer
174 } 173 }
175 catch 174 catch
176 { 175 {
177 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); 176 MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
178 } 177 }
179 } 178 }
180 179
@@ -370,7 +369,7 @@ namespace OpenSim.Grid.GridServer
370 369
371 simProfileList.Add(simProfileBlock); 370 simProfileList.Add(simProfileBlock);
372 } 371 }
373 OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); 372 MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
374 } 373 }
375 else 374 else
376 { 375 {
@@ -403,7 +402,7 @@ namespace OpenSim.Grid.GridServer
403 } 402 }
404 } 403 }
405 } 404 }
406 OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); 405 MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
407 } 406 }
408 407
409 responseData["sim-profiles"] = simProfileList; 408 responseData["sim-profiles"] = simProfileList;
@@ -565,7 +564,7 @@ namespace OpenSim.Grid.GridServer
565 564
566 try 565 try
567 { 566 {
568 OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); 567 MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
569 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 568 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
570 { 569 {
571 try 570 try
@@ -575,7 +574,7 @@ namespace OpenSim.Grid.GridServer
575 if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null)) 574 if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null))
576 { 575 {
577 kvp.Value.AddProfile(TheSim); 576 kvp.Value.AddProfile(TheSim);
578 OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); 577 MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");
579 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); 578 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");
580 } 579 }
581 else 580 else
@@ -585,7 +584,7 @@ namespace OpenSim.Grid.GridServer
585 } 584 }
586 catch (Exception e) 585 catch (Exception e)
587 { 586 {
588 OpenSim.Framework.Console.MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); 587 MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
589 } 588 }
590 } 589 }
591 return "OK"; 590 return "OK";
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 490f757..20c4905 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -27,20 +27,14 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.IO;
31using System.Text;
32using System.Timers;
33using System.Net;
34using System.Threading;
35using System.Reflection; 30using System.Reflection;
36using libsecondlife; 31using System.Threading;
37using OpenSim.Framework.Manager; 32using System.Timers;
38using OpenSim.Framework;
39using OpenSim.Framework.Sims;
40using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
41using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
43using OpenSim.GenericConfig; 36using OpenSim.GenericConfig;
37using Timer=System.Timers.Timer;
44 38
45namespace OpenSim.Grid.GridServer 39namespace OpenSim.Grid.GridServer
46{ 40{
@@ -156,7 +150,7 @@ namespace OpenSim.Grid.GridServer
156 150
157 m_console.Verbose( "Main.cs:Startup() - Starting sim status checker"); 151 m_console.Verbose( "Main.cs:Startup() - Starting sim status checker");
158 152
159 System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates. 153 Timer simCheckTimer = new Timer(3600000 * 3); // 3 Hours between updates.
160 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); 154 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
161 simCheckTimer.Enabled = true; 155 simCheckTimer.Enabled = true;
162 } 156 }
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
index 303dddf..62a68a8 100644
--- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer/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/Grid/UserServer.Config/AssemblyInfo.cs b/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
index 25e0211..15298e8 100644
--- a/OpenSim/Grid/UserServer.Config/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer.Config/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/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
index 770a6b9..c7f8255 100644
--- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
+++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
@@ -26,10 +26,9 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using Db4objects.Db4o;
30using OpenSim.Framework.Console; 30using OpenSim.Framework.Console;
31using OpenSim.Framework.Interfaces; 31using OpenSim.Framework.Interfaces;
32using Db4objects.Db4o;
33 32
34namespace OpenUser.Config.UserConfigDb4o 33namespace OpenUser.Config.UserConfigDb4o
35{ 34{
@@ -37,7 +36,7 @@ namespace OpenUser.Config.UserConfigDb4o
37 { 36 {
38 public UserConfig GetConfigObject() 37 public UserConfig GetConfigObject()
39 { 38 {
40 OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll"); 39 MainLog.Instance.Verbose("Loading Db40Config dll");
41 return ( new DbUserConfig()); 40 return ( new DbUserConfig());
42 } 41 }
43 } 42 }
@@ -47,13 +46,13 @@ namespace OpenUser.Config.UserConfigDb4o
47 private IObjectContainer db; 46 private IObjectContainer db;
48 47
49 public void LoadDefaults() { 48 public void LoadDefaults() {
50 OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); 49 MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
51 50
52 this.DefaultStartupMsg = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); 51 this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
53 52
54 this.GridServerURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/"); 53 this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
55 this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server","null"); 54 this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
56 this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server","null"); 55 this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
57 } 56 }
58 57
59 public override void InitConfig() { 58 public override void InitConfig() {
@@ -61,7 +60,7 @@ namespace OpenUser.Config.UserConfigDb4o
61 db = Db4oFactory.OpenFile("openuser.yap"); 60 db = Db4oFactory.OpenFile("openuser.yap");
62 IObjectSet result = db.Get(typeof(DbUserConfig)); 61 IObjectSet result = db.Get(typeof(DbUserConfig));
63 if(result.Count==1) { 62 if(result.Count==1) {
64 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); 63 MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
65 foreach (DbUserConfig cfg in result) { 64 foreach (DbUserConfig cfg in result) {
66 this.GridServerURL=cfg.GridServerURL; 65 this.GridServerURL=cfg.GridServerURL;
67 this.GridSendKey=cfg.GridSendKey; 66 this.GridSendKey=cfg.GridSendKey;
@@ -69,22 +68,22 @@ namespace OpenUser.Config.UserConfigDb4o
69 this.DefaultStartupMsg=cfg.DefaultStartupMsg; 68 this.DefaultStartupMsg=cfg.DefaultStartupMsg;
70 } 69 }
71 } else { 70 } else {
72 OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); 71 MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
73 LoadDefaults(); 72 LoadDefaults();
74 OpenSim.Framework.Console.MainLog.Instance.Verbose("Writing out default settings to local database"); 73 MainLog.Instance.Verbose("Writing out default settings to local database");
75 db.Set(this); 74 db.Set(this);
76 db.Close(); 75 db.Close();
77 } 76 }
78 } catch(Exception e) { 77 } catch(Exception e) {
79 OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); 78 MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
80 OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); 79 MainLog.Instance.Warn(e.ToString());
81 } 80 }
82 81
83 OpenSim.Framework.Console.MainLog.Instance.Verbose("User settings loaded:"); 82 MainLog.Instance.Verbose("User settings loaded:");
84 OpenSim.Framework.Console.MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg); 83 MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
85 OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL); 84 MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL);
86 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey); 85 MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
87 OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey); 86 MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
88 } 87 }
89 88
90 89
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index c65bb97..5560e7d 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -27,18 +27,13 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections;
31using System.Collections.Generic; 30using System.Collections.Generic;
32using System.Reflection; 31using System.Reflection;
33using System.IO;
34using System.Text;
35using libsecondlife; 32using libsecondlife;
36using OpenSim.Framework.User;
37using OpenSim.Framework.Sims;
38using OpenSim.Framework.Inventory;
39using OpenSim.Framework.Interfaces;
40using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34using OpenSim.Framework.Interfaces;
41using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Framework.User;
42using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
43using OpenSim.GenericConfig; 38using OpenSim.GenericConfig;
44 39
@@ -73,7 +68,7 @@ namespace OpenSim.Grid.UserServer
73 private OpenUser_Main() 68 private OpenUser_Main()
74 { 69 {
75 m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false); 70 m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false);
76 OpenSim.Framework.Console.MainLog.Instance = m_console; 71 MainLog.Instance = m_console;
77 } 72 }
78 73
79 private void Work() 74 private void Work()
@@ -93,16 +88,16 @@ namespace OpenSim.Grid.UserServer
93 this.ConfigDB(this.localXMLConfig); 88 this.ConfigDB(this.localXMLConfig);
94 this.localXMLConfig.Close(); 89 this.localXMLConfig.Close();
95 90
96 OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration"); 91 MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");
97 Cfg = this.LoadConfigDll(this.ConfigDll); 92 Cfg = this.LoadConfigDll(this.ConfigDll);
98 Cfg.InitConfig(); 93 Cfg.InitConfig();
99 94
100 OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); 95 MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
101 m_userManager = new UserManager(); 96 m_userManager = new UserManager();
102 m_userManager._config = Cfg; 97 m_userManager._config = Cfg;
103 m_userManager.AddPlugin(StorageDll); 98 m_userManager.AddPlugin(StorageDll);
104 99
105 OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 100 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
106 BaseHttpServer httpServer = new BaseHttpServer(8002); 101 BaseHttpServer httpServer = new BaseHttpServer(8002);
107 102
108 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); 103 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
diff --git a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
index 5d5ce8d..a0a6f3c 100644
--- a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer/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/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index a3e3322..4610a9d 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -27,22 +27,11 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework.Data;
33using libsecondlife;
34using System.Reflection;
35
36using System.Xml;
37using Nwc.XmlRpc; 30using Nwc.XmlRpc;
31using OpenSim.Framework.Data;
38using OpenSim.Framework.Sims; 32using OpenSim.Framework.Sims;
39using OpenSim.Framework.Inventory;
40using OpenSim.Framework.Utilities;
41
42using OpenSim.Framework.UserManagement; 33using OpenSim.Framework.UserManagement;
43 34
44using System.Security.Cryptography;
45
46namespace OpenSim.Grid.UserServer 35namespace OpenSim.Grid.UserServer
47{ 36{
48 public class UserManager : UserManagerBase 37 public class UserManager : UserManagerBase
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