aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-29 14:34:02 -0700
committerJohn Hurliman2010-09-29 14:34:02 -0700
commitb6e0563ad7ad7f6fc396229823d7e76cd31dced7 (patch)
tree27c0549dbd94e43fbffe7b057487e7e7b6fb3d5d /OpenSim/Region
parentMade IGridUserService.SetLastPosition() more flexible to allow different poss... (diff)
downloadopensim-SC-b6e0563ad7ad7f6fc396229823d7e76cd31dced7.zip
opensim-SC-b6e0563ad7ad7f6fc396229823d7e76cd31dced7.tar.gz
opensim-SC-b6e0563ad7ad7f6fc396229823d7e76cd31dced7.tar.bz2
opensim-SC-b6e0563ad7ad7f6fc396229823d7e76cd31dced7.tar.xz
Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs4
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index 116a1dc..f523c73 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
104 } 104 }
105 } 105 }
106 m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName); 106 m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName);
107 m_GridUserService.LoggedOut(client.AgentId.ToString(), client.Scene.RegionInfo.RegionID, position, lookat); 107 m_GridUserService.LoggedOut(client.AgentId.ToString(), client.SessionId, client.Scene.RegionInfo.RegionID, position, lookat);
108 } 108 }
109 109
110 } 110 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
index 76e030f..985acec 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
@@ -152,9 +152,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
152 return m_GridUserService.LoggedIn(userID); 152 return m_GridUserService.LoggedIn(userID);
153 } 153 }
154 154
155 public bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt) 155 public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
156 { 156 {
157 return m_GridUserService.LoggedOut(userID, regionID, lastPosition, lastLookAt); 157 return m_GridUserService.LoggedOut(userID, sessionID, regionID, lastPosition, lastLookAt);
158 } 158 }
159 159
160 public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt) 160 public bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
index fb11e9a..95b3591 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
@@ -126,9 +126,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
126 return null; 126 return null;
127 } 127 }
128 128
129 public bool LoggedOut(string userID, UUID region, Vector3 position, Vector3 lookat) 129 public bool LoggedOut(string userID, UUID sessionID, UUID region, Vector3 position, Vector3 lookat)
130 { 130 {
131 return m_RemoteConnector.LoggedOut(userID, region, position, lookat); 131 return m_RemoteConnector.LoggedOut(userID, sessionID, region, position, lookat);
132 } 132 }
133 133
134 134