diff options
author | Justin Clark-Casey (justincc) | 2012-10-29 23:22:40 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-29 23:22:40 +0000 |
commit | 09f4e72d6af4b86238af516b1719ff4f63aa7174 (patch) | |
tree | b374a183a3610509af839c5b514d4d1eabc6902f /OpenSim/Region/Application | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-09f4e72d6af4b86238af516b1719ff4f63aa7174.zip opensim-SC_OLD-09f4e72d6af4b86238af516b1719ff4f63aa7174.tar.gz opensim-SC_OLD-09f4e72d6af4b86238af516b1719ff4f63aa7174.tar.bz2 opensim-SC_OLD-09f4e72d6af4b86238af516b1719ff4f63aa7174.tar.xz |
Fix memory leak where removing an NPC did not remove its circuits.
This was because we were removing by circuitcode where NPCs have no code.
Now removing by agent ID instead.
This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index b24641a..2236e43 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -1111,7 +1111,7 @@ namespace OpenSim | |||
1111 | aCircuit.Name, | 1111 | aCircuit.Name, |
1112 | aCircuit.child ? "child" : "root", | 1112 | aCircuit.child ? "child" : "root", |
1113 | aCircuit.circuitcode.ToString(), | 1113 | aCircuit.circuitcode.ToString(), |
1114 | aCircuit.IPAddress.ToString(), | 1114 | aCircuit.IPAddress != null ? aCircuit.IPAddress.ToString() : "not set", |
1115 | aCircuit.Viewer); | 1115 | aCircuit.Viewer); |
1116 | }); | 1116 | }); |
1117 | 1117 | ||