diff options
author | Diva Canto | 2009-08-12 20:39:48 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-12 20:39:48 -0700 |
commit | 7aa54593e0b6672979feec97b8151ed134388723 (patch) | |
tree | eaa145993ba39c61f6cbfcd202deb50fbd125fe6 /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |
parent | * Added two new packet handler implementations for inventory ops. This is sta... (diff) | |
download | opensim-SC_OLD-7aa54593e0b6672979feec97b8151ed134388723.zip opensim-SC_OLD-7aa54593e0b6672979feec97b8151ed134388723.tar.gz opensim-SC_OLD-7aa54593e0b6672979feec97b8151ed134388723.tar.bz2 opensim-SC_OLD-7aa54593e0b6672979feec97b8151ed134388723.tar.xz |
Redirected all calls to CachedUserProfile methods to the inventory service. Redirection of the RootFolder property is still todo. This compiles but probably inventory will be inconsistent.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index b6250a2..49b2b5c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -39,6 +39,7 @@ using OpenSim.Framework.Communications; | |||
39 | using OpenSim.Framework.Communications.Cache; | 39 | using OpenSim.Framework.Communications.Cache; |
40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Services.Interfaces; | ||
42 | 43 | ||
43 | namespace OpenSim.Region.CoreModules.Avatar.Friends | 44 | namespace OpenSim.Region.CoreModules.Avatar.Friends |
44 | { | 45 | { |
@@ -654,8 +655,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
654 | initiator.ControllingClient.SendAgentOnline(new UUID[] { fromAgentID }); | 655 | initiator.ControllingClient.SendAgentOnline(new UUID[] { fromAgentID }); |
655 | 656 | ||
656 | // find the folder for the friend... | 657 | // find the folder for the friend... |
657 | InventoryFolderImpl folder = | 658 | //InventoryFolderImpl folder = |
658 | initiator.Scene.CommsManager.UserProfileCacheService.GetUserDetails(toAgentID).FindFolderForType((int)InventoryType.CallingCard); | 659 | // initiator.Scene.CommsManager.UserProfileCacheService.GetUserDetails(toAgentID).FindFolderForType((int)InventoryType.CallingCard); |
660 | IInventoryService invService = initiator.Scene.InventoryService; | ||
661 | InventoryFolderBase folder = invService.GetFolderForType(toAgentID, AssetType.CallingCard); | ||
659 | if (folder != null) | 662 | if (folder != null) |
660 | { | 663 | { |
661 | // ... and add the calling card | 664 | // ... and add the calling card |