From 3d8219f6c7faa256d6a13ab7925f75d83af95b78 Mon Sep 17 00:00:00 2001 From: MW Date: Mon, 29 Oct 2007 21:46:25 +0000 Subject: as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace. Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway. --- OpenSim/Region/Application/Application.cs | 2 +- OpenSim/Region/Application/OpenSimController.cs | 6 +++--- OpenSim/Region/Application/OpenSimMain.cs | 8 ++++---- OpenSim/Region/ClientStack/ClientView.API.cs | 10 +++++++--- OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs | 1 + OpenSim/Region/ClientStack/ClientView.PacketQueue.cs | 2 +- OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 4 +--- OpenSim/Region/ClientStack/ClientView.cs | 4 ---- OpenSim/Region/ClientStack/PacketServer.cs | 2 +- OpenSim/Region/ClientStack/RegionApplicationBase.cs | 2 +- OpenSim/Region/ClientStack/UDPServer.cs | 2 +- OpenSim/Region/Communications/Local/CommunicationsLocal.cs | 2 +- OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 2 +- OpenSim/Region/Communications/Local/LocalInventoryService.cs | 2 +- OpenSim/Region/Communications/Local/LocalLoginService.cs | 6 ++---- OpenSim/Region/Communications/Local/LocalUserServices.cs | 2 +- OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | 2 +- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 4 ++-- OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | 2 +- OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 2 +- OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 2 +- OpenSim/Region/Environment/EstateManager.cs | 2 +- OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs | 2 +- OpenSim/Region/Environment/Interfaces/ISimChat.cs | 2 +- OpenSim/Region/Environment/Interfaces/ITerrain.cs | 1 + OpenSim/Region/Environment/LandManagement/Land.cs | 2 +- OpenSim/Region/Environment/LandManagement/LandManager.cs | 2 +- OpenSim/Region/Environment/Modules/AssetDownloadModule.cs | 1 + OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs | 2 +- OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs | 1 + OpenSim/Region/Environment/Modules/ChatModule.cs | 2 +- OpenSim/Region/Environment/Modules/DynamicTextureModule.cs | 3 +-- OpenSim/Region/Environment/Modules/InstantMessageModule.cs | 3 ++- OpenSim/Region/Environment/Modules/TextureDownloadModule.cs | 3 +-- OpenSim/Region/Environment/Modules/WorldCommModule.cs | 2 +- OpenSim/Region/Environment/Modules/XMLRPCModule.cs | 2 +- OpenSim/Region/Environment/Modules/XferModule.cs | 1 + OpenSim/Region/Environment/PermissionManager.cs | 2 +- OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs | 1 + OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 3 +-- OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 3 ++- OpenSim/Region/Environment/Scenes/Scene.cs | 6 ++---- OpenSim/Region/Environment/Scenes/SceneBase.cs | 3 +-- OpenSim/Region/Environment/Scenes/SceneEvents.cs | 1 + OpenSim/Region/Environment/Scenes/SceneManager.cs | 2 +- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 +- OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 3 +-- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 3 +-- OpenSim/Region/Examples/SimpleApp/ComplexObject.cs | 2 +- OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs | 2 +- OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs | 2 +- OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | 4 ++-- OpenSim/Region/Examples/SimpleApp/MyWorld.cs | 2 +- OpenSim/Region/Examples/SimpleApp/Program.cs | 4 ++-- .../Engines/JVMEngine/JVM/Interpreter.Methods.cs | 2 +- .../ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs | 2 +- .../Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 2 +- OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 2 +- OpenSim/Region/Physics/Manager/PhysicsScene.cs | 2 +- OpenSim/Region/Physics/OdePlugin/Meshing/Meshmerizer.cs | 2 +- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 +- OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 2 +- .../DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | 4 ++-- OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs | 2 +- .../OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | 4 ++-- 65 files changed, 84 insertions(+), 87 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 9cb4f76..0288f63 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -46,7 +46,7 @@ namespace OpenSim Console.Write("Performing compatibility checks... "); string supported = ""; - if (OpenSim.Framework.Utilities.Util.IsEnvironmentSupported(ref supported)) + if (OpenSim.Framework.Util.IsEnvironmentSupported(ref supported)) { Console.WriteLine(" Environment is compatible.\n"); } diff --git a/OpenSim/Region/Application/OpenSimController.cs b/OpenSim/Region/Application/OpenSimController.cs index b4e0ee0..da93b54 100644 --- a/OpenSim/Region/Application/OpenSimController.cs +++ b/OpenSim/Region/Application/OpenSimController.cs @@ -8,8 +8,8 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; using OpenSim.Framework.Servers; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; +using OpenSim.Framework; using OpenSim.Region.ClientStack; using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.OGS1; @@ -18,7 +18,7 @@ using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Physics.Manager; using System.Globalization; using Nwc.XmlRpc; -using RegionInfo = OpenSim.Framework.Types.RegionInfo; +using RegionInfo = OpenSim.Framework.RegionInfo; namespace OpenSim { diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 4e84470..b938227 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -35,17 +35,17 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; using OpenSim.Framework.Servers; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; +using OpenSim.Framework; using OpenSim.Region.ClientStack; using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.OGS1; using OpenSim.Region.Environment; using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Physics.Manager; -using OpenSim.Framework.Configuration; +using OpenSim.Framework; using System.Globalization; -using RegionInfo = OpenSim.Framework.Types.RegionInfo; +using RegionInfo = OpenSim.Framework.RegionInfo; namespace OpenSim { diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index ba8bf02..24962f8 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs @@ -34,8 +34,8 @@ using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; +using OpenSim.Framework; namespace OpenSim.Region.ClientStack { @@ -769,13 +769,17 @@ namespace OpenSim.Region.ClientStack viewertime.TimeInfo.SecPerYear = 365000; viewertime.TimeInfo.SunPhase = 1; int sunPhase = (phase + 2) / 2; - if ((sunPhase < 12) || (sunPhase > 36)) + if ((sunPhase < 6) || (sunPhase > 36)) { viewertime.TimeInfo.SunDirection = new LLVector3(0f, 0.8f, -0.8f); //Console.WriteLine("sending night"); } else { + if (sunPhase < 12) + { + sunPhase = 12; + } sunPhase = sunPhase - 12; float yValue = 0.1f * (sunPhase); if (yValue > 1.2f) { yValue = yValue - 1.2f; } diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs index d5e55a7..0771a4a 100644 --- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs +++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs @@ -29,6 +29,7 @@ using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; +using OpenSim.Framework; namespace OpenSim.Region.ClientStack { diff --git a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs index bfcb19f..5cd30ce 100644 --- a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs +++ b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs @@ -33,7 +33,7 @@ using System.Timers; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Console; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Environment; namespace OpenSim.Region.ClientStack diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 8a1a520..13e8b43 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs @@ -30,9 +30,7 @@ using System.Collections.Generic; using System.Text; using libsecondlife; using libsecondlife.Packets; -using OpenSim.Framework.Inventory; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Framework.Interfaces; using OpenSim.Region.Environment.Scenes; diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 7a55c35..6d49e34 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -36,10 +36,6 @@ using libsecondlife.Packets; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; -using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Inventory; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; using Timer = System.Timers.Timer; namespace OpenSim.Region.ClientStack diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs index 6fd4ba4..1b64602 100644 --- a/OpenSim/Region/ClientStack/PacketServer.cs +++ b/OpenSim/Region/ClientStack/PacketServer.cs @@ -31,7 +31,7 @@ using System.Net.Sockets; using libsecondlife.Packets; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Framework.Interfaces; using libsecondlife; diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index bab5d16..657af54 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -33,7 +33,7 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; using OpenSim.Framework.Servers; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Physics.Manager; using OpenSim.Region.Environment; using libsecondlife; diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index c7a3524..584b80c 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs @@ -32,7 +32,7 @@ using System.Net.Sockets; using libsecondlife.Packets; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 13af96c..ef5150f 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs @@ -29,7 +29,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Interfaces; using OpenSim.Framework.Servers; -using OpenSim.Framework.Types; +using OpenSim.Framework; namespace OpenSim.Region.Communications.Local { diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index dbac148..99c4bc3 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs @@ -29,7 +29,7 @@ using System.Collections.Generic; using libsecondlife; using OpenSim.Framework; using OpenSim.Framework.Communications; -using OpenSim.Framework.Types; +using OpenSim.Framework; using System.Collections; namespace OpenSim.Region.Communications.Local diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index fd6002a..b7d78bc 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using libsecondlife; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Types; +using OpenSim.Framework; namespace OpenSim.Region.Communications.Local { diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 486a166..1043683 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs @@ -31,10 +31,8 @@ using System.Collections; using System.Collections.Generic; using libsecondlife; using OpenSim.Framework.Communications; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Framework.UserManagement; -using OpenSim.Framework.Utilities; -using OpenSim.Framework.Inventory; namespace OpenSim.Region.Communications.Local { @@ -184,7 +182,7 @@ namespace OpenSim.Region.Communications.Local ArrayList AgentInventoryArray = new ArrayList(); Hashtable TempHash; - foreach (OpenSim.Framework.Inventory.InventoryFolder InvFolder in userInventory.InventoryFolders.Values) + foreach (OpenSim.Framework.InventoryFolder InvFolder in userInventory.InventoryFolders.Values) { TempHash = new Hashtable(); TempHash["name"] = InvFolder.FolderName; diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 60794c1..1dede97 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs @@ -28,7 +28,7 @@ using System; using OpenSim.Framework.Communications; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Framework.UserManagement; namespace OpenSim.Region.Communications.Local diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index 4be31d8..1807cc7 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs @@ -28,7 +28,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Framework.Servers; diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 7a74165..3719c97 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -42,7 +42,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Communications.Local; namespace OpenSim.Region.Communications.OGS1 @@ -140,7 +140,7 @@ namespace OpenSim.Region.Communications.OGS1 int port = Convert.ToInt32(neighbourData["sim_port"]); string externalUri = (string)neighbourData["sim_uri"]; - string externalIpStr = OpenSim.Framework.Utilities.Util.GetHostFromDNS(simIp).ToString(); + string externalIpStr = OpenSim.Framework.Util.GetHostFromDNS(simIp).ToString(); SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port); sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]); sri.RegionID = new LLUUID((string)neighbourData["uuid"]); diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs index 555a6cc..0b7bd82 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs @@ -28,7 +28,7 @@ using System; using libsecondlife; -using OpenSim.Framework.Types; +using OpenSim.Framework; namespace OpenSim.Region.Communications.OGS1 { diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index d8f5a22..11dee2d 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using libsecondlife; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Types; +using OpenSim.Framework; namespace OpenSim.Region.Communications.OGS1 diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 27ff6ae..19a3c3b 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs @@ -31,7 +31,7 @@ using System.Collections; using libsecondlife; using Nwc.XmlRpc; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; +using OpenSim.Framework; namespace OpenSim.Region.Communications.OGS1 { diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs index cb403a7..41d14f0 100644 --- a/OpenSim/Region/Environment/EstateManager.cs +++ b/OpenSim/Region/Environment/EstateManager.cs @@ -32,7 +32,7 @@ using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs index 28a5b4f..90c3730 100644 --- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs +++ b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text; using libsecondlife; -using OpenSim.Framework.Types; +using OpenSim.Framework; namespace OpenSim.Region.Environment.Interfaces { diff --git a/OpenSim/Region/Environment/Interfaces/ISimChat.cs b/OpenSim/Region/Environment/Interfaces/ISimChat.cs index 583d8b2..7dc3e0b 100644 --- a/OpenSim/Region/Environment/Interfaces/ISimChat.cs +++ b/OpenSim/Region/Environment/Interfaces/ISimChat.cs @@ -32,6 +32,6 @@ namespace OpenSim.Region.Environment.Interfaces { public interface ISimChat { - void SimChat(System.Object sender, OpenSim.Framework.Interfaces.ChatFromViewerArgs e); + void SimChat(System.Object sender, OpenSim.Framework.ChatFromViewerArgs e); } } diff --git a/OpenSim/Region/Environment/Interfaces/ITerrain.cs b/OpenSim/Region/Environment/Interfaces/ITerrain.cs index 2e7584f..77ec2dd 100644 --- a/OpenSim/Region/Environment/Interfaces/ITerrain.cs +++ b/OpenSim/Region/Environment/Interfaces/ITerrain.cs @@ -27,6 +27,7 @@ */ using OpenSim.Framework.Interfaces; +using OpenSim.Framework; namespace OpenSim.Region.Environment.Interfaces { diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs index 7fb2221..3962e5f 100644 --- a/OpenSim/Region/Environment/LandManagement/Land.cs +++ b/OpenSim/Region/Environment/LandManagement/Land.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.LandManagement diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs index 98b90b4..ae89d85 100644 --- a/OpenSim/Region/Environment/LandManagement/LandManager.cs +++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.LandManagement diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs index 3ce3e4e..e414713 100644 --- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs @@ -29,6 +29,7 @@ using OpenSim.Framework.Interfaces; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; +using OpenSim.Framework; using Nini.Config; namespace OpenSim.Region.Environment.Modules diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs index cb8c758..456d838 100644 --- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs +++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using libsecondlife; using Nini.Config; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs index 4bdb61b..802655f 100644 --- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs @@ -30,6 +30,7 @@ using libsecondlife; using OpenSim.Framework.Interfaces; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; +using OpenSim.Framework; using Nini.Config; namespace OpenSim.Region.Environment.Modules diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index c2611d0..bdb8ee5 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs @@ -34,7 +34,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using libsecondlife; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; diff --git a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs index 4e29977..7c852dc 100644 --- a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs +++ b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs @@ -29,8 +29,7 @@ using System; using System.Collections.Generic; using libsecondlife; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; using Nini.Config; diff --git a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs index 77ff24b..9ac1d76 100644 --- a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs +++ b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs @@ -30,6 +30,7 @@ using System.Collections.Generic; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; using OpenSim.Framework.Console; +using OpenSim.Framework; using Nini.Config; namespace OpenSim.Region.Environment.Modules @@ -53,7 +54,7 @@ namespace OpenSim.Region.Environment.Modules } } - void OnNewClient(OpenSim.Framework.Interfaces.IClientAPI client) + void OnNewClient(OpenSim.Framework.IClientAPI client) { client.OnInstantMessage += OnInstantMessage; } diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs index 56e20d1..5eeeca6 100644 --- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs @@ -31,8 +31,7 @@ using System.Threading; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; using Nini.Config; diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs index c7e0f8f..a697162 100644 --- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs +++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs @@ -33,7 +33,7 @@ using System.Text; using System.Threading; using libsecondlife; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; using OpenSim.Framework.Servers; diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs index 3a5b3c6..dd84778 100644 --- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs @@ -32,7 +32,7 @@ using System.Net.Sockets; using System.Threading; using libsecondlife; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; using OpenSim.Framework.Servers; diff --git a/OpenSim/Region/Environment/Modules/XferModule.cs b/OpenSim/Region/Environment/Modules/XferModule.cs index 2adb1c9..e555475 100644 --- a/OpenSim/Region/Environment/Modules/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/XferModule.cs @@ -32,6 +32,7 @@ using libsecondlife; using OpenSim.Framework.Interfaces; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; +using OpenSim.Framework; using Nini.Config; namespace OpenSim.Region.Environment.Modules diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs index ac126c9..63285dc 100644 --- a/OpenSim/Region/Environment/PermissionManager.cs +++ b/OpenSim/Region/Environment/PermissionManager.cs @@ -29,7 +29,7 @@ using libsecondlife; using OpenSim.Region.Environment.LandManagement; using OpenSim.Region.Environment.Scenes; -using OpenSim.Framework.PolicyManager; +using OpenSim.Framework; namespace OpenSim.Region.Environment { diff --git a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs index f9afc83..14a1c7e 100644 --- a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs +++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs @@ -28,6 +28,7 @@ using libsecondlife; using libsecondlife.Packets; +using OpenSim.Framework; using OpenSim.Framework.Interfaces; namespace OpenSim.Region.Environment.Scenes diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 4c04592..68591d4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -31,8 +31,7 @@ using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.Environment.Scenes diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 71f8037..3a35e21 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs @@ -30,6 +30,7 @@ using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; +using OpenSim.Framework; namespace OpenSim.Region.Environment.Scenes { @@ -72,7 +73,7 @@ namespace OpenSim.Region.Environment.Scenes { ChatFromViewerArgs args = new ChatFromViewerArgs(); - args.Message = OpenSim.Framework.Utilities.Util.FieldToString(message); + args.Message = OpenSim.Framework.Util.FieldToString(message); args.Channel = channel; args.Type = (ChatTypeEnum)type; args.Position = fromPos; diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1f50e1b..b54c25b 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -40,8 +40,6 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; using OpenSim.Framework.Servers; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; using OpenSim.Region.Capabilities; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.LandManagement; @@ -296,7 +294,7 @@ namespace OpenSim.Region.Environment.Scenes UpdateLand(); if (m_frame % m_update_avatars == 0) - UpdateAvatars(); + UpdateInWorldTime(); } catch (NotImplementedException) { @@ -329,7 +327,7 @@ namespace OpenSim.Region.Environment.Scenes } } - private void UpdateAvatars() + private void UpdateInWorldTime() { m_timeUpdateCount++; if (m_timeUpdateCount > 600) diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 96321c7..0072d4e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs @@ -31,9 +31,8 @@ using libsecondlife; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Region.Terrain; using OpenSim.Framework; +using OpenSim.Region.Terrain; namespace OpenSim.Region.Environment.Scenes { diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs index 1117324..ea47713 100644 --- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs +++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs @@ -29,6 +29,7 @@ using libsecondlife; using OpenSim.Framework.Interfaces; using OpenSim.Region.Environment.Interfaces; +using OpenSim.Framework; namespace OpenSim.Region.Environment.Scenes { diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index e844462..a315d02 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using OpenSim.Framework.Console; -using OpenSim.Framework.Types; +using OpenSim.Framework; using libsecondlife; namespace OpenSim.Region.Environment.Scenes diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index bb2eadb..4603902 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -35,7 +35,7 @@ using Axiom.Math; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Physics.Manager; diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index a0d1d2a..3e104e3 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -34,8 +34,7 @@ using Axiom.Math; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes.Scripting; using OpenSim.Region.Physics.Manager; diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 122a64f..6ed50b7 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -32,8 +32,7 @@ using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Physics.Manager; using OpenSim.Region.Environment.Types; diff --git a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs index 766e3a6..f5a080f 100644 --- a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs @@ -32,7 +32,7 @@ using System.Text; using OpenSim.Region.Environment.Scenes; using Axiom.Math; using libsecondlife; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Framework.Interfaces; namespace SimpleApp diff --git a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs index 1aff1a3..0f833ea 100644 --- a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using System.Text; using OpenSim.Region.Environment.Scenes; using libsecondlife; -using OpenSim.Framework.Types; +using OpenSim.Framework; using System.Timers; using System.Diagnostics; diff --git a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs index df504bc..746340f 100644 --- a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using System.Text; using OpenSim.Region.Environment.Scenes; using libsecondlife; -using OpenSim.Framework.Types; +using OpenSim.Framework; using System.Timers; using System.Diagnostics; using System.IO; diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index b935f24..03e0f98 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs @@ -32,8 +32,8 @@ using System.Text; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; +using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; using System; diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs index d642103..9a7b340 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs @@ -33,7 +33,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Interfaces; using OpenSim.Framework.Servers; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Terrain; diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 4783a17..72aaf6b 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs @@ -33,7 +33,7 @@ using System.Net; using libsecondlife; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.ClientStack; using OpenSim.Region.Communications.Local; using OpenSim.Region.Environment; @@ -128,7 +128,7 @@ namespace SimpleApp List avatars = scene.GetAvatars(); foreach (ScenePresence avatar in avatars) { - avatar.AbsolutePosition = new LLVector3((float)OpenSim.Framework.Utilities.Util.RandomClass.Next(100,200), (float)OpenSim.Framework.Utilities.Util.RandomClass.Next(30, 200), 2); + avatar.AbsolutePosition = new LLVector3((float)OpenSim.Framework.Util.RandomClass.Next(100,200), (float)OpenSim.Framework.Util.RandomClass.Next(30, 200), 2); } diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs index 8cde62e..a5bd48b 100644 --- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs +++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.Text; using OpenSim.Framework.Interfaces; using OpenSim.Framework; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types; using OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types.PrimitiveTypes; diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs index 5d4d4ab..b1258f6 100644 --- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs +++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs @@ -32,7 +32,7 @@ using System.IO; using System.Threading; using OpenSim.Framework; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; using OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM; using Thread = OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM.Thread; diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs index 85d9ff6..95e6095 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs @@ -27,7 +27,7 @@ */ using System.Collections.Generic; using Axiom.Math; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.Physics.BasicPhysicsPlugin diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 80c4eb3..9fdc017 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs @@ -59,7 +59,7 @@ using System; using System.Collections.Generic; using OpenSim.Region.Physics.Manager; -using OpenSim.Framework.Types; +using OpenSim.Framework; using Axiom.Math; using AxiomQuaternion = Axiom.Math.Quaternion; //Specific References for BulletXPlugin diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index bd06fa1..9ab2997 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Framework.Console; using Axiom.Math; diff --git a/OpenSim/Region/Physics/OdePlugin/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/OdePlugin/Meshing/Meshmerizer.cs index 17da483..dd18e24 100644 --- a/OpenSim/Region/Physics/OdePlugin/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/OdePlugin/Meshing/Meshmerizer.cs @@ -33,7 +33,7 @@ using System.Collections.Generic; using System.Text; using System.Runtime.InteropServices; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.Physics.OdePlugin diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 1cf4710..a20452f 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -33,7 +33,7 @@ using libsecondlife; using Axiom.Math; using Ode.NET; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Region.Physics.Manager; diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index d45bfd1..a7cef88 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs @@ -27,7 +27,7 @@ */ using System; using System.Collections.Generic; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Physics.Manager; using PhysXWrapper; using Quaternion=Axiom.Math.Quaternion; diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index 4388b31..b94cf90 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs @@ -37,7 +37,7 @@ using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler; using OpenSim.Region.ScriptEngine.Common; using OpenSim.Framework.Console; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using System.Runtime.Remoting.Lifetime; namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler @@ -610,7 +610,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler public string llList2Key(List src, int index) { - //return OpenSim.Framework.Types.ToStringHyphenated(src[index]); + //return OpenSim.Framework.ToStringHyphenated(src[index]); return src[index].ToString(); } diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs index ef0ddff..8f0a591 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs @@ -30,7 +30,7 @@ using System; using System.Collections.Generic; using System.Text; using libsecondlife; -using OpenSim.Framework.Interfaces; +using OpenSim.Framework; using OpenSim.Region.Environment.Scenes.Scripting; namespace OpenSim.Region.ScriptEngine.DotNetEngine diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs index 9188d10..729db7e 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs @@ -32,7 +32,7 @@ using System.Data; using libsecondlife; using Mono.Data.SqliteClient; using OpenSim.Framework.Console; -using OpenSim.Framework.Types; +using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.LandManagement; using OpenSim.Region.Environment.Scenes; @@ -228,7 +228,7 @@ namespace OpenSim.DataStore.MonoSqlite public void StoreTerrain(double[,] ter, LLUUID regionID) { - int revision = OpenSim.Framework.Utilities.Util.UnixTimeSinceEpoch(); + int revision = OpenSim.Framework.Util.UnixTimeSinceEpoch(); MainLog.Instance.Verbose("DATASTORE", "Storing terrain revision r" + revision.ToString()); -- cgit v1.1