diff options
author | lbsa71 | 2007-09-27 13:25:45 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-27 13:25:45 +0000 |
commit | 8143c597fc5f62ec0d931d2d5b887730e06aec04 (patch) | |
tree | ae67873a5f801b2b7bdf9a7b088db98beb97b5ac /OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |
parent | Terrain: (diff) | |
download | opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.zip opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.gz opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.bz2 opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.xz |
* Tleiades grid mode inventory (#444) - thanx Tleiades!
* updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/CachedUserInfo.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 99dc45a..9e8c239 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Framework.Utilities; | |||
38 | 38 | ||
39 | namespace OpenSim.Framework.Communications.Caches | 39 | namespace OpenSim.Framework.Communications.Caches |
40 | { | 40 | { |
41 | public class CachedUserInfo | 41 | public class CachedUserInfo : MarshalByRefObject |
42 | { | 42 | { |
43 | private CommunicationsManager m_parentCommsManager; | 43 | private CommunicationsManager m_parentCommsManager; |
44 | // Fields | 44 | // Fields |
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
51 | } | 51 | } |
52 | 52 | ||
53 | // Methods | 53 | // Methods |
54 | public void FolderReceive(LLUUID userID, InventoryFolder folderInfo) | 54 | public void FolderReceive(LLUUID userID, InventoryFolderBase folderInfo) |
55 | { | 55 | { |
56 | if (userID == this.UserProfile.UUID) | 56 | if (userID == this.UserProfile.UUID) |
57 | { | 57 | { |
@@ -59,19 +59,19 @@ namespace OpenSim.Framework.Communications.Caches | |||
59 | { | 59 | { |
60 | if (folderInfo.parentID == LLUUID.Zero) | 60 | if (folderInfo.parentID == LLUUID.Zero) |
61 | { | 61 | { |
62 | this.RootFolder = folderInfo; | 62 | this.RootFolder = new InventoryFolder(folderInfo); |
63 | } | 63 | } |
64 | } | 64 | } |
65 | else if (this.RootFolder.folderID == folderInfo.parentID) | 65 | else if (this.RootFolder.folderID == folderInfo.parentID) |
66 | { | 66 | { |
67 | this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo); | 67 | this.RootFolder.SubFolders.Add(folderInfo.folderID, new InventoryFolder(folderInfo)); |
68 | } | 68 | } |
69 | else | 69 | else |
70 | { | 70 | { |
71 | InventoryFolder folder = this.RootFolder.HasSubFolder(folderInfo.parentID); | 71 | InventoryFolder folder = this.RootFolder.HasSubFolder(folderInfo.parentID); |
72 | if (folder != null) | 72 | if (folder != null) |
73 | { | 73 | { |
74 | folder.SubFolders.Add(folderInfo.folderID, folderInfo); | 74 | folder.SubFolders.Add(folderInfo.folderID, new InventoryFolder(folderInfo)); |
75 | } | 75 | } |
76 | } | 76 | } |
77 | } | 77 | } |
@@ -131,3 +131,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
131 | 131 | ||
132 | } | 132 | } |
133 | 133 | ||
134 | |||
135 | |||
136 | |||
137 | |||