diff options
author | Diva Canto | 2010-01-10 15:34:56 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 15:34:56 -0800 |
commit | 4dd523b45d1e635c66eb4e556764fabe29dbfc58 (patch) | |
tree | dbd92b59418535e6c2967021124a906a9987088d /OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | |
parent | * Last reference to CommsManager.UserProfileCacheService removed (diff) | |
download | opensim-SC-4dd523b45d1e635c66eb4e556764fabe29dbfc58.zip opensim-SC-4dd523b45d1e635c66eb4e556764fabe29dbfc58.tar.gz opensim-SC-4dd523b45d1e635c66eb4e556764fabe29dbfc58.tar.bz2 opensim-SC-4dd523b45d1e635c66eb4e556764fabe29dbfc58.tar.xz |
* Changed IPresenceService Logout, so that it takes a position and a lookat
* CommsManager.AvatarService rerouted
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs index 791cfcd..c40ea0e 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework; | |||
36 | using OpenSim.Framework.Communications; | 36 | using OpenSim.Framework.Communications; |
37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
38 | using IUserService = OpenSim.Framework.Communications.IUserService; | 38 | using IUserService = OpenSim.Framework.Communications.IUserService; |
39 | using IAvatarService = OpenSim.Framework.Communications.IAvatarService; | 39 | using IAvatarService = OpenSim.Services.Interfaces.IAvatarService; |
40 | 40 | ||
41 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 41 | namespace OpenSim.ApplicationPlugins.Rest.Inventory |
42 | { | 42 | { |
@@ -93,11 +93,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
93 | /// initializes. | 93 | /// initializes. |
94 | /// </summary> | 94 | /// </summary> |
95 | 95 | ||
96 | internal static CommunicationsManager Comms | ||
97 | { | ||
98 | get { return main.CommunicationsManager; } | ||
99 | } | ||
100 | |||
101 | internal static IInventoryService InventoryServices | 96 | internal static IInventoryService InventoryServices |
102 | { | 97 | { |
103 | get { return main.SceneManager.CurrentOrFirstScene.InventoryService; } | 98 | get { return main.SceneManager.CurrentOrFirstScene.InventoryService; } |
@@ -115,7 +110,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
115 | 110 | ||
116 | internal static IAvatarService AvatarServices | 111 | internal static IAvatarService AvatarServices |
117 | { | 112 | { |
118 | get { return Comms.AvatarService; } | 113 | get { return main.SceneManager.CurrentOrFirstScene.AvatarService; } |
119 | } | 114 | } |
120 | 115 | ||
121 | internal static IAssetService AssetServices | 116 | internal static IAssetService AssetServices |