From 1302ef44e3c632159378bc4042c753bcf36e9c63 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Mon, 24 Sep 2007 07:30:30 +0000 Subject: * Started major restructusing of comms to prepare for better grid and region functionality * Working towards one shared set of services * Killed off two projects with very little functionality --- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 14 +++++++------- OpenSim/Region/Environment/Scenes/Scene.cs | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index a6e47f3..81c0b73 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -27,7 +27,7 @@ namespace OpenSim.Region.Environment.Scenes public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) { - CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); + CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); if (userInfo != null) { userInfo.AddItem(remoteClient.AgentId, item); @@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Scenes public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data) { - CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); + CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); if (userInfo != null) { if (userInfo.RootFolder != null) @@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID) { - CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); + CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); if (userInfo != null) { if (userInfo.RootFolder != null) @@ -154,7 +154,7 @@ namespace OpenSim.Region.Environment.Scenes { if (transActionID == LLUUID.Zero) { - CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); + CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); if (userInfo != null) { AssetBase asset = new AssetBase(); @@ -244,7 +244,7 @@ namespace OpenSim.Region.Environment.Scenes public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) { - CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); + CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); LLUUID copyID = LLUUID.Random(); if (userInfo != null) { @@ -335,7 +335,7 @@ namespace OpenSim.Region.Environment.Scenes if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID)) { string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString(); - CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); + CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); if (userInfo != null) { AssetBase asset = new AssetBase(); @@ -391,7 +391,7 @@ namespace OpenSim.Region.Environment.Scenes public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos) { - CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); + CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId); if (userInfo != null) { if (userInfo.RootFolder != null) diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 90736f4..8fc477a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -649,7 +649,7 @@ namespace OpenSim.Region.Environment.Scenes CreateAndAddScenePresence(client, child); m_LandManager.sendParcelOverlay(client); - commsManager.UserProfiles.AddNewUser(client.AgentId); + commsManager.UserProfileCache.AddNewUser(client.AgentId); commsManager.TransactionsManager.AddUser(client.AgentId); } @@ -697,10 +697,10 @@ namespace OpenSim.Region.Environment.Scenes client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); client.OnCreateNewInventoryItem += CreateNewInventoryItem; - client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; - client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; + client.OnCreateNewInventoryFolder += commsManager.UserProfileCache.HandleCreateInventoryFolder; + client.OnFetchInventoryDescendents += commsManager.UserProfileCache.HandleFecthInventoryDescendents; client.OnRequestTaskInventory += RequestTaskInventory; - client.OnFetchInventory += commsManager.UserProfiles.HandleFetchInventory; + client.OnFetchInventory += commsManager.UserProfileCache.HandleFetchInventory; client.OnUpdateInventoryItem += UDPUpdateInventoryItemAsset; client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest; client.OnXferReceive += commsManager.TransactionsManager.HandleXfer; @@ -796,7 +796,7 @@ namespace OpenSim.Region.Environment.Scenes avatar.Close(); // Remove client agent from profile, so new logins will work - commsManager.UserServer.clearUserAgent(agentID); + commsManager.UserService.clearUserAgent(agentID); return; } @@ -927,7 +927,7 @@ namespace OpenSim.Region.Environment.Scenes /// public void RegisterRegionWithComms() { - regionCommsHost = commsManager.GridServer.RegisterRegion(m_regInfo); + regionCommsHost = commsManager.GridService.RegisterRegion(m_regInfo); if (regionCommsHost != null) { regionCommsHost.OnExpectUser += NewUserConnection; @@ -989,7 +989,7 @@ namespace OpenSim.Region.Environment.Scenes /// public void InformClientOfNeighbours(IClientAPI remoteClient) { - List neighbours = commsManager.GridServer.RequestNeighbours(m_regInfo); + List neighbours = commsManager.GridService.RequestNeighbours(m_regInfo); if (neighbours != null) { @@ -1014,7 +1014,7 @@ namespace OpenSim.Region.Environment.Scenes /// public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle) { - return commsManager.GridServer.RequestNeighbourInfo(regionHandle); + return commsManager.GridService.RequestNeighbourInfo(regionHandle); } /// @@ -1027,7 +1027,7 @@ namespace OpenSim.Region.Environment.Scenes public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY) { List mapBlocks; - mapBlocks = commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY); + mapBlocks = commsManager.GridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY); remoteClient.SendMapBlock(mapBlocks); } -- cgit v1.1