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/Framework/Communications/Cache | |
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/Framework/Communications/Cache')
5 files changed, 7 insertions, 18 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs index d0507d0..51fc462 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs | |||
@@ -32,10 +32,10 @@ using System.Text; | |||
32 | using System.IO; | 32 | using System.IO; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using libsecondlife.Packets; | 34 | using libsecondlife.Packets; |
35 | using OpenSim.Framework.Communications.Cache; | ||
35 | using OpenSim.Framework.Interfaces; | 36 | using OpenSim.Framework.Interfaces; |
36 | using OpenSim.Framework.Types; | 37 | using OpenSim.Framework.Types; |
37 | using OpenSim.Framework.Utilities; | 38 | using OpenSim.Framework.Utilities; |
38 | using OpenSim.Framework.Data; | ||
39 | using OpenSim.Region.Capabilities; | 39 | using OpenSim.Region.Capabilities; |
40 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | 41 | ||
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 99dc45a..b1432ff 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -25,22 +25,15 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | using System.IO; | ||
33 | using libsecondlife; | 28 | using libsecondlife; |
34 | using OpenSim.Framework.Interfaces; | ||
35 | using OpenSim.Framework.Types; | 29 | using OpenSim.Framework.Types; |
36 | using OpenSim.Framework.Data; | 30 | using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder; |
37 | using OpenSim.Framework.Utilities; | ||
38 | 31 | ||
39 | namespace OpenSim.Framework.Communications.Caches | 32 | namespace OpenSim.Framework.Communications.Cache |
40 | { | 33 | { |
41 | public class CachedUserInfo | 34 | public class CachedUserInfo |
42 | { | 35 | { |
43 | private CommunicationsManager m_parentCommsManager; | 36 | private readonly CommunicationsManager m_parentCommsManager; |
44 | // Fields | 37 | // Fields |
45 | public InventoryFolder RootFolder = null; | 38 | public InventoryFolder RootFolder = null; |
46 | public UserProfileData UserProfile = null; | 39 | public UserProfileData UserProfile = null; |
@@ -127,7 +120,4 @@ namespace OpenSim.Framework.Communications.Caches | |||
127 | return result; | 120 | return result; |
128 | } | 121 | } |
129 | } | 122 | } |
130 | 123 | } \ No newline at end of file | |
131 | |||
132 | } | ||
133 | |||
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs index 885cffc..fbe1bd0 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs | |||
@@ -32,7 +32,6 @@ using System.Text; | |||
32 | using System.IO; | 32 | using System.IO; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
35 | using OpenSim.Framework.Data; | ||
36 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
37 | using OpenSim.Framework.Utilities; | 36 | using OpenSim.Framework.Utilities; |
38 | 37 | ||
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index deef028..38fad68 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -3,8 +3,8 @@ using System.IO; | |||
3 | using System.Collections.Generic; | 3 | using System.Collections.Generic; |
4 | using System.Text; | 4 | using System.Text; |
5 | using libsecondlife; | 5 | using libsecondlife; |
6 | using OpenSim.Framework.Types; | ||
6 | using OpenSim.Framework.Utilities; | 7 | using OpenSim.Framework.Utilities; |
7 | using OpenSim.Framework.Data; | ||
8 | using Nini.Config; | 8 | using Nini.Config; |
9 | 9 | ||
10 | namespace OpenSim.Framework.Communications.Caches | 10 | namespace OpenSim.Framework.Communications.Caches |
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs index 390b938..9e32ea5 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs | |||
@@ -31,10 +31,10 @@ using System.Collections.Generic; | |||
31 | using System.Text; | 31 | using System.Text; |
32 | using System.IO; | 32 | using System.IO; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using OpenSim.Framework.Communications.Cache; | ||
34 | using OpenSim.Framework.Interfaces; | 35 | using OpenSim.Framework.Interfaces; |
35 | using OpenSim.Framework.Types; | 36 | using OpenSim.Framework.Types; |
36 | using OpenSim.Framework.Utilities; | 37 | using OpenSim.Framework.Utilities; |
37 | using OpenSim.Framework.Data; | ||
38 | 38 | ||
39 | namespace OpenSim.Framework.Communications.Caches | 39 | namespace OpenSim.Framework.Communications.Caches |
40 | { | 40 | { |