OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This changeset is the step 1 of 2 in refactoring 

OpenSim.Region.Environment into a "framework" part and a modules only
part. This first changeset refactors OpenSim.Region.Environment.Scenes,
OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces
into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region
modules in OpenSim.Region.Environment.

The next step will be to move region modules up from
OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and
then sort out which modules are really core modules and which should
move out to forge.

I've been very careful to NOT BREAK anything. i hope i've
succeeded. as this is the work of a whole week i hope i managed to
keep track with the applied patches of the last week --- could any of
you that did check in stuff have a look at whether it survived? thx!
0.6.3-post-fixes
Dr Scofield 2009-02-06 16:55:34 +00:00
parent 3bc6eb1ff0
commit 9b66108081
327 changed files with 1102 additions and 919 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

@ -34,6 +34,12 @@ using OpenSim.Framework;
using OpenSim.Framework.RegionLoader.Filesystem; using OpenSim.Framework.RegionLoader.Filesystem;
using OpenSim.Framework.RegionLoader.Web; using OpenSim.Framework.RegionLoader.Web;
using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
namespace OpenSim.ApplicationPlugins.LoadRegions namespace OpenSim.ApplicationPlugins.LoadRegions
{ {
public class LoadRegionsPlugin : IApplicationPlugin public class LoadRegionsPlugin : IApplicationPlugin
@ -74,8 +80,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
regionLoader.SetIniConfigSource(openSim.ConfigSource.Source); regionLoader.SetIniConfigSource(openSim.ConfigSource.Source);
RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
openSim.ModuleLoader.LoadDefaultSharedModules(); openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
openSim.ModuleLoader.LoadDefaultSharedModule(new InstantMessageModule());
openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
if (!CheckRegionsForSanity(regionsToLoad)) if (!CheckRegionsForSanity(regionsToLoad))
{ {
m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations");

4
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -37,9 +37,9 @@ using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.Environment.Scenes;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.ApplicationPlugins.RemoteController namespace OpenSim.ApplicationPlugins.RemoteController

2
OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
View File

@ -33,7 +33,7 @@ using System.IO;
using System.Threading; using System.Threading;
using System.Xml; using System.Xml;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;

4
OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
View File

@ -44,8 +44,8 @@ using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.ApplicationPlugins.Rest; using OpenSim.ApplicationPlugins.Rest;
namespace OpenSim.ApplicationPlugins.Rest.Regions namespace OpenSim.ApplicationPlugins.Rest.Regions

4
OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
View File

@ -44,8 +44,8 @@ using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.ApplicationPlugins.Rest; using OpenSim.ApplicationPlugins.Rest;
namespace OpenSim.ApplicationPlugins.Rest.Regions namespace OpenSim.ApplicationPlugins.Rest.Regions

2
OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
View File

@ -31,7 +31,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.ApplicationPlugins.Rest.Regions namespace OpenSim.ApplicationPlugins.Rest.Regions
{ {

2
OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
View File

@ -43,7 +43,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.ApplicationPlugins.Rest; using OpenSim.ApplicationPlugins.Rest;
namespace OpenSim.ApplicationPlugins.Rest.Regions namespace OpenSim.ApplicationPlugins.Rest.Regions

2
OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
View File

@ -41,7 +41,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.ApplicationPlugins.Rest namespace OpenSim.ApplicationPlugins.Rest
{ {

4
OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
View File

@ -30,8 +30,8 @@ using System.Reflection;
using System.Text; using System.Text;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.ScriptEngine.Shared; using OpenSim.ScriptEngine.Shared;
namespace OpenSim.ApplicationPlugins.ScriptEngine namespace OpenSim.ApplicationPlugins.ScriptEngine

2
OpenSim/Data/MSSQL/MSSQLEstateData.cs
View File

@ -33,7 +33,7 @@ using System.Reflection;
using OpenMetaverse; using OpenMetaverse;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Data.MSSQL namespace OpenSim.Data.MSSQL
{ {

4
OpenSim/Data/MSSQL/MSSQLRegionData.cs
View File

@ -35,8 +35,8 @@ using System.Reflection;
using OpenMetaverse; using OpenMetaverse;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.MSSQL namespace OpenSim.Data.MSSQL
{ {

4
OpenSim/Data/MySQL/MySQLEstateData.cs
View File

@ -35,8 +35,8 @@ using OpenMetaverse;
using log4net; using log4net;
using MySql.Data.MySqlClient; using MySql.Data.MySqlClient;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.MySQL namespace OpenSim.Data.MySQL
{ {

4
OpenSim/Data/MySQL/MySQLRegionData.cs
View File

@ -36,8 +36,8 @@ using OpenMetaverse;
using log4net; using log4net;
using MySql.Data.MySqlClient; using MySql.Data.MySqlClient;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.MySQL namespace OpenSim.Data.MySQL
{ {

2
OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.MySQL; using OpenSim.Data.MySQL;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests namespace OpenSim.Data.MySQL.Tests

2
OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.MySQL; using OpenSim.Data.MySQL;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests namespace OpenSim.Data.MySQL.Tests

2
OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.MySQL; using OpenSim.Data.MySQL;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using log4net; using log4net;

2
OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.MySQL; using OpenSim.Data.MySQL;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests namespace OpenSim.Data.MySQL.Tests

2
OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.MySQL; using OpenSim.Data.MySQL;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests namespace OpenSim.Data.MySQL.Tests

6
OpenSim/Data/NHibernate/NHibernateRegionData.cs
View File

@ -36,9 +36,9 @@ using log4net;
using NHibernate; using NHibernate;
using NHibernate.Criterion; using NHibernate.Criterion;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using Environment=NHibernate.Cfg.Environment; using Environment = NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate namespace OpenSim.Data.NHibernate
{ {

2
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests namespace OpenSim.Data.NHibernate.Tests

2
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
View File

@ -32,7 +32,7 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers; using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;

2
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using log4net; using log4net;

2
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests namespace OpenSim.Data.NHibernate.Tests

2
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests namespace OpenSim.Data.NHibernate.Tests

2
OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests namespace OpenSim.Data.NHibernate.Tests

2
OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
View File

@ -32,7 +32,7 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers; using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;

2
OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using log4net; using log4net;

2
OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests namespace OpenSim.Data.NHibernate.Tests

2
OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests namespace OpenSim.Data.NHibernate.Tests

2
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests namespace OpenSim.Data.NHibernate.Tests

2
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
View File

@ -32,7 +32,7 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers; using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;

2
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using log4net; using log4net;

2
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests namespace OpenSim.Data.NHibernate.Tests

2
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate; using OpenSim.Data.NHibernate;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests namespace OpenSim.Data.NHibernate.Tests

4
OpenSim/Data/Null/NullDataStore.cs
View File

@ -28,8 +28,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.Null namespace OpenSim.Data.Null
{ {

4
OpenSim/Data/SQLite/SQLiteEstateData.cs
View File

@ -35,8 +35,8 @@ using OpenMetaverse;
using Mono.Data.SqliteClient; using Mono.Data.SqliteClient;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.SQLite namespace OpenSim.Data.SQLite
{ {

4
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -36,8 +36,8 @@ using OpenMetaverse;
using log4net; using log4net;
using Mono.Data.SqliteClient; using Mono.Data.SqliteClient;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.SQLite namespace OpenSim.Data.SQLite
{ {

2
OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.SQLite; using OpenSim.Data.SQLite;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.SQLite.Tests namespace OpenSim.Data.SQLite.Tests

2
OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.SQLite; using OpenSim.Data.SQLite;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using log4net; using log4net;

2
OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.SQLite; using OpenSim.Data.SQLite;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.SQLite.Tests namespace OpenSim.Data.SQLite.Tests

2
OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
View File

@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Tests; using OpenSim.Data.Tests;
using OpenSim.Data.SQLite; using OpenSim.Data.SQLite;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.SQLite.Tests namespace OpenSim.Data.SQLite.Tests

2
OpenSim/Data/Tests/BasicAssetTest.cs
View File

@ -31,7 +31,7 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers; using NUnit.Framework.SyntaxHelpers;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.Tests namespace OpenSim.Data.Tests

2
OpenSim/Data/Tests/BasicGridTest.cs
View File

@ -32,7 +32,7 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers; using NUnit.Framework.SyntaxHelpers;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.Tests namespace OpenSim.Data.Tests

2
OpenSim/Data/Tests/BasicInventoryTest.cs
View File

@ -31,7 +31,7 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers; using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.Tests namespace OpenSim.Data.Tests

4
OpenSim/Data/Tests/BasicRegionTest.cs
View File

@ -33,8 +33,8 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers; using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Land; using OpenSim.Region.Environment.Modules.World.Land;
using OpenMetaverse; using OpenMetaverse;

2
OpenSim/Data/Tests/BasicUserTest.cs
View File

@ -34,7 +34,7 @@ using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers; using NUnit.Framework.SyntaxHelpers;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Data.Tests namespace OpenSim.Data.Tests

10
OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
View File

@ -163,8 +163,11 @@ namespace OpenSim.Framework.Communications.Cache
passwordIterations); passwordIterations);
// Use the password to generate pseudo-random bytes for the encryption // Use the password to generate pseudo-random bytes for the encryption
// key. Specify the size of the key in bytes (instead of bits). // key. Specify the size of the key in bytes (instead
// of bits).
#pragma warning disable 0618
byte[] keyBytes = password.GetBytes(keySize / 8); byte[] keyBytes = password.GetBytes(keySize / 8);
#pragma warning restore 0618
// Create uninitialized Rijndael encryption object. // Create uninitialized Rijndael encryption object.
RijndaelManaged symmetricKey = new RijndaelManaged(); RijndaelManaged symmetricKey = new RijndaelManaged();
@ -276,8 +279,11 @@ namespace OpenSim.Framework.Communications.Cache
passwordIterations); passwordIterations);
// Use the password to generate pseudo-random bytes for the encryption // Use the password to generate pseudo-random bytes for the encryption
// key. Specify the size of the key in bytes (instead of bits). // key. Specify the size of the key in bytes (instead
// of bits).
#pragma warning disable 0618
byte[] keyBytes = password.GetBytes(keySize / 8); byte[] keyBytes = password.GetBytes(keySize / 8);
#pragma warning restore 0618
// Create uninitialized Rijndael encryption object. // Create uninitialized Rijndael encryption object.
RijndaelManaged symmetricKey = new RijndaelManaged(); RijndaelManaged symmetricKey = new RijndaelManaged();

2
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -35,7 +35,7 @@ using log4net;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Interfaces; // using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Framework.Communications.Capabilities namespace OpenSim.Framework.Communications.Capabilities
{ {

2
OpenSim/Region/Interfaces/IMoneyModule.cs → OpenSim/Framework/IMoneyModule.cs
View File

@ -29,7 +29,7 @@ using System;
using OpenSim.Framework; using OpenSim.Framework;
using OpenMetaverse; using OpenMetaverse;
namespace OpenSim.Region.Interfaces namespace OpenSim.Framework
{ {
public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount); public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount);
public interface IMoneyModule public interface IMoneyModule

7
OpenSim/Region/Application/HGOpenSimNode.cs
View File

@ -44,9 +44,10 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.Local;
using OpenSim.Region.Communications.Hypergrid; using OpenSim.Region.Communications.Hypergrid;
using OpenSim.Region.Environment; using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes.Hypergrid; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Scenes.Hypergrid;
using Timer = System.Timers.Timer; using Timer = System.Timers.Timer;

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

@ -39,8 +39,8 @@ using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver; using OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver;
using Timer=System.Timers.Timer; using Timer=System.Timers.Timer;

5
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -45,8 +45,9 @@ using OpenSim.Region.ClientStack;
using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.Local;
using OpenSim.Region.Communications.OGS1; using OpenSim.Region.Communications.OGS1;
using OpenSim.Region.Environment; using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
namespace OpenSim namespace OpenSim

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

@ -29,7 +29,7 @@ using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.ClientStack namespace OpenSim.Region.ClientStack

27
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -41,9 +41,8 @@ using OpenSim.Framework;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Scenes;
using Timer = System.Timers.Timer; using Timer = System.Timers.Timer;
namespace OpenSim.Region.ClientStack.LindenUDP namespace OpenSim.Region.ClientStack.LindenUDP
@ -475,7 +474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_PacketHandler.OnPacketStats += PopulateStats; m_PacketHandler.OnPacketStats += PopulateStats;
RegisterLocalPacketHandlers(); RegisterLocalPacketHandlers();
m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Environment.Interfaces.IJ2KDecoder>()); m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Framework.Interfaces.IJ2KDecoder>());
} }
public void SetDebugPacketLevel(int newDebugPacketLevel) public void SetDebugPacketLevel(int newDebugPacketLevel)
@ -1214,20 +1213,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
dialog = 17; dialog = 17;
OSD Item = Environment.EventQueueHelper.ChatterboxInvitation( eq.ChatterboxInvitation(
new UUID("00000000-68f9-1111-024e-222222111123"), new UUID("00000000-68f9-1111-024e-222222111123"),
"OpenSimulator Testing", fromAgent, message, toAgent, fromName, dialog, 0, "OpenSimulator Testing", fromAgent, message, toAgent, fromName, dialog, 0,
false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket); false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket);
eq.Enqueue(Item, toAgent); eq.ChatterBoxSessionAgentListUpdates(
m_log.Info("########### eq ChatterboxInvitation #############\n" + Item);
Item = Environment.EventQueueHelper.ChatterBoxSessionAgentListUpdates(
new UUID("00000000-68f9-1111-024e-222222111123"), new UUID("00000000-68f9-1111-024e-222222111123"),
fromAgent, false, false, false); fromAgent, toAgent, false, false, false);
eq.Enqueue(Item, toAgent);
m_log.Info("########### eq ChatterBoxSessionAgentListUpdates #############\n" + Item);
} }
System.Console.WriteLine("SendInstantMessage: " + msg); System.Console.WriteLine("SendInstantMessage: " + msg);
@ -3193,9 +3186,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
if (eq != null) if (eq != null)
{ {
OSD Item = Environment.EventQueueHelper.ParcelProperties(updatePacket); eq.ParcelProperties(updatePacket, this.AgentId);
eq.Enqueue(Item, this.AgentId);
} }
} }
catch (Exception ex) catch (Exception ex)
@ -7608,9 +7599,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
if (eq != null) if (eq != null)
{ {
OSD Item = Environment.EventQueueHelper.GroupMembership(Groupupdate); eq.GroupMembership(Groupupdate, this.AgentId);
eq.Enqueue(Item, this.AgentId);
} }
} }
catch (Exception ex) catch (Exception ex)

4
OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
View File

@ -35,8 +35,8 @@ using OpenSim.Framework;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.ClientStack.LindenUDP namespace OpenSim.Region.ClientStack.LindenUDP
{ {

2
OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using C5; using C5;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenMetaverse.Imaging; using OpenMetaverse.Imaging;

2
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -36,7 +36,7 @@ using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.ClientStack.LindenUDP namespace OpenSim.Region.ClientStack.LindenUDP
{ {

2
OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
View File

@ -29,7 +29,7 @@ using System.Xml;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.ClientStack.LindenUDP.Tests namespace OpenSim.Region.ClientStack.LindenUDP.Tests
{ {

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

@ -36,8 +36,9 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment; using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
namespace OpenSim.Region.ClientStack namespace OpenSim.Region.ClientStack

2
OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
View File

@ -34,7 +34,7 @@ using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Communications.OGS1; using OpenSim.Region.Communications.OGS1;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Communications.Hypergrid namespace OpenSim.Region.Communications.Hypergrid
{ {

6
OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
View File

@ -52,9 +52,9 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.Local;
using OpenSim.Region.Communications.OGS1; using OpenSim.Region.Communications.OGS1;
using OpenSim.Region.Environment.Modules.Framework; // using OpenSim.Region.Environment.Modules.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Communications.Hypergrid namespace OpenSim.Region.Communications.Hypergrid
{ {

2
OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
View File

@ -35,7 +35,7 @@ using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Communications.OGS1; using OpenSim.Region.Communications.OGS1;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;

2
OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
View File

@ -42,7 +42,7 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.Local;
using OpenSim.Region.Communications.OGS1; using OpenSim.Region.Communications.OGS1;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using Nwc.XmlRpc; using Nwc.XmlRpc;

2
OpenSim/Region/DataSnapshot/DataRequestHandler.cs
View File

@ -31,7 +31,7 @@ using System.Collections;
using System.Reflection; using System.Reflection;
using System.Xml; using System.Xml;
using log4net; using log4net;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Communications.Capabilities;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
using OpenMetaverse; using OpenMetaverse;

4
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
View File

@ -39,8 +39,8 @@ using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.DataSnapshot.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
namespace OpenSim.Region.DataSnapshot namespace OpenSim.Region.DataSnapshot

2
OpenSim/Region/DataSnapshot/EstateSnapshot.cs
View File

@ -30,7 +30,7 @@ using System.Xml;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.DataSnapshot.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.DataSnapshot.Providers namespace OpenSim.Region.DataSnapshot.Providers
{ {

2
OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Xml; using System.Xml;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.DataSnapshot.Interfaces namespace OpenSim.Region.DataSnapshot.Interfaces
{ {

4
OpenSim/Region/DataSnapshot/LandSnapshot.cs
View File

@ -33,9 +33,9 @@ using OpenMetaverse;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.DataSnapshot.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Modules.World.Land; using OpenSim.Region.Environment.Modules.World.Land;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;

4
OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
View File

@ -31,8 +31,8 @@ using System.Reflection;
using System.Xml; using System.Xml;
using log4net; using log4net;
using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.DataSnapshot.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Land; using OpenSim.Region.Environment.Modules.World.Land;
using OpenSim.Framework; using OpenSim.Framework;
using OpenMetaverse; using OpenMetaverse;

2
OpenSim/Region/DataSnapshot/SnapshotStore.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using System.IO; using System.IO;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.DataSnapshot.Interfaces;
using OpenMetaverse; using OpenMetaverse;

4
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
View File

@ -30,8 +30,8 @@ using System.Collections.Generic;
//using log4net; //using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
{ {

2
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction

5
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
View File

@ -30,9 +30,8 @@ using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
{ {

2
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
View File

@ -33,7 +33,7 @@ using OpenMetaverse;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
{ {

6
OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
View File

@ -34,8 +34,8 @@ using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Communications.Capabilities;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps; using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
namespace OpenSim.Region.Environment.Modules.Agent.Capabilities namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
@ -100,7 +100,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
caps.ItemUpdatedCall = m_scene.CapsUpdateInventoryItemAsset; caps.ItemUpdatedCall = m_scene.CapsUpdateInventoryItemAsset;
caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset; caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset;
caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS; caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS;
caps.GetClient = m_scene.m_sceneGraph.GetControllingClient; caps.GetClient = m_scene.SceneContents.GetControllingClient;
m_capsHandlers[agentId] = caps; m_capsHandlers[agentId] = caps;
} }

6
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
View File

@ -31,10 +31,10 @@ using System.Threading;
using OpenMetaverse; using OpenMetaverse;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Environment.Interfaces.ITextureSender>; using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>;
namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{ {

2
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
View File

@ -30,7 +30,7 @@ using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{ {

4
OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
View File

@ -32,8 +32,8 @@ using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Limit; using OpenSim.Framework.Communications.Limit;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
{ {

4
OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs
View File

@ -36,8 +36,8 @@ using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Imaging; using OpenMetaverse.Imaging;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.TextureSender namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
{ {

2
OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
View File

@ -30,7 +30,7 @@ using System.Reflection;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.Agent.TextureSender namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
{ {

4
OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
View File

@ -30,8 +30,8 @@ using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.Xfer namespace OpenSim.Region.Environment.Modules.Agent.Xfer
{ {

4
OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -35,8 +35,8 @@ using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
{ {

4
OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
View File

@ -32,8 +32,8 @@ using System.Text.RegularExpressions;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Chat namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{ {

4
OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
View File

@ -36,8 +36,8 @@ using OpenMetaverse;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Chat namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{ {

4
OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
View File

@ -33,8 +33,8 @@ using log4net;
using Nini.Config; using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Chat namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{ {

4
OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
View File

@ -37,8 +37,8 @@ using OpenMetaverse;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Chat namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{ {

4
OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs
View File

@ -32,8 +32,8 @@ using System.Text.RegularExpressions;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Chat namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{ {

5
OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
View File

@ -37,9 +37,8 @@ using log4net;
using Nini.Config; using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule

4
OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
View File

@ -41,8 +41,8 @@ using Nwc.XmlRpc;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.Avatar.Chat; using OpenSim.Region.Environment.Modules.Avatar.Chat;
namespace OpenSim.Region.Environment.Modules.Avatar.Concierge namespace OpenSim.Region.Environment.Modules.Avatar.Concierge

5
OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
View File

@ -39,9 +39,8 @@ using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
{ {

4
OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
View File

@ -31,8 +31,8 @@ using log4net;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Dialog namespace OpenSim.Region.Environment.Modules.Avatar.Dialog
{ {

5
OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
View File

@ -36,9 +36,8 @@ using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Friends namespace OpenSim.Region.Environment.Modules.Avatar.Friends
{ {

4
OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
View File

@ -31,8 +31,8 @@ using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using System.Reflection; using System.Reflection;
namespace OpenSim.Region.Environment.Modules.Avatar.Gestures namespace OpenSim.Region.Environment.Modules.Avatar.Gestures

4
OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
View File

@ -32,8 +32,8 @@ using OpenMetaverse;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Groups namespace OpenSim.Region.Environment.Modules.Avatar.Groups
{ {

5
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@ -36,9 +36,8 @@ using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
{ {

5
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@ -36,9 +36,8 @@ using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
{ {

5
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
View File

@ -36,9 +36,8 @@ using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Client; using OpenSim.Framework.Client;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
{ {

2
OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
View File

@ -32,7 +32,7 @@ using System.IO.Compression;
using System.Reflection; using System.Reflection;
using System.Xml; using System.Xml;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Archiver; using OpenSim.Region.Environment.Modules.World.Archiver;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;

2
OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
View File

@ -32,7 +32,7 @@ using System.IO.Compression;
using System.Reflection; using System.Reflection;
using System.Xml; using System.Xml;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Archiver; using OpenSim.Region.Environment.Modules.World.Archiver;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;

5
OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@ -33,9 +33,8 @@ using OpenMetaverse;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer

Some files were not shown because too many files have changed in this diff Show More