diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index 0facc14991..13874fa1b0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
@@ -148,8 +148,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
if (!enabled)
return;
+ if (region == null)
+ return;
+
region.Close();
- lock (m_regions) m_regions.Remove(region);
+
+ if(m_regions.Contains(region))
+ {
+ lock (m_regions) m_regions.Remove(region);
+ }
+
}
#endregion
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
deleted file mode 100644
index d829e693e8..0000000000
--- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {595D67F3-B413-4A43-8568-5B5930E3B31D}
- Exe
- Properties
- OpenSim._32BitLaunch
- OpenSim.32BitLaunch
- v2.0
- 512
-
-
- true
- full
- false
- ..\..\..\bin\
- DEBUG;TRACE
- prompt
- 4
- x86
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
- {438A9556-0000-0000-0000-000000000000}
- OpenSim
-
-
-
-
-
\ No newline at end of file
diff --git a/OpenSim/Tools/OpenSim.GridLaunch/OpenSim.GridLaunch.csproj b/OpenSim/Tools/OpenSim.GridLaunch/OpenSim.GridLaunch.csproj
deleted file mode 100644
index b262dd152c..0000000000
--- a/OpenSim/Tools/OpenSim.GridLaunch/OpenSim.GridLaunch.csproj
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {595D67F3-B413-4A43-8568-5B5930E3B31D}
- Exe
- Properties
- OpenSim.GridLaunch
- OpenSim.GridLaunch
- v2.0
- 512
-
-
- true
- full
- false
- ..\..\..\bin\
- DEBUG;TRACE
- prompt
- 4
- x86
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Component
-
-
- Form
-
-
- ProcessPanel.cs
-
-
- UserControl
-
-
- ucAppWindow.cs
-
-
- UserControl
-
-
- ucInputField.cs
-
-
- UserControl
-
-
- ucLogWindow.cs
-
-
-
-
-
- True
- True
- Resources.resx
-
-
-
-
-
- ProcessPanel.cs
-
-
- ucAppWindow.cs
-
-
- ucInputField.cs
-
-
- ucLogWindow.cs
-
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
-
\ No newline at end of file