aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common/OpenSim.Framework
diff options
context:
space:
mode:
authorMW2007-06-12 14:50:08 +0000
committerMW2007-06-12 14:50:08 +0000
commita7b55fb26fad9c66df091e0787afe89e021229f1 (patch)
tree7920939c67a9275d72dc4a494032b66355d6eb9f /Common/OpenSim.Framework
parentSome Work on the Primitive class (diff)
downloadopensim-SC_OLD-a7b55fb26fad9c66df091e0787afe89e021229f1.zip
opensim-SC_OLD-a7b55fb26fad9c66df091e0787afe89e021229f1.tar.gz
opensim-SC_OLD-a7b55fb26fad9c66df091e0787afe89e021229f1.tar.bz2
opensim-SC_OLD-a7b55fb26fad9c66df091e0787afe89e021229f1.tar.xz
Some rearranging of folders in OpenSim.Region
Diffstat (limited to 'Common/OpenSim.Framework')
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj85
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build29
2 files changed, 53 insertions, 61 deletions
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index a39385c..f0292e6 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>
@@ -118,6 +111,9 @@
118 <Compile Include="Remoting.cs"> 111 <Compile Include="Remoting.cs">
119 <SubType>Code</SubType> 112 <SubType>Code</SubType>
120 </Compile> 113 </Compile>
114 <Compile Include="SimProfile.cs">
115 <SubType>Code</SubType>
116 </Compile>
121 <Compile Include="UserProfile.cs"> 117 <Compile Include="UserProfile.cs">
122 <SubType>Code</SubType> 118 <SubType>Code</SubType>
123 </Compile> 119 </Compile>
@@ -130,49 +126,49 @@
130 <Compile Include="Util.cs"> 126 <Compile Include="Util.cs">
131 <SubType>Code</SubType> 127 <SubType>Code</SubType>
132 </Compile> 128 </Compile>
133 <Compile Include="SimProfile.cs"> 129 <Compile Include="Interfaces\IAssetServer.cs">
134 <SubType>Code</SubType> 130 <SubType>Code</SubType>
135 </Compile> 131 </Compile>
136 <Compile Include="Interfaces\LocalGridBase.cs"> 132 <Compile Include="Interfaces\IClientAPI.cs">
137 <SubType>Code</SubType> 133 <SubType>Code</SubType>
138 </Compile> 134 </Compile>
139 <Compile Include="Interfaces\RemoteGridBase.cs"> 135 <Compile Include="Interfaces\IGridServer.cs">
140 <SubType>Code</SubType> 136 <SubType>Code</SubType>
141 </Compile> 137 </Compile>
142 <Compile Include="Interfaces\IUserServer.cs"> 138 <Compile Include="Interfaces\ILocalStorage.cs">
143 <SubType>Code</SubType> 139 <SubType>Code</SubType>
144 </Compile> 140 </Compile>
145 <Compile Include="Interfaces\IAssetServer.cs"> 141 <Compile Include="Interfaces\IUserServer.cs">
146 <SubType>Code</SubType> 142 <SubType>Code</SubType>
147 </Compile> 143 </Compile>
148 <Compile Include="Interfaces\IWorld.cs"> 144 <Compile Include="Interfaces\IWorld.cs">
149 <SubType>Code</SubType> 145 <SubType>Code</SubType>
150 </Compile> 146 </Compile>
151 <Compile Include="Interfaces\IClientAPI.cs"> 147 <Compile Include="Interfaces\LocalGridBase.cs">
152 <SubType>Code</SubType> 148 <SubType>Code</SubType>
153 </Compile> 149 </Compile>
154 <Compile Include="Interfaces\IGridServer.cs"> 150 <Compile Include="Interfaces\RemoteGridBase.cs">
155 <SubType>Code</SubType> 151 <SubType>Code</SubType>
156 </Compile> 152 </Compile>
157 <Compile Include="Interfaces\ILocalStorage.cs"> 153 <Compile Include="Interfaces\Config\IGenericConfig.cs">
158 <SubType>Code</SubType> 154 <SubType>Code</SubType>
159 </Compile> 155 </Compile>
160 <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> 156 <Compile Include="Interfaces\Config\IGridConfig.cs">
161 <SubType>Code</SubType> 157 <SubType>Code</SubType>
162 </Compile> 158 </Compile>
163 <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> 159 <Compile Include="Interfaces\Config\IUserConfig.cs">
164 <SubType>Code</SubType> 160 <SubType>Code</SubType>
165 </Compile> 161 </Compile>
166 <Compile Include="Interfaces\Remoting\IProxyServerHost.cs"> 162 <Compile Include="Interfaces\Remoting\IGridServerHost.cs">
167 <SubType>Code</SubType> 163 <SubType>Code</SubType>
168 </Compile> 164 </Compile>
169 <Compile Include="Interfaces\Remoting\IProxyServerClient.cs"> 165 <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">
170 <SubType>Code</SubType> 166 <SubType>Code</SubType>
171 </Compile> 167 </Compile>
172 <Compile Include="Interfaces\Remoting\IRegionGridClient.cs"> 168 <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">
173 <SubType>Code</SubType> 169 <SubType>Code</SubType>
174 </Compile> 170 </Compile>
175 <Compile Include="Interfaces\Remoting\IGridServerHost.cs"> 171 <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">
176 <SubType>Code</SubType> 172 <SubType>Code</SubType>
177 </Compile> 173 </Compile>
178 <Compile Include="Interfaces\Remoting\IRegionSimHost.cs"> 174 <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">
@@ -181,24 +177,15 @@
181 <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs"> 177 <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">
182 <SubType>Code</SubType> 178 <SubType>Code</SubType>
183 </Compile> 179 </Compile>
184 <Compile Include="Interfaces\Config\IGenericConfig.cs"> 180 <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
185 <SubType>Code</SubType>
186 </Compile>
187 <Compile Include="Interfaces\Config\IUserConfig.cs">
188 <SubType>Code</SubType> 181 <SubType>Code</SubType>
189 </Compile> 182 </Compile>
190 <Compile Include="Interfaces\Config\IGridConfig.cs"> 183 <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
191 <SubType>Code</SubType> 184 <SubType>Code</SubType>
192 </Compile> 185 </Compile>
193 <Compile Include="Properties\AssemblyInfo.cs"> 186 <Compile Include="Properties\AssemblyInfo.cs">
194 <SubType>Code</SubType> 187 <SubType>Code</SubType>
195 </Compile> 188 </Compile>
196 <Compile Include="Types\ParcelData.cs">
197 <SubType>Code</SubType>
198 </Compile>
199 <Compile Include="Types\EstateSettings.cs">
200 <SubType>Code</SubType>
201 </Compile>
202 <Compile Include="Types\AgentCiruitData.cs"> 189 <Compile Include="Types\AgentCiruitData.cs">
203 <SubType>Code</SubType> 190 <SubType>Code</SubType>
204 </Compile> 191 </Compile>
@@ -214,6 +201,9 @@
214 <Compile Include="Types\AssetStorage.cs"> 201 <Compile Include="Types\AssetStorage.cs">
215 <SubType>Code</SubType> 202 <SubType>Code</SubType>
216 </Compile> 203 </Compile>
204 <Compile Include="Types\EstateSettings.cs">
205 <SubType>Code</SubType>
206 </Compile>
217 <Compile Include="Types\Login.cs"> 207 <Compile Include="Types\Login.cs">
218 <SubType>Code</SubType> 208 <SubType>Code</SubType>
219 </Compile> 209 </Compile>
@@ -223,6 +213,9 @@
223 <Compile Include="Types\NetworkServersInfo.cs"> 213 <Compile Include="Types\NetworkServersInfo.cs">
224 <SubType>Code</SubType> 214 <SubType>Code</SubType>
225 </Compile> 215 </Compile>
216 <Compile Include="Types\ParcelData.cs">
217 <SubType>Code</SubType>
218 </Compile>
226 <Compile Include="Types\PrimData.cs"> 219 <Compile Include="Types\PrimData.cs">
227 <SubType>Code</SubType> 220 <SubType>Code</SubType>
228 </Compile> 221 </Compile>
@@ -237,4 +230,4 @@
237 <PostBuildEvent> 230 <PostBuildEvent>
238 </PostBuildEvent> 231 </PostBuildEvent>
239 </PropertyGroup> 232 </PropertyGroup>
240</Project> \ No newline at end of file 233</Project>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 248c323..ac2ade4 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -18,42 +18,41 @@
18 <include name="LoginService.cs" /> 18 <include name="LoginService.cs" />
19 <include name="RegionCommsHostBase.cs" /> 19 <include name="RegionCommsHostBase.cs" />
20 <include name="Remoting.cs" /> 20 <include name="Remoting.cs" />
21 <include name="SimProfile.cs" />
21 <include name="UserProfile.cs" /> 22 <include name="UserProfile.cs" />
22 <include name="UserProfileManager.cs" /> 23 <include name="UserProfileManager.cs" />
23 <include name="UserProfileManagerBase.cs" /> 24 <include name="UserProfileManagerBase.cs" />
24 <include name="Util.cs" /> 25 <include name="Util.cs" />
25 <include name="SimProfile.cs" />
26 <include name="Interfaces/IUserManager.cs" />
27 <include name="Interfaces/LocalGridBase.cs" />
28 <include name="Interfaces/RemoteGridBase.cs" />
29 <include name="Interfaces/IUserServer.cs" />
30 <include name="Interfaces/IAssetServer.cs" /> 26 <include name="Interfaces/IAssetServer.cs" />
31 <include name="Interfaces/IWorld.cs" />
32 <include name="Interfaces/IClientAPI.cs" /> 27 <include name="Interfaces/IClientAPI.cs" />
33 <include name="Interfaces/IGridServer.cs" /> 28 <include name="Interfaces/IGridServer.cs" />
34 <include name="Interfaces/ILocalStorage.cs" /> 29 <include name="Interfaces/ILocalStorage.cs" />
35 <include name="Interfaces/Scripting/IScriptEngine.cs" /> 30 <include name="Interfaces/IUserServer.cs" />
36 <include name="Interfaces/Scripting/IScriptAPI.cs" /> 31 <include name="Interfaces/IWorld.cs" />
37 <include name="Interfaces/Remoting/IProxyServerHost.cs" /> 32 <include name="Interfaces/LocalGridBase.cs" />
33 <include name="Interfaces/RemoteGridBase.cs" />
34 <include name="Interfaces/Config/IGenericConfig.cs" />
35 <include name="Interfaces/Config/IGridConfig.cs" />
36 <include name="Interfaces/Config/IUserConfig.cs" />
37 <include name="Interfaces/Remoting/IGridServerHost.cs" />
38 <include name="Interfaces/Remoting/IProxyServerClient.cs" /> 38 <include name="Interfaces/Remoting/IProxyServerClient.cs" />
39 <include name="Interfaces/Remoting/IProxyServerHost.cs" />
39 <include name="Interfaces/Remoting/IRegionGridClient.cs" /> 40 <include name="Interfaces/Remoting/IRegionGridClient.cs" />
40 <include name="Interfaces/Remoting/IGridServerHost.cs" />
41 <include name="Interfaces/Remoting/IRegionSimHost.cs" /> 41 <include name="Interfaces/Remoting/IRegionSimHost.cs" />
42 <include name="Interfaces/Remoting/RegionGridClientBase.cs" /> 42 <include name="Interfaces/Remoting/RegionGridClientBase.cs" />
43 <include name="Interfaces/Config/IGenericConfig.cs" /> 43 <include name="Interfaces/Scripting/IScriptAPI.cs" />
44 <include name="Interfaces/Config/IUserConfig.cs" /> 44 <include name="Interfaces/Scripting/IScriptEngine.cs" />
45 <include name="Interfaces/Config/IGridConfig.cs" />
46 <include name="Properties/AssemblyInfo.cs" /> 45 <include name="Properties/AssemblyInfo.cs" />
47 <include name="Types/ParcelData.cs" />
48 <include name="Types/EstateSettings.cs" />
49 <include name="Types/AgentCiruitData.cs" /> 46 <include name="Types/AgentCiruitData.cs" />
50 <include name="Types/AgentWearable.cs" /> 47 <include name="Types/AgentWearable.cs" />
51 <include name="Types/AssetBase.cs" /> 48 <include name="Types/AssetBase.cs" />
52 <include name="Types/AssetLandmark.cs" /> 49 <include name="Types/AssetLandmark.cs" />
53 <include name="Types/AssetStorage.cs" /> 50 <include name="Types/AssetStorage.cs" />
51 <include name="Types/EstateSettings.cs" />
54 <include name="Types/Login.cs" /> 52 <include name="Types/Login.cs" />
55 <include name="Types/NeighbourInfo.cs" /> 53 <include name="Types/NeighbourInfo.cs" />
56 <include name="Types/NetworkServersInfo.cs" /> 54 <include name="Types/NetworkServersInfo.cs" />
55 <include name="Types/ParcelData.cs" />
57 <include name="Types/PrimData.cs" /> 56 <include name="Types/PrimData.cs" />
58 <include name="Types/RegionInfo.cs" /> 57 <include name="Types/RegionInfo.cs" />
59 </sources> 58 </sources>
generated by cgit v1.1 at 2024-11-05 22:54:43 +0000