aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs18
1 files changed, 9 insertions, 9 deletions
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
649 CreateAndAddScenePresence(client, child); 649 CreateAndAddScenePresence(client, child);
650 650
651 m_LandManager.sendParcelOverlay(client); 651 m_LandManager.sendParcelOverlay(client);
652 commsManager.UserProfiles.AddNewUser(client.AgentId); 652 commsManager.UserProfileCache.AddNewUser(client.AgentId);
653 commsManager.TransactionsManager.AddUser(client.AgentId); 653 commsManager.TransactionsManager.AddUser(client.AgentId);
654 } 654 }
655 655
@@ -697,10 +697,10 @@ namespace OpenSim.Region.Environment.Scenes
697 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); 697 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
698 698
699 client.OnCreateNewInventoryItem += CreateNewInventoryItem; 699 client.OnCreateNewInventoryItem += CreateNewInventoryItem;
700 client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; 700 client.OnCreateNewInventoryFolder += commsManager.UserProfileCache.HandleCreateInventoryFolder;
701 client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; 701 client.OnFetchInventoryDescendents += commsManager.UserProfileCache.HandleFecthInventoryDescendents;
702 client.OnRequestTaskInventory += RequestTaskInventory; 702 client.OnRequestTaskInventory += RequestTaskInventory;
703 client.OnFetchInventory += commsManager.UserProfiles.HandleFetchInventory; 703 client.OnFetchInventory += commsManager.UserProfileCache.HandleFetchInventory;
704 client.OnUpdateInventoryItem += UDPUpdateInventoryItemAsset; 704 client.OnUpdateInventoryItem += UDPUpdateInventoryItemAsset;
705 client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest; 705 client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest;
706 client.OnXferReceive += commsManager.TransactionsManager.HandleXfer; 706 client.OnXferReceive += commsManager.TransactionsManager.HandleXfer;
@@ -796,7 +796,7 @@ namespace OpenSim.Region.Environment.Scenes
796 avatar.Close(); 796 avatar.Close();
797 797
798 // Remove client agent from profile, so new logins will work 798 // Remove client agent from profile, so new logins will work
799 commsManager.UserServer.clearUserAgent(agentID); 799 commsManager.UserService.clearUserAgent(agentID);
800 800
801 return; 801 return;
802 } 802 }
@@ -927,7 +927,7 @@ namespace OpenSim.Region.Environment.Scenes
927 /// </summary> 927 /// </summary>
928 public void RegisterRegionWithComms() 928 public void RegisterRegionWithComms()
929 { 929 {
930 regionCommsHost = commsManager.GridServer.RegisterRegion(m_regInfo); 930 regionCommsHost = commsManager.GridService.RegisterRegion(m_regInfo);
931 if (regionCommsHost != null) 931 if (regionCommsHost != null)
932 { 932 {
933 regionCommsHost.OnExpectUser += NewUserConnection; 933 regionCommsHost.OnExpectUser += NewUserConnection;
@@ -989,7 +989,7 @@ namespace OpenSim.Region.Environment.Scenes
989 /// </summary> 989 /// </summary>
990 public void InformClientOfNeighbours(IClientAPI remoteClient) 990 public void InformClientOfNeighbours(IClientAPI remoteClient)
991 { 991 {
992 List<RegionInfo> neighbours = commsManager.GridServer.RequestNeighbours(m_regInfo); 992 List<RegionInfo> neighbours = commsManager.GridService.RequestNeighbours(m_regInfo);
993 993
994 if (neighbours != null) 994 if (neighbours != null)
995 { 995 {
@@ -1014,7 +1014,7 @@ namespace OpenSim.Region.Environment.Scenes
1014 /// <returns></returns> 1014 /// <returns></returns>
1015 public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle) 1015 public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
1016 { 1016 {
1017 return commsManager.GridServer.RequestNeighbourInfo(regionHandle); 1017 return commsManager.GridService.RequestNeighbourInfo(regionHandle);
1018 } 1018 }
1019 1019
1020 /// <summary> 1020 /// <summary>
@@ -1027,7 +1027,7 @@ namespace OpenSim.Region.Environment.Scenes
1027 public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY) 1027 public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
1028 { 1028 {
1029 List<MapBlockData> mapBlocks; 1029 List<MapBlockData> mapBlocks;
1030 mapBlocks = commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY); 1030 mapBlocks = commsManager.GridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
1031 remoteClient.SendMapBlock(mapBlocks); 1031 remoteClient.SendMapBlock(mapBlocks);
1032 } 1032 }
1033 1033