diff options
Added a check to GridServerBase.RegisterInterface<T>(T iface), so that it can't try to add duplicate interfaces and cause a exception.
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index ffe0378..677319c 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -219,7 +219,10 @@ namespace OpenSim.Grid.GridServer | |||
219 | { | 219 | { |
220 | lock (m_gridInterfaces) | 220 | lock (m_gridInterfaces) |
221 | { | 221 | { |
222 | m_gridInterfaces.Add(typeof(T), iface); | 222 | if (!m_gridInterfaces.ContainsKey(typeof(T))) |
223 | { | ||
224 | m_gridInterfaces.Add(typeof(T), iface); | ||
225 | } | ||
223 | } | 226 | } |
224 | } | 227 | } |
225 | 228 | ||