diff options
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IUserService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Local/CommunicationsLocal.cs | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IUserService.cs b/OpenSim/Framework/General/Interfaces/IUserService.cs index 461d4cb..f8c76af 100644 --- a/OpenSim/Framework/General/Interfaces/IUserService.cs +++ b/OpenSim/Framework/General/Interfaces/IUserService.cs | |||
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Interfaces | |||
34 | { | 34 | { |
35 | UserProfileData GetUserProfile(string firstName, string lastName); | 35 | UserProfileData GetUserProfile(string firstName, string lastName); |
36 | UserProfileData GetUserProfile(string name); | 36 | UserProfileData GetUserProfile(string name); |
37 | UserProfileData GetUserProfile(LLUUID avatarID); | 37 | UserProfileData GetUserProfile(LLUUID userId); |
38 | void clearUserAgent(LLUUID avatarID); | 38 | void clearUserAgent(LLUUID avatarID); |
39 | 39 | ||
40 | UserProfileData SetupMasterUser(string firstName, string lastName); | 40 | UserProfileData SetupMasterUser(string firstName, string lastName); |
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 3bfcd8e..e57e445 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs | |||
@@ -25,22 +25,17 @@ | |||
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 libsecondlife; | ||
30 | using OpenSim.Framework.Communications; | 28 | using OpenSim.Framework.Communications; |
31 | using OpenSim.Framework.Communications.Cache; | 29 | using OpenSim.Framework.Communications.Cache; |
32 | using OpenSim.Framework.Console; | 30 | using OpenSim.Framework.Interfaces; |
33 | using OpenSim.Framework.Data; | ||
34 | using OpenSim.Framework.Servers; | 31 | using OpenSim.Framework.Servers; |
35 | using OpenSim.Framework.Types; | 32 | using OpenSim.Framework.Types; |
36 | using OpenSim.Framework.Utilities; | ||
37 | using OpenSim.Framework.Interfaces; | ||
38 | 33 | ||
39 | namespace OpenSim.Region.Communications.Local | 34 | namespace OpenSim.Region.Communications.Local |
40 | { | 35 | { |
41 | public class CommunicationsLocal : CommunicationsManager | 36 | public class CommunicationsLocal : CommunicationsManager |
42 | { | 37 | { |
43 | public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService) | 38 | public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService) |
44 | : base(serversInfo, httpServer, assetCache) | 39 | : base(serversInfo, httpServer, assetCache) |
45 | { | 40 | { |
46 | m_inventoryService = inventoryService; | 41 | m_inventoryService = inventoryService; |