diff options
author | mingchen | 2007-06-11 18:27:07 +0000 |
---|---|---|
committer | mingchen | 2007-06-11 18:27:07 +0000 |
commit | 5c3a4f52f4b4413832a6942aa75a21b157cd48dc (patch) | |
tree | 365f721039c08ecbc57e82dfa24d6f07b6419c25 /Common/OpenSim.Framework | |
parent | *Removed OSVector3 and replaced with libsecondlife.LLVector3 (diff) | |
download | opensim-SC_OLD-5c3a4f52f4b4413832a6942aa75a21b157cd48dc.zip opensim-SC_OLD-5c3a4f52f4b4413832a6942aa75a21b157cd48dc.tar.gz opensim-SC_OLD-5c3a4f52f4b4413832a6942aa75a21b157cd48dc.tar.bz2 opensim-SC_OLD-5c3a4f52f4b4413832a6942aa75a21b157cd48dc.tar.xz |
*Removed SimProfileBase from OpenSim (Unused/Depreciated)
*Updated prebuild.xml
Diffstat (limited to 'Common/OpenSim.Framework')
-rw-r--r-- | Common/OpenSim.Framework/OpenSim.Framework.csproj | 92 | ||||
-rw-r--r-- | Common/OpenSim.Framework/OpenSim.Framework.dll.build | 32 | ||||
-rw-r--r-- | Common/OpenSim.Framework/SimProfile.cs | 14 | ||||
-rw-r--r-- | Common/OpenSim.Framework/SimProfileBase.cs | 54 |
4 files changed, 73 insertions, 119 deletions
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index 0da0982..9407a4f 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,12 +111,6 @@ | |||
118 | <Compile Include="Remoting.cs"> | 111 | <Compile Include="Remoting.cs"> |
119 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
120 | </Compile> | 113 | </Compile> |
121 | <Compile Include="SimProfile.cs"> | ||
122 | <SubType>Code</SubType> | ||
123 | </Compile> | ||
124 | <Compile Include="SimProfileBase.cs"> | ||
125 | <SubType>Code</SubType> | ||
126 | </Compile> | ||
127 | <Compile Include="UserProfile.cs"> | 114 | <Compile Include="UserProfile.cs"> |
128 | <SubType>Code</SubType> | 115 | <SubType>Code</SubType> |
129 | </Compile> | 116 | </Compile> |
@@ -136,49 +123,55 @@ | |||
136 | <Compile Include="Util.cs"> | 123 | <Compile Include="Util.cs"> |
137 | <SubType>Code</SubType> | 124 | <SubType>Code</SubType> |
138 | </Compile> | 125 | </Compile> |
139 | <Compile Include="Interfaces\IAssetServer.cs"> | 126 | <Compile Include="SimProfile.cs"> |
140 | <SubType>Code</SubType> | 127 | <SubType>Code</SubType> |
141 | </Compile> | 128 | </Compile> |
142 | <Compile Include="Interfaces\IClientAPI.cs"> | 129 | <Compile Include="Interfaces\ILoginServer.cs"> |
143 | <SubType>Code</SubType> | 130 | <SubType>Code</SubType> |
144 | </Compile> | 131 | </Compile> |
145 | <Compile Include="Interfaces\IGridServer.cs"> | 132 | <Compile Include="Interfaces\IUserManager.cs"> |
146 | <SubType>Code</SubType> | 133 | <SubType>Code</SubType> |
147 | </Compile> | 134 | </Compile> |
148 | <Compile Include="Interfaces\ILocalStorage.cs"> | 135 | <Compile Include="Interfaces\LocalGridBase.cs"> |
136 | <SubType>Code</SubType> | ||
137 | </Compile> | ||
138 | <Compile Include="Interfaces\RemoteGridBase.cs"> | ||
149 | <SubType>Code</SubType> | 139 | <SubType>Code</SubType> |
150 | </Compile> | 140 | </Compile> |
151 | <Compile Include="Interfaces\IUserServer.cs"> | 141 | <Compile Include="Interfaces\IUserServer.cs"> |
152 | <SubType>Code</SubType> | 142 | <SubType>Code</SubType> |
153 | </Compile> | 143 | </Compile> |
144 | <Compile Include="Interfaces\IAssetServer.cs"> | ||
145 | <SubType>Code</SubType> | ||
146 | </Compile> | ||
154 | <Compile Include="Interfaces\IWorld.cs"> | 147 | <Compile Include="Interfaces\IWorld.cs"> |
155 | <SubType>Code</SubType> | 148 | <SubType>Code</SubType> |
156 | </Compile> | 149 | </Compile> |
157 | <Compile Include="Interfaces\LocalGridBase.cs"> | 150 | <Compile Include="Interfaces\IClientAPI.cs"> |
158 | <SubType>Code</SubType> | 151 | <SubType>Code</SubType> |
159 | </Compile> | 152 | </Compile> |
160 | <Compile Include="Interfaces\RemoteGridBase.cs"> | 153 | <Compile Include="Interfaces\IGridServer.cs"> |
161 | <SubType>Code</SubType> | 154 | <SubType>Code</SubType> |
162 | </Compile> | 155 | </Compile> |
163 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> | 156 | <Compile Include="Interfaces\ILocalStorage.cs"> |
164 | <SubType>Code</SubType> | 157 | <SubType>Code</SubType> |
165 | </Compile> | 158 | </Compile> |
166 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | 159 | <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> |
167 | <SubType>Code</SubType> | 160 | <SubType>Code</SubType> |
168 | </Compile> | 161 | </Compile> |
169 | <Compile Include="Interfaces\Config\IUserConfig.cs"> | 162 | <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> |
170 | <SubType>Code</SubType> | 163 | <SubType>Code</SubType> |
171 | </Compile> | 164 | </Compile> |
172 | <Compile Include="Interfaces\Remoting\IGridServerHost.cs"> | 165 | <Compile Include="Interfaces\Remoting\IProxyServerHost.cs"> |
173 | <SubType>Code</SubType> | 166 | <SubType>Code</SubType> |
174 | </Compile> | 167 | </Compile> |
175 | <Compile Include="Interfaces\Remoting\IProxyServerClient.cs"> | 168 | <Compile Include="Interfaces\Remoting\IProxyServerClient.cs"> |
176 | <SubType>Code</SubType> | 169 | <SubType>Code</SubType> |
177 | </Compile> | 170 | </Compile> |
178 | <Compile Include="Interfaces\Remoting\IProxyServerHost.cs"> | 171 | <Compile Include="Interfaces\Remoting\IRegionGridClient.cs"> |
179 | <SubType>Code</SubType> | 172 | <SubType>Code</SubType> |
180 | </Compile> | 173 | </Compile> |
181 | <Compile Include="Interfaces\Remoting\IRegionGridClient.cs"> | 174 | <Compile Include="Interfaces\Remoting\IGridServerHost.cs"> |
182 | <SubType>Code</SubType> | 175 | <SubType>Code</SubType> |
183 | </Compile> | 176 | </Compile> |
184 | <Compile Include="Interfaces\Remoting\IRegionSimHost.cs"> | 177 | <Compile Include="Interfaces\Remoting\IRegionSimHost.cs"> |
@@ -187,15 +180,24 @@ | |||
187 | <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs"> | 180 | <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs"> |
188 | <SubType>Code</SubType> | 181 | <SubType>Code</SubType> |
189 | </Compile> | 182 | </Compile> |
190 | <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> | 183 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> |
191 | <SubType>Code</SubType> | 184 | <SubType>Code</SubType> |
192 | </Compile> | 185 | </Compile> |
193 | <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> | 186 | <Compile Include="Interfaces\Config\IUserConfig.cs"> |
187 | <SubType>Code</SubType> | ||
188 | </Compile> | ||
189 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | ||
194 | <SubType>Code</SubType> | 190 | <SubType>Code</SubType> |
195 | </Compile> | 191 | </Compile> |
196 | <Compile Include="Properties\AssemblyInfo.cs"> | 192 | <Compile Include="Properties\AssemblyInfo.cs"> |
197 | <SubType>Code</SubType> | 193 | <SubType>Code</SubType> |
198 | </Compile> | 194 | </Compile> |
195 | <Compile Include="Types\ParcelData.cs"> | ||
196 | <SubType>Code</SubType> | ||
197 | </Compile> | ||
198 | <Compile Include="Types\EstateSettings.cs"> | ||
199 | <SubType>Code</SubType> | ||
200 | </Compile> | ||
199 | <Compile Include="Types\AgentCiruitData.cs"> | 201 | <Compile Include="Types\AgentCiruitData.cs"> |
200 | <SubType>Code</SubType> | 202 | <SubType>Code</SubType> |
201 | </Compile> | 203 | </Compile> |
@@ -211,9 +213,6 @@ | |||
211 | <Compile Include="Types\AssetStorage.cs"> | 213 | <Compile Include="Types\AssetStorage.cs"> |
212 | <SubType>Code</SubType> | 214 | <SubType>Code</SubType> |
213 | </Compile> | 215 | </Compile> |
214 | <Compile Include="Types\EstateSettings.cs"> | ||
215 | <SubType>Code</SubType> | ||
216 | </Compile> | ||
217 | <Compile Include="Types\Login.cs"> | 216 | <Compile Include="Types\Login.cs"> |
218 | <SubType>Code</SubType> | 217 | <SubType>Code</SubType> |
219 | </Compile> | 218 | </Compile> |
@@ -223,9 +222,6 @@ | |||
223 | <Compile Include="Types\NetworkServersInfo.cs"> | 222 | <Compile Include="Types\NetworkServersInfo.cs"> |
224 | <SubType>Code</SubType> | 223 | <SubType>Code</SubType> |
225 | </Compile> | 224 | </Compile> |
226 | <Compile Include="Types\ParcelData.cs"> | ||
227 | <SubType>Code</SubType> | ||
228 | </Compile> | ||
229 | <Compile Include="Types\PrimData.cs"> | 225 | <Compile Include="Types\PrimData.cs"> |
230 | <SubType>Code</SubType> | 226 | <SubType>Code</SubType> |
231 | </Compile> | 227 | </Compile> |
@@ -240,4 +236,4 @@ | |||
240 | <PostBuildEvent> | 236 | <PostBuildEvent> |
241 | </PostBuildEvent> | 237 | </PostBuildEvent> |
242 | </PropertyGroup> | 238 | </PropertyGroup> |
243 | </Project> \ No newline at end of file | 239 | </Project> |
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build index 7ead9a8..dcbff12 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -18,43 +18,43 @@ | |||
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" /> | ||
22 | <include name="SimProfileBase.cs" /> | ||
23 | <include name="UserProfile.cs" /> | 21 | <include name="UserProfile.cs" /> |
24 | <include name="UserProfileManager.cs" /> | 22 | <include name="UserProfileManager.cs" /> |
25 | <include name="UserProfileManagerBase.cs" /> | 23 | <include name="UserProfileManagerBase.cs" /> |
26 | <include name="Util.cs" /> | 24 | <include name="Util.cs" /> |
25 | <include name="SimProfile.cs" /> | ||
26 | <include name="Interfaces/ILoginServer.cs" /> | ||
27 | <include name="Interfaces/IUserManager.cs" /> | ||
28 | <include name="Interfaces/LocalGridBase.cs" /> | ||
29 | <include name="Interfaces/RemoteGridBase.cs" /> | ||
30 | <include name="Interfaces/IUserServer.cs" /> | ||
27 | <include name="Interfaces/IAssetServer.cs" /> | 31 | <include name="Interfaces/IAssetServer.cs" /> |
32 | <include name="Interfaces/IWorld.cs" /> | ||
28 | <include name="Interfaces/IClientAPI.cs" /> | 33 | <include name="Interfaces/IClientAPI.cs" /> |
29 | <include name="Interfaces/IGridServer.cs" /> | 34 | <include name="Interfaces/IGridServer.cs" /> |
30 | <include name="Interfaces/ILocalStorage.cs" /> | 35 | <include name="Interfaces/ILocalStorage.cs" /> |
31 | <include name="Interfaces/IUserServer.cs" /> | 36 | <include name="Interfaces/Scripting/IScriptEngine.cs" /> |
32 | <include name="Interfaces/IWorld.cs" /> | 37 | <include name="Interfaces/Scripting/IScriptAPI.cs" /> |
33 | <include name="Interfaces/LocalGridBase.cs" /> | ||
34 | <include name="Interfaces/RemoteGridBase.cs" /> | ||
35 | <include name="Interfaces/Config/IGenericConfig.cs" /> | ||
36 | <include name="Interfaces/Config/IGridConfig.cs" /> | ||
37 | <include name="Interfaces/Config/IUserConfig.cs" /> | ||
38 | <include name="Interfaces/Remoting/IGridServerHost.cs" /> | ||
39 | <include name="Interfaces/Remoting/IProxyServerClient.cs" /> | ||
40 | <include name="Interfaces/Remoting/IProxyServerHost.cs" /> | 38 | <include name="Interfaces/Remoting/IProxyServerHost.cs" /> |
39 | <include name="Interfaces/Remoting/IProxyServerClient.cs" /> | ||
41 | <include name="Interfaces/Remoting/IRegionGridClient.cs" /> | 40 | <include name="Interfaces/Remoting/IRegionGridClient.cs" /> |
41 | <include name="Interfaces/Remoting/IGridServerHost.cs" /> | ||
42 | <include name="Interfaces/Remoting/IRegionSimHost.cs" /> | 42 | <include name="Interfaces/Remoting/IRegionSimHost.cs" /> |
43 | <include name="Interfaces/Remoting/RegionGridClientBase.cs" /> | 43 | <include name="Interfaces/Remoting/RegionGridClientBase.cs" /> |
44 | <include name="Interfaces/Scripting/IScriptAPI.cs" /> | 44 | <include name="Interfaces/Config/IGenericConfig.cs" /> |
45 | <include name="Interfaces/Scripting/IScriptEngine.cs" /> | 45 | <include name="Interfaces/Config/IUserConfig.cs" /> |
46 | <include name="Interfaces/Config/IGridConfig.cs" /> | ||
46 | <include name="Properties/AssemblyInfo.cs" /> | 47 | <include name="Properties/AssemblyInfo.cs" /> |
48 | <include name="Types/ParcelData.cs" /> | ||
49 | <include name="Types/EstateSettings.cs" /> | ||
47 | <include name="Types/AgentCiruitData.cs" /> | 50 | <include name="Types/AgentCiruitData.cs" /> |
48 | <include name="Types/AgentWearable.cs" /> | 51 | <include name="Types/AgentWearable.cs" /> |
49 | <include name="Types/AssetBase.cs" /> | 52 | <include name="Types/AssetBase.cs" /> |
50 | <include name="Types/AssetLandmark.cs" /> | 53 | <include name="Types/AssetLandmark.cs" /> |
51 | <include name="Types/AssetStorage.cs" /> | 54 | <include name="Types/AssetStorage.cs" /> |
52 | <include name="Types/EstateSettings.cs" /> | ||
53 | <include name="Types/Login.cs" /> | 55 | <include name="Types/Login.cs" /> |
54 | <include name="Types/NeighbourInfo.cs" /> | 56 | <include name="Types/NeighbourInfo.cs" /> |
55 | <include name="Types/NetworkServersInfo.cs" /> | 57 | <include name="Types/NetworkServersInfo.cs" /> |
56 | <include name="Types/OSVector3.cs" /> | ||
57 | <include name="Types/ParcelData.cs" /> | ||
58 | <include name="Types/PrimData.cs" /> | 58 | <include name="Types/PrimData.cs" /> |
59 | <include name="Types/RegionInfo.cs" /> | 59 | <include name="Types/RegionInfo.cs" /> |
60 | </sources> | 60 | </sources> |
diff --git a/Common/OpenSim.Framework/SimProfile.cs b/Common/OpenSim.Framework/SimProfile.cs index 2e37e02..cfa5e50 100644 --- a/Common/OpenSim.Framework/SimProfile.cs +++ b/Common/OpenSim.Framework/SimProfile.cs | |||
@@ -35,8 +35,20 @@ using Nwc.XmlRpc; | |||
35 | 35 | ||
36 | namespace OpenSim.Framework.Sims | 36 | namespace OpenSim.Framework.Sims |
37 | { | 37 | { |
38 | public class SimProfile : SimProfileBase | 38 | public class SimProfile |
39 | { | 39 | { |
40 | public LLUUID UUID; | ||
41 | public ulong regionhandle; | ||
42 | public string regionname; | ||
43 | public string sim_ip; | ||
44 | public uint sim_port; | ||
45 | public string caps_url; | ||
46 | public uint RegionLocX; | ||
47 | public uint RegionLocY; | ||
48 | public string sendkey; | ||
49 | public string recvkey; | ||
50 | public bool online; | ||
51 | |||
40 | public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey) | 52 | public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey) |
41 | { | 53 | { |
42 | try | 54 | try |
diff --git a/Common/OpenSim.Framework/SimProfileBase.cs b/Common/OpenSim.Framework/SimProfileBase.cs deleted file mode 100644 index bab18be..0000000 --- a/Common/OpenSim.Framework/SimProfileBase.cs +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | |||
33 | namespace OpenSim.Framework.Sims | ||
34 | { | ||
35 | [System.Obsolete("Depreciated, use SimProfileData instead")] | ||
36 | public class SimProfileBase | ||
37 | { | ||
38 | public LLUUID UUID; | ||
39 | public ulong regionhandle; | ||
40 | public string regionname; | ||
41 | public string sim_ip; | ||
42 | public uint sim_port; | ||
43 | public string caps_url; | ||
44 | public uint RegionLocX; | ||
45 | public uint RegionLocY; | ||
46 | public string sendkey; | ||
47 | public string recvkey; | ||
48 | public bool online; | ||
49 | |||
50 | public SimProfileBase() | ||
51 | { | ||
52 | } | ||
53 | } | ||
54 | } | ||