diff options
author | lbsa71 | 2007-10-05 10:14:42 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-05 10:14:42 +0000 |
commit | 5a6552120395611e66a88821ce848a06c9ea4720 (patch) | |
tree | d23780998986524b160ba97292022809efcff0bc /OpenSim/Region | |
parent | * ignored ScriptServer/bin (diff) | |
download | opensim-SC-5a6552120395611e66a88821ce848a06c9ea4720.zip opensim-SC-5a6552120395611e66a88821ce848a06c9ea4720.tar.gz opensim-SC-5a6552120395611e66a88821ce848a06c9ea4720.tar.bz2 opensim-SC-5a6552120395611e66a88821ce848a06c9ea4720.tar.xz |
== The "right name and place" commit ==
* Moved InventoryData to Framework.Types/InventoryItemBase.cs
* Moved UserData to Framework.Interfaces/IUserData.cs
* Moved UserProfileData to Framework/Types/UserProfileData.cs
* Deleted ass-backwards Framework dependency on Framework.Data (now it's the other way round)
* Changed some namespaces to reflect file structure
Diffstat (limited to 'OpenSim/Region')
10 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index 253807c..ed3c16c 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -35,7 +35,6 @@ using libsecondlife.Packets; | |||
35 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
36 | using OpenSim.Framework.Interfaces; | 36 | using OpenSim.Framework.Interfaces; |
37 | using OpenSim.Framework.Types; | 37 | using OpenSim.Framework.Types; |
38 | using OpenSim.Framework.Data; | ||
39 | using OpenSim.Framework.Utilities; | 38 | using OpenSim.Framework.Utilities; |
40 | 39 | ||
41 | namespace OpenSim.Region.ClientStack | 40 | namespace OpenSim.Region.ClientStack |
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 6ae8b65..62e2afd 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -31,7 +31,6 @@ using System.Net; | |||
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Communications.Cache; | 32 | using OpenSim.Framework.Communications.Cache; |
33 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
34 | using OpenSim.Framework.Data; | ||
35 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
36 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.Types; | 36 | using OpenSim.Framework.Types; |
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index 53f6ffa..dc91663 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -1,7 +1,7 @@ | |||
1 | using System.Collections.Generic; | 1 | using System.Collections.Generic; |
2 | using libsecondlife; | 2 | using libsecondlife; |
3 | using OpenSim.Framework.Communications; | 3 | using OpenSim.Framework.Communications; |
4 | using OpenSim.Framework.Data; | 4 | using OpenSim.Framework.Types; |
5 | using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder; | 5 | using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder; |
6 | 6 | ||
7 | namespace OpenSim.Region.Communications.Local | 7 | namespace OpenSim.Region.Communications.Local |
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index ab8e397..9835583 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -3,7 +3,6 @@ using System.Collections; | |||
3 | using System.Collections.Generic; | 3 | using System.Collections.Generic; |
4 | using libsecondlife; | 4 | using libsecondlife; |
5 | using OpenSim.Framework.Communications; | 5 | using OpenSim.Framework.Communications; |
6 | using OpenSim.Framework.Data; | ||
7 | using OpenSim.Framework.Types; | 6 | using OpenSim.Framework.Types; |
8 | using OpenSim.Framework.UserManagement; | 7 | using OpenSim.Framework.UserManagement; |
9 | using OpenSim.Framework.Utilities; | 8 | using OpenSim.Framework.Utilities; |
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 4e75eb0..ac680ca 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -1,6 +1,5 @@ | |||
1 | using System; | 1 | using System; |
2 | using OpenSim.Framework.Communications; | 2 | using OpenSim.Framework.Communications; |
3 | using OpenSim.Framework.Data; | ||
4 | using OpenSim.Framework.Types; | 3 | using OpenSim.Framework.Types; |
5 | using OpenSim.Framework.UserManagement; | 4 | using OpenSim.Framework.UserManagement; |
6 | 5 | ||
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 45188c1..f364771 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -1,7 +1,7 @@ | |||
1 | using System.Collections.Generic; | 1 | using System.Collections.Generic; |
2 | using libsecondlife; | 2 | using libsecondlife; |
3 | using OpenSim.Framework.Communications; | 3 | using OpenSim.Framework.Communications; |
4 | using OpenSim.Framework.Data; | 4 | using OpenSim.Framework.Types; |
5 | using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder; | 5 | using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder; |
6 | 6 | ||
7 | 7 | ||
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 90fef86..32f39b4 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -2,8 +2,8 @@ using System; | |||
2 | using System.Collections; | 2 | using System.Collections; |
3 | using libsecondlife; | 3 | using libsecondlife; |
4 | using Nwc.XmlRpc; | 4 | using Nwc.XmlRpc; |
5 | using OpenSim.Framework.Data; | ||
6 | using OpenSim.Framework.Interfaces; | 5 | using OpenSim.Framework.Interfaces; |
6 | using OpenSim.Framework.Types; | ||
7 | 7 | ||
8 | namespace OpenSim.Region.Communications.OGS1 | 8 | namespace OpenSim.Region.Communications.OGS1 |
9 | { | 9 | { |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index bcc02ea..b7f5bad 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -1,8 +1,8 @@ | |||
1 | using Axiom.Math; | 1 | using Axiom.Math; |
2 | using libsecondlife; | 2 | using libsecondlife; |
3 | using libsecondlife.Packets; | 3 | using libsecondlife.Packets; |
4 | using OpenSim.Framework.Communications.Cache; | ||
4 | using OpenSim.Framework.Communications.Caches; | 5 | using OpenSim.Framework.Communications.Caches; |
5 | using OpenSim.Framework.Data; | ||
6 | using OpenSim.Framework.Interfaces; | 6 | using OpenSim.Framework.Interfaces; |
7 | using OpenSim.Framework.Types; | 7 | using OpenSim.Framework.Types; |
8 | using OpenSim.Framework.Utilities; | 8 | using OpenSim.Framework.Utilities; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index da9f366..5989879 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -6,7 +6,6 @@ using System.Xml; | |||
6 | using Axiom.Math; | 6 | using Axiom.Math; |
7 | using libsecondlife; | 7 | using libsecondlife; |
8 | using libsecondlife.Packets; | 8 | using libsecondlife.Packets; |
9 | using OpenSim.Framework.Data; | ||
10 | using OpenSim.Framework.Interfaces; | 9 | using OpenSim.Framework.Interfaces; |
11 | using OpenSim.Framework.Types; | 10 | using OpenSim.Framework.Types; |
12 | using OpenSim.Region.Environment.Interfaces; | 11 | using OpenSim.Region.Environment.Interfaces; |
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index 7836199..41dea8e 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | |||
@@ -3,7 +3,6 @@ using System.Net; | |||
3 | using System.Text; | 3 | using System.Text; |
4 | using libsecondlife; | 4 | using libsecondlife; |
5 | using libsecondlife.Packets; | 5 | using libsecondlife.Packets; |
6 | using OpenSim.Framework.Data; | ||
7 | using OpenSim.Framework.Interfaces; | 6 | using OpenSim.Framework.Interfaces; |
8 | using OpenSim.Framework.Types; | 7 | using OpenSim.Framework.Types; |
9 | using OpenSim.Framework.Utilities; | 8 | using OpenSim.Framework.Utilities; |