ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
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.
This commit is contained in:
MW
2007-10-29 21:46:25 +00:00
parent f6e8cbbd06
commit 3d8219f6c7
145 changed files with 4749 additions and 4776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/Application.cs
View File

@@ -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");
}

6
OpenSim/Region/Application/OpenSimController.cs
View File

@@ -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
{

8
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -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
{

10
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@@ -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; }

1
OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
View File

@@ -29,6 +29,7 @@ using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework;
namespace OpenSim.Region.ClientStack
{

2
OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
View File

@@ -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

4
OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
View File

@@ -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;

4
OpenSim/Region/ClientStack/ClientView.cs
View File

@@ -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

2
OpenSim/Region/ClientStack/PacketServer.cs
View File

@@ -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;

2
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@@ -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;

2
OpenSim/Region/ClientStack/UDPServer.cs
View File

@@ -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;

2
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@@ -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
{

2
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@@ -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

2
OpenSim/Region/Communications/Local/LocalInventoryService.cs
View File

@@ -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
{

6
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@@ -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;

2
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@@ -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

2
OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
View File

@@ -28,7 +28,7 @@
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Types;
using OpenSim.Framework;
using OpenSim.Framework.Servers;

4
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@@ -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"]);

2
OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
View File

@@ -28,7 +28,7 @@
using System;
using libsecondlife;
using OpenSim.Framework.Types;
using OpenSim.Framework;
namespace OpenSim.Region.Communications.OGS1
{

2
OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
View File

@@ -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

2
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@@ -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
{

2
OpenSim/Region/Environment/EstateManager.cs
View File

@@ -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;

2
OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs
View File

@@ -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
{

2
OpenSim/Region/Environment/Interfaces/ISimChat.cs
View File

@@ -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);
}
}

1
OpenSim/Region/Environment/Interfaces/ITerrain.cs
View File

@@ -27,6 +27,7 @@
*/
using OpenSim.Framework.Interfaces;
using OpenSim.Framework;
namespace OpenSim.Region.Environment.Interfaces
{

2
OpenSim/Region/Environment/LandManagement/Land.cs
View File

@@ -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

2
OpenSim/Region/Environment/LandManagement/LandManager.cs
View File

@@ -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

1
OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
View File

@@ -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

2
OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
View File

@@ -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;

1
OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
View File

@@ -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

2
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@@ -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;

3
OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
View File

@@ -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;

3
OpenSim/Region/Environment/Modules/InstantMessageModule.cs
View File

@@ -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;
}

3
OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
View File

@@ -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;

2
OpenSim/Region/Environment/Modules/WorldCommModule.cs
View File

@@ -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;

2
OpenSim/Region/Environment/Modules/XMLRPCModule.cs
View File

@@ -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;

1
OpenSim/Region/Environment/Modules/XferModule.cs
View File

@@ -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

2
OpenSim/Region/Environment/PermissionManager.cs
View File

@@ -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
{

1
OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
View File

@@ -28,6 +28,7 @@
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework;
using OpenSim.Framework.Interfaces;
namespace OpenSim.Region.Environment.Scenes

3
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@@ -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

3
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@@ -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;

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -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)

3
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@@ -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
{

1
OpenSim/Region/Environment/Scenes/SceneEvents.cs
View File

@@ -29,6 +29,7 @@
using libsecondlife;
using OpenSim.Framework.Interfaces;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Framework;
namespace OpenSim.Region.Environment.Scenes
{

2
OpenSim/Region/Environment/Scenes/SceneManager.cs
View File

@@ -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

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@@ -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;

3
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@@ -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;

3
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@@ -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;

2
OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
View File

@@ -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

2
OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
View File

@@ -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;

2
OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs
View File

@@ -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;

4
OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
View File

@@ -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;

2
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@@ -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;

4
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@@ -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<ScenePresence> 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);
}

2
OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
View File

@@ -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;

2
OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/OpenSimJVM.cs
View File

@@ -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;

2
OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
View File

@@ -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

2
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
View File

@@ -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

2
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@@ -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;

2
OpenSim/Region/Physics/OdePlugin/Meshing/Meshmerizer.cs
View File

@@ -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

2
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@@ -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;

2
OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
View File

@@ -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;

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
View File

@@ -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<string> src, int index)
{
//return OpenSim.Framework.Types.ToStringHyphenated(src[index]);
//return OpenSim.Framework.ToStringHyphenated(src[index]);
return src[index].ToString();
}

2
OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
View File

@@ -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

4
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
View File

@@ -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());