aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDr Scofield2009-04-07 16:53:41 +0000
committerDr Scofield2009-04-07 16:53:41 +0000
commite540b66a8660ab2f3d3a9be153e8cf8aaa641714 (patch)
treebd944353f4b0c773bdead689279496e5c15beb80 /OpenSim
parent* Added finite testing to the character and object constructor (diff)
downloadopensim-SC-e540b66a8660ab2f3d3a9be153e8cf8aaa641714.zip
opensim-SC-e540b66a8660ab2f3d3a9be153e8cf8aaa641714.tar.gz
opensim-SC-e540b66a8660ab2f3d3a9be153e8cf8aaa641714.tar.bz2
opensim-SC-e540b66a8660ab2f3d3a9be153e8cf8aaa641714.tar.xz
From: Alan Webb <alan_webb@us.ibm.com>
Fix null reference exception during close down of IRC module if the region was not actually initialized.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs10
-rw-r--r--OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj58
-rw-r--r--OpenSim/Tools/OpenSim.GridLaunch/OpenSim.GridLaunch.csproj126
3 files changed, 9 insertions, 185 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index 0facc14..13874fa 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
148 if (!enabled) 148 if (!enabled)
149 return; 149 return;
150 150
151 if (region == null)
152 return;
153
151 region.Close(); 154 region.Close();
152 lock (m_regions) m_regions.Remove(region); 155
156 if(m_regions.Contains(region))
157 {
158 lock (m_regions) m_regions.Remove(region);
159 }
160
153 } 161 }
154 162
155 #endregion 163 #endregion
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
deleted file mode 100644
index d829e69..0000000
--- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
+++ /dev/null
@@ -1,58 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 <ProductVersion>9.0.30729</ProductVersion>
7 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
9 <OutputType>Exe</OutputType>
10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>OpenSim._32BitLaunch</RootNamespace>
12 <AssemblyName>OpenSim.32BitLaunch</AssemblyName>
13 <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment>
15 </PropertyGroup>
16 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17 <DebugSymbols>true</DebugSymbols>
18 <DebugType>full</DebugType>
19 <Optimize>false</Optimize>
20 <OutputPath>..\..\..\bin\</OutputPath>
21 <DefineConstants>DEBUG;TRACE</DefineConstants>
22 <ErrorReport>prompt</ErrorReport>
23 <WarningLevel>4</WarningLevel>
24 <PlatformTarget>x86</PlatformTarget>
25 </PropertyGroup>
26 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27 <DebugType>pdbonly</DebugType>
28 <Optimize>true</Optimize>
29 <OutputPath>bin\Release\</OutputPath>
30 <DefineConstants>TRACE</DefineConstants>
31 <ErrorReport>prompt</ErrorReport>
32 <WarningLevel>4</WarningLevel>
33 </PropertyGroup>
34 <ItemGroup>
35 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
36 <Reference Include="System" />
37 <Reference Include="System.Data" />
38 <Reference Include="System.Xml" />
39 </ItemGroup>
40 <ItemGroup>
41 <Compile Include="Program.cs" />
42 <Compile Include="Properties\AssemblyInfo.cs" />
43 </ItemGroup>
44 <ItemGroup>
45 <ProjectReference Include="..\..\Region\Application\OpenSim.csproj">
46 <Project>{438A9556-0000-0000-0000-000000000000}</Project>
47 <Name>OpenSim</Name>
48 </ProjectReference>
49 </ItemGroup>
50 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
51 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
52 Other similar extension points exist, see Microsoft.Common.targets.
53 <Target Name="BeforeBuild">
54 </Target>
55 <Target Name="AfterBuild">
56 </Target>
57 -->
58</Project> \ 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 b262dd1..0000000
--- a/OpenSim/Tools/OpenSim.GridLaunch/OpenSim.GridLaunch.csproj
+++ /dev/null
@@ -1,126 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 <ProductVersion>9.0.30729</ProductVersion>
7 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
9 <OutputType>Exe</OutputType>
10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>OpenSim.GridLaunch</RootNamespace>
12 <AssemblyName>OpenSim.GridLaunch</AssemblyName>
13 <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment>
15 </PropertyGroup>
16 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17 <DebugSymbols>true</DebugSymbols>
18 <DebugType>full</DebugType>
19 <Optimize>false</Optimize>
20 <OutputPath>..\..\..\bin\</OutputPath>
21 <DefineConstants>DEBUG;TRACE</DefineConstants>
22 <ErrorReport>prompt</ErrorReport>
23 <WarningLevel>4</WarningLevel>
24 <PlatformTarget>x86</PlatformTarget>
25 </PropertyGroup>
26 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27 <DebugType>pdbonly</DebugType>
28 <Optimize>true</Optimize>
29 <OutputPath>bin\Release\</OutputPath>
30 <DefineConstants>TRACE</DefineConstants>
31 <ErrorReport>prompt</ErrorReport>
32 <WarningLevel>4</WarningLevel>
33 </PropertyGroup>
34 <ItemGroup>
35 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
36 <Reference Include="System" />
37 <Reference Include="System.Data" />
38 <Reference Include="System.Drawing" />
39 <Reference Include="System.ServiceProcess" />
40 <Reference Include="System.Windows.Forms" />
41 <Reference Include="System.Xml" />
42 </ItemGroup>
43 <ItemGroup>
44 <Compile Include="AppExecutor.cs" />
45 <Compile Include="AppExecutor_AsyncIO.cs" />
46 <Compile Include="AppExecutor_Thread.cs" />
47 <Compile Include="CommandProcessor.cs" />
48 <Compile Include="GUI\Console\Console.cs" />
49 <Compile Include="GUI\IGUI.cs" />
50 <Compile Include="GUI\Network\Client.cs" />
51 <Compile Include="GUI\Network\TCPD.cs" />
52 <Compile Include="GUI\Service\Service.cs">
53 <SubType>Component</SubType>
54 </Compile>
55 <Compile Include="GUI\WinForm\ProcessPanel.cs">
56 <SubType>Form</SubType>
57 </Compile>
58 <Compile Include="GUI\WinForm\ProcessPanel.Designer.cs">
59 <DependentUpon>ProcessPanel.cs</DependentUpon>
60 </Compile>
61 <Compile Include="GUI\WinForm\ucAppWindow.cs">
62 <SubType>UserControl</SubType>
63 </Compile>
64 <Compile Include="GUI\WinForm\ucAppWindow.Designer.cs">
65 <DependentUpon>ucAppWindow.cs</DependentUpon>
66 </Compile>
67 <Compile Include="GUI\WinForm\ucInputField.cs">
68 <SubType>UserControl</SubType>
69 </Compile>
70 <Compile Include="GUI\WinForm\ucInputField.Designer.cs">
71 <DependentUpon>ucInputField.cs</DependentUpon>
72 </Compile>
73 <Compile Include="GUI\WinForm\ucLogWindow.cs">
74 <SubType>UserControl</SubType>
75 </Compile>
76 <Compile Include="GUI\WinForm\ucLogWindow.Designer.cs">
77 <DependentUpon>ucLogWindow.cs</DependentUpon>
78 </Compile>
79 <Compile Include="log4netAppender.cs" />
80 <Compile Include="Program.cs" />
81 <Compile Include="Properties\AssemblyInfo.cs" />
82 <Compile Include="Properties\Resources.Designer.cs">
83 <AutoGen>True</AutoGen>
84 <DesignTime>True</DesignTime>
85 <DependentUpon>Resources.resx</DependentUpon>
86 </Compile>
87 <Compile Include="Settings.cs" />
88 </ItemGroup>
89 <ItemGroup>
90 <EmbeddedResource Include="GUI\WinForm\ProcessPanel.resx">
91 <DependentUpon>ProcessPanel.cs</DependentUpon>
92 </EmbeddedResource>
93 <EmbeddedResource Include="GUI\WinForm\ucAppWindow.resx">
94 <DependentUpon>ucAppWindow.cs</DependentUpon>
95 </EmbeddedResource>
96 <EmbeddedResource Include="GUI\WinForm\ucInputField.resx">
97 <DependentUpon>ucInputField.cs</DependentUpon>
98 </EmbeddedResource>
99 <EmbeddedResource Include="GUI\WinForm\ucLogWindow.resx">
100 <DependentUpon>ucLogWindow.cs</DependentUpon>
101 </EmbeddedResource>
102 </ItemGroup>
103 <ItemGroup>
104 <None Include="App.config" />
105 </ItemGroup>
106 <ItemGroup>
107 <Content Include="GUI\WinForm\OpenSim Bottom Border.png" />
108 <Content Include="GUI\WinForm\OpenSim Right Border.png" />
109 <Content Include="GUI\WinForm\OpenSim.png" />
110 <None Include="OpenSim.GridLaunch.ini">
111 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
112 </None>
113 <EmbeddedResource Include="Properties\Resources.resx">
114 <Generator>ResXFileCodeGenerator</Generator>
115 <LastGenOutput>Resources.Designer.cs</LastGenOutput>
116 </EmbeddedResource>
117 </ItemGroup>
118 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
119 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120 Other similar extension points exist, see Microsoft.Common.targets.
121 <Target Name="BeforeBuild">
122 </Target>
123 <Target Name="AfterBuild">
124 </Target>
125 -->
126</Project> \ No newline at end of file
generated by cgit v1.1 at 2024-12-15 22:39:07 +0000