aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-31 17:27:56 -0800
committerDiva Canto2010-01-31 17:27:56 -0800
commit35de8e91ecfbb87054599f3d0f5781d041648688 (patch)
tree23531162158999bc51da925c4a720be966d31367
parent* Simplified the configuration by having [DatabaseService] in it (diff)
downloadopensim-SC_OLD-35de8e91ecfbb87054599f3d0f5781d041648688.zip
opensim-SC_OLD-35de8e91ecfbb87054599f3d0f5781d041648688.tar.gz
opensim-SC_OLD-35de8e91ecfbb87054599f3d0f5781d041648688.tar.bz2
opensim-SC_OLD-35de8e91ecfbb87054599f3d0f5781d041648688.tar.xz
* Remove unnecessary debug message
* Bug fix in UserAgentService, logout
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs2
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs4
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs
index a537067..41897eb 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
80 /// <returns></returns> 80 /// <returns></returns>
81 public override bool CheckAuthSession(string session_id, string avatar_id) 81 public override bool CheckAuthSession(string session_id, string avatar_id)
82 { 82 {
83 m_log.InfoFormat("[HG INVENTORY IN CONNECTOR]: checking authed session {0} {1}", session_id, avatar_id); 83 //m_log.InfoFormat("[HG INVENTORY IN CONNECTOR]: checking authed session {0} {1}", session_id, avatar_id);
84 // This doesn't work 84 // This doesn't work
85 85
86 // if (m_session_cache.getCachedSession(session_id, avatar_id) == null) 86 // if (m_session_cache.getCachedSession(session_id, avatar_id) == null)
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 0873a2b..97e3705 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -152,7 +152,9 @@ namespace OpenSim.Services.HypergridService
152 { 152 {
153 List<UUID> travels = new List<UUID>(); 153 List<UUID> travels = new List<UUID>();
154 foreach (KeyValuePair<UUID, TravelingAgentInfo> kvp in m_TravelingAgents) 154 foreach (KeyValuePair<UUID, TravelingAgentInfo> kvp in m_TravelingAgents)
155 if (kvp.Value.UserID == userID) 155 if (kvp.Value == null) // do some clean up
156 travels.Add(kvp.Key);
157 else if (kvp.Value.UserID == userID)
156 travels.Add(kvp.Key); 158 travels.Add(kvp.Key);
157 foreach (UUID session in travels) 159 foreach (UUID session in travels)
158 m_TravelingAgents.Remove(session); 160 m_TravelingAgents.Remove(session);