aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMW2008-02-16 11:55:09 +0000
committerMW2008-02-16 11:55:09 +0000
commit694dff3b7007760039c9eea95fe9b1a89df68432 (patch)
treee4bd10fd3657dbbaea025b7ebe99e1d8030c7507 /OpenSim/Region/Environment/Scenes/Scene.cs
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-694dff3b7007760039c9eea95fe9b1a89df68432.zip
opensim-SC_OLD-694dff3b7007760039c9eea95fe9b1a89df68432.tar.gz
opensim-SC_OLD-694dff3b7007760039c9eea95fe9b1a89df68432.tar.bz2
opensim-SC_OLD-694dff3b7007760039c9eea95fe9b1a89df68432.tar.xz
Some changes to remove some of the direct calls to CommsManager from Scene, so that they now go through the SceneCommunicationService. As a small step towards the day we can kill the CommsManager (YAY!)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d8cb11c..b534b4d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -900,7 +900,7 @@ namespace OpenSim.Region.Environment.Scenes
900 public void ExportWorldMap(string fileName) 900 public void ExportWorldMap(string fileName)
901 { 901 {
902 List<MapBlockData> mapBlocks = 902 List<MapBlockData> mapBlocks =
903 CommsManager.GridService.RequestNeighbourMapBlocks((int)(RegionInfo.RegionLocX - 9), 903 m_sceneGridService.RequestNeighbourMapBlocks((int)(RegionInfo.RegionLocX - 9),
904 (int)(RegionInfo.RegionLocY - 9), 904 (int)(RegionInfo.RegionLocY - 9),
905 (int)(RegionInfo.RegionLocX + 9), 905 (int)(RegionInfo.RegionLocX + 9),
906 (int)(RegionInfo.RegionLocY + 9)); 906 (int)(RegionInfo.RegionLocY + 9));
@@ -1461,7 +1461,7 @@ namespace OpenSim.Region.Environment.Scenes
1461 else 1461 else
1462 { 1462 {
1463 m_innerScene.removeUserCount(true); 1463 m_innerScene.removeUserCount(true);
1464 CommsManager.LogOffUser(agentID, RegionInfo.RegionID, RegionInfo.RegionHandle, 1464 m_sceneGridService.LogOffUser(agentID, RegionInfo.RegionID, RegionInfo.RegionHandle,
1465 avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, 1465 avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y,
1466 avatar.AbsolutePosition.Z); 1466 avatar.AbsolutePosition.Z);
1467 m_sceneGridService.SendCloseChildAgentConnections(avatar); 1467 m_sceneGridService.SendCloseChildAgentConnections(avatar);
@@ -1530,7 +1530,7 @@ namespace OpenSim.Region.Environment.Scenes
1530 } 1530 }
1531 1531
1532 // Remove client agent from profile, so new logins will work 1532 // Remove client agent from profile, so new logins will work
1533 CommsManager.UserService.clearUserAgent(agentID); 1533 m_sceneGridService.ClearUserAgent(agentID);
1534 1534
1535 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); 1535 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
1536 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); 1536 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
@@ -1983,24 +1983,24 @@ namespace OpenSim.Region.Environment.Scenes
1983 public virtual void StoreAddFriendship(LLUUID ownerID, LLUUID friendID, uint perms) 1983 public virtual void StoreAddFriendship(LLUUID ownerID, LLUUID friendID, uint perms)
1984 { 1984 {
1985 // TODO: m_sceneGridService.DoStuff; 1985 // TODO: m_sceneGridService.DoStuff;
1986 CommsManager.AddNewUserFriend(ownerID, friendID, perms); 1986 m_sceneGridService.AddNewUserFriend(ownerID, friendID, perms);
1987 } 1987 }
1988 1988
1989 public virtual void StoreUpdateFriendship(LLUUID ownerID, LLUUID friendID, uint perms) 1989 public virtual void StoreUpdateFriendship(LLUUID ownerID, LLUUID friendID, uint perms)
1990 { 1990 {
1991 // TODO: m_sceneGridService.DoStuff; 1991 // TODO: m_sceneGridService.DoStuff;
1992 CommsManager.UpdateUserFriendPerms(ownerID, friendID, perms); 1992 m_sceneGridService.UpdateUserFriendPerms(ownerID, friendID, perms);
1993 } 1993 }
1994 1994
1995 public virtual void StoreRemoveFriendship(LLUUID ownerID, LLUUID ExfriendID) 1995 public virtual void StoreRemoveFriendship(LLUUID ownerID, LLUUID ExfriendID)
1996 { 1996 {
1997 // TODO: m_sceneGridService.DoStuff; 1997 // TODO: m_sceneGridService.DoStuff;
1998 CommsManager.RemoveUserFriend(ownerID, ExfriendID); 1998 m_sceneGridService.RemoveUserFriend(ownerID, ExfriendID);
1999 } 1999 }
2000 public virtual List<FriendListItem> StoreGetFriendsForUser(LLUUID ownerID) 2000 public virtual List<FriendListItem> StoreGetFriendsForUser(LLUUID ownerID)
2001 { 2001 {
2002 // TODO: m_sceneGridService.DoStuff; 2002 // TODO: m_sceneGridService.DoStuff;
2003 return CommsManager.GetUserFriendList(ownerID); 2003 return m_sceneGridService.GetUserFriendList(ownerID);
2004 } 2004 }
2005 2005
2006 public void AddPacketStats(int inPackets, int outPackets, int unAckedBytes) 2006 public void AddPacketStats(int inPackets, int outPackets, int unAckedBytes)