aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorMW2007-06-14 10:36:19 +0000
committerMW2007-06-14 10:36:19 +0000
commit1fef45bc2ba7111f9fd8b89d71334b741940580a (patch)
tree70744347f1c9b558fe39078bec6bd40cb65dc0b6 /Common
parentFixed the bug that makes a region use its water height as its name (in region... (diff)
downloadopensim-SC_OLD-1fef45bc2ba7111f9fd8b89d71334b741940580a.zip
opensim-SC_OLD-1fef45bc2ba7111f9fd8b89d71334b741940580a.tar.gz
opensim-SC_OLD-1fef45bc2ba7111f9fd8b89d71334b741940580a.tar.bz2
opensim-SC_OLD-1fef45bc2ba7111f9fd8b89d71334b741940580a.tar.xz
Commented out the Scene.Backup method for now as there isn't really anything to Backup yet and it might be the cause of a memory leak.
Deleted EmbeddedJVM scripting engine, not being used. "If" we ever decide to use it then it can be re-added.
Diffstat (limited to '')
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj41
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build1
2 files changed, 19 insertions, 23 deletions
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 038e537..8e6fdea 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Framework</AssemblyName> 12 <AssemblyName>OpenSim.Framework</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Framework</RootNamespace> 19 <RootNamespace>OpenSim.Framework</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,23 +55,22 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="System"> 61 <Reference Include="System" >
69 <HintPath>System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System.Xml"> 65 <Reference Include="System.Xml" >
73 <HintPath>System.Xml.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="libsecondlife.dll"> 69 <Reference Include="libsecondlife.dll" >
77 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 70 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="Db4objects.Db4o.dll"> 73 <Reference Include="Db4objects.Db4o.dll" >
81 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> 74 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
@@ -87,13 +80,13 @@
87 <Name>XMLRPC</Name> 80 <Name>XMLRPC</Name>
88 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 81 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
89 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
90 <Private>False</Private> 83 <Private>False</Private>
91 </ProjectReference> 84 </ProjectReference>
92 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 85 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
93 <Name>OpenSim.Framework.Console</Name> 86 <Name>OpenSim.Framework.Console</Name>
94 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 87 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
95 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
96 <Private>False</Private> 89 <Private>False</Private>
97 </ProjectReference> 90 </ProjectReference>
98 </ItemGroup> 91 </ItemGroup>
99 <ItemGroup> 92 <ItemGroup>
@@ -121,7 +114,6 @@
121 <Compile Include="SimProfile.cs"> 114 <Compile Include="SimProfile.cs">
122 <SubType>Code</SubType> 115 <SubType>Code</SubType>
123 </Compile> 116 </Compile>
124 <Compile Include="Types\RegionHandle.cs" />
125 <Compile Include="UserProfile.cs"> 117 <Compile Include="UserProfile.cs">
126 <SubType>Code</SubType> 118 <SubType>Code</SubType>
127 </Compile> 119 </Compile>
@@ -209,6 +201,9 @@
209 <Compile Include="Types\PrimData.cs"> 201 <Compile Include="Types\PrimData.cs">
210 <SubType>Code</SubType> 202 <SubType>Code</SubType>
211 </Compile> 203 </Compile>
204 <Compile Include="Types\RegionHandle.cs">
205 <SubType>Code</SubType>
206 </Compile>
212 <Compile Include="Types\RegionInfo.cs"> 207 <Compile Include="Types\RegionInfo.cs">
213 <SubType>Code</SubType> 208 <SubType>Code</SubType>
214 </Compile> 209 </Compile>
@@ -220,4 +215,4 @@
220 <PostBuildEvent> 215 <PostBuildEvent>
221 </PostBuildEvent> 216 </PostBuildEvent>
222 </PropertyGroup> 217 </PropertyGroup>
223</Project> \ No newline at end of file 218</Project>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index aa634a9..5ef4c27 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -48,6 +48,7 @@
48 <include name="Types/NetworkServersInfo.cs" /> 48 <include name="Types/NetworkServersInfo.cs" />
49 <include name="Types/ParcelData.cs" /> 49 <include name="Types/ParcelData.cs" />
50 <include name="Types/PrimData.cs" /> 50 <include name="Types/PrimData.cs" />
51 <include name="Types/RegionHandle.cs" />
51 <include name="Types/RegionInfo.cs" /> 52 <include name="Types/RegionInfo.cs" />
52 </sources> 53 </sources>
53 <references basedir="${project::get-base-directory()}"> 54 <references basedir="${project::get-base-directory()}">