diff options
| author | Melanie | 2010-05-16 20:32:58 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-16 20:32:58 +0100 |
| commit | a003c36de5ba9869bb5ae6a9365d3ce9c4fe1c3d (patch) | |
| tree | db3116d30a9ca4d0604a8dcc2f96cb24c35e6dd5 | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Prevent a crash when the two agent dictionaries get out of sync (diff) | |
| download | opensim-SC-a003c36de5ba9869bb5ae6a9365d3ce9c4fe1c3d.zip opensim-SC-a003c36de5ba9869bb5ae6a9365d3ce9c4fe1c3d.tar.gz opensim-SC-a003c36de5ba9869bb5ae6a9365d3ce9c4fe1c3d.tar.bz2 opensim-SC-a003c36de5ba9869bb5ae6a9365d3ce9c4fe1c3d.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
| -rw-r--r-- | OpenSim/Framework/AgentCircuitManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs index 49d7822..1ce8c34 100644 --- a/OpenSim/Framework/AgentCircuitManager.cs +++ b/OpenSim/Framework/AgentCircuitManager.cs | |||
| @@ -92,7 +92,7 @@ namespace OpenSim.Framework | |||
| 92 | else | 92 | else |
| 93 | { | 93 | { |
| 94 | AgentCircuits.Add(circuitCode, agentData); | 94 | AgentCircuits.Add(circuitCode, agentData); |
| 95 | AgentCircuitsByUUID.Add(agentData.AgentID, agentData); | 95 | AgentCircuitsByUUID[agentData.AgentID] = agentData; |
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| 98 | } | 98 | } |