aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-05-08 12:21:17 -0700
committerDiva Canto2010-05-08 12:21:17 -0700
commitc1fe07b02248b66d45fbbbd6f8e3db3fe3bdc157 (patch)
tree8abc06a83f63a40a5ed35737f4438e1f7c5a8668
parentMore cleaning on presence. Friends online/offline works again. (diff)
downloadopensim-SC_OLD-c1fe07b02248b66d45fbbbd6f8e3db3fe3bdc157.zip
opensim-SC_OLD-c1fe07b02248b66d45fbbbd6f8e3db3fe3bdc157.tar.gz
opensim-SC_OLD-c1fe07b02248b66d45fbbbd6f8e3db3fe3bdc157.tar.bz2
opensim-SC_OLD-c1fe07b02248b66d45fbbbd6f8e3db3fe3bdc157.tar.xz
* Added missing loggout notification to home grid upon agents logging out in foreign grids.
* Added missing config in StandaloneHypergrid.ini
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs8
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs4
-rw-r--r--bin/config-include/StandaloneHypergrid.ini3
3 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 137dfec..7d26e3f 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -245,6 +245,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
245 return; 245 return;
246 } 246 }
247 247
248 // Let's find out if this is a foreign user or a local user
249 UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, obj.AgentId);
250 if (account != null)
251 {
252 // local grid user
253 return;
254 }
255
248 AgentCircuitData aCircuit = ((Scene)(obj.Scene)).AuthenticateHandler.GetAgentCircuitData(obj.CircuitCode); 256 AgentCircuitData aCircuit = ((Scene)(obj.Scene)).AuthenticateHandler.GetAgentCircuitData(obj.CircuitCode);
249 257
250 if (aCircuit.ServiceURLs.ContainsKey("HomeURI")) 258 if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 3af7ef9..64f7e8a 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -185,6 +185,10 @@ namespace OpenSim.Services.HypergridService
185 foreach (UUID session in travels) 185 foreach (UUID session in travels)
186 m_TravelingAgents.Remove(session); 186 m_TravelingAgents.Remove(session);
187 } 187 }
188
189 GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(userID.ToString());
190 if (guinfo != null)
191 m_GridUserService.LoggedOut(userID.ToString(), guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt);
188 } 192 }
189 193
190 // We need to prevent foreign users with the same UUID as a local user 194 // We need to prevent foreign users with the same UUID as a local user
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 130e210..32b240b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -77,6 +77,9 @@
77 GridService = "OpenSim.Services.GridService.dll:GridService" 77 GridService = "OpenSim.Services.GridService.dll:GridService"
78 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 78 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
79 79
80[GridUserService]
81 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
82
80[FriendsService] 83[FriendsService]
81 LocalServiceModule = "OpenSim.Services.FriendsService.dll" 84 LocalServiceModule = "OpenSim.Services.FriendsService.dll"
82 ConnectionString = "URI=file:friends.db,version=3" 85 ConnectionString = "URI=file:friends.db,version=3"