aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-07-14 23:06:05 +0000
committerAdam Frisby2007-07-14 23:06:05 +0000
commitc46a508945158a31d5afa2fd5c7ee4df723d71fd (patch)
tree66716a214867c28417fdc5a385b4ce2f4cac8180
parent* Fixed an issue which caused regions to crash when duplicating primitives. (diff)
downloadopensim-SC_OLD-c46a508945158a31d5afa2fd5c7ee4df723d71fd.zip
opensim-SC_OLD-c46a508945158a31d5afa2fd5c7ee4df723d71fd.tar.gz
opensim-SC_OLD-c46a508945158a31d5afa2fd5c7ee4df723d71fd.tar.bz2
opensim-SC_OLD-c46a508945158a31d5afa2fd5c7ee4df723d71fd.tar.xz
* Fixed duplicate CAP bug when a user logs out then relogs back in in grid mode.
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 03e7a41..64f51d8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -711,7 +711,16 @@ namespace OpenSim.Region.Environment.Scenes
711 //Console.WriteLine("new user, so creating caps handler for it"); 711 //Console.WriteLine("new user, so creating caps handler for it");
712 Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.ExternalHostName, this.m_regInfo.ExternalEndPoint.Port, agent.CapsPath, agent.AgentID); 712 Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.ExternalHostName, this.m_regInfo.ExternalEndPoint.Port, agent.CapsPath, agent.AgentID);
713 cap.RegisterHandlers(); 713 cap.RegisterHandlers();
714 this.capsHandlers.Add(agent.AgentID, cap); 714 if (capsHandlers.ContainsKey(agent.AgentID))
715 {
716 OpenSim.Framework.Console.MainLog.Instance.Warn("Adding duplicate CAPS entry for user " + agent.AgentID.ToStringHyphenated());
717 this.capsHandlers[agent.AgentID] = cap;
718 }
719 else
720 {
721 this.capsHandlers.Add(agent.AgentID, cap);
722 }
723
715 } 724 }
716 this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent); 725 this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
717 } 726 }