diff options
Diffstat (limited to '')
6 files changed, 101 insertions, 109 deletions
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj index b3fd574..fe3f9d9 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj | |||
@@ -80,7 +80,7 @@ | |||
80 | </ProjectReference> | 80 | </ProjectReference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <Compile Include="RegionServerCommsOGS.cs"> | 83 | <Compile Include="LocalBackEndServices.cs"> |
84 | <SubType>Code</SubType> | 84 | <SubType>Code</SubType> |
85 | </Compile> | 85 | </Compile> |
86 | <Compile Include="RegionServerCommsLocal.cs"> | 86 | <Compile Include="RegionServerCommsLocal.cs"> |
@@ -89,37 +89,37 @@ | |||
89 | <Compile Include="RegionServerCommsManager.cs"> | 89 | <Compile Include="RegionServerCommsManager.cs"> |
90 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
91 | </Compile> | 91 | </Compile> |
92 | <Compile Include="LocalBackEndServices.cs"> | 92 | <Compile Include="RegionServerCommsOGS.cs"> |
93 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
94 | </Compile> | 94 | </Compile> |
95 | <Compile Include="UserServer\UserCommsManagerOGS.cs"> | 95 | <Compile Include="GridServer\GridCommsManagerBase.cs"> |
96 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
97 | </Compile> | 97 | </Compile> |
98 | <Compile Include="UserServer\UserCommsManagerBase.cs"> | 98 | <Compile Include="GridServer\GridCommsManagerLocal.cs"> |
99 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
100 | </Compile> | 100 | </Compile> |
101 | <Compile Include="UserServer\UserCommsManagerLocal.cs"> | 101 | <Compile Include="GridServer\GridCommsManagerOGS.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | <Compile Include="GridServer\GridCommsManagerOGS.cs"> | 104 | <Compile Include="InterSimComms\InterSimsCommsBase.cs"> |
105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
106 | </Compile> | 106 | </Compile> |
107 | <Compile Include="GridServer\GridCommsManagerBase.cs"> | 107 | <Compile Include="InterSimComms\InterSimsCommsLocal.cs"> |
108 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
109 | </Compile> | 109 | </Compile> |
110 | <Compile Include="GridServer\GridCommsManagerLocal.cs"> | 110 | <Compile Include="InterSimComms\InterSimsCommsOGS.cs"> |
111 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
112 | </Compile> | 112 | </Compile> |
113 | <Compile Include="Properties\AssemblyInfo.cs"> | 113 | <Compile Include="Properties\AssemblyInfo.cs"> |
114 | <SubType>Code</SubType> | 114 | <SubType>Code</SubType> |
115 | </Compile> | 115 | </Compile> |
116 | <Compile Include="InterSimComms\InterSimsCommsOGS.cs"> | 116 | <Compile Include="UserServer\UserCommsManagerBase.cs"> |
117 | <SubType>Code</SubType> | 117 | <SubType>Code</SubType> |
118 | </Compile> | 118 | </Compile> |
119 | <Compile Include="InterSimComms\InterSimsCommsBase.cs"> | 119 | <Compile Include="UserServer\UserCommsManagerLocal.cs"> |
120 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
121 | </Compile> | 121 | </Compile> |
122 | <Compile Include="InterSimComms\InterSimsCommsLocal.cs"> | 122 | <Compile Include="UserServer\UserCommsManagerOGS.cs"> |
123 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
124 | </Compile> | 124 | </Compile> |
125 | </ItemGroup> | 125 | </ItemGroup> |
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build index c46174c..4036747 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build | |||
@@ -11,20 +11,20 @@ | |||
11 | <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="RegionServerCommsOGS.cs" /> | 14 | <include name="LocalBackEndServices.cs" /> |
15 | <include name="RegionServerCommsLocal.cs" /> | 15 | <include name="RegionServerCommsLocal.cs" /> |
16 | <include name="RegionServerCommsManager.cs" /> | 16 | <include name="RegionServerCommsManager.cs" /> |
17 | <include name="LocalBackEndServices.cs" /> | 17 | <include name="RegionServerCommsOGS.cs" /> |
18 | <include name="UserServer/UserCommsManagerOGS.cs" /> | ||
19 | <include name="UserServer/UserCommsManagerBase.cs" /> | ||
20 | <include name="UserServer/UserCommsManagerLocal.cs" /> | ||
21 | <include name="GridServer/GridCommsManagerOGS.cs" /> | ||
22 | <include name="GridServer/GridCommsManagerBase.cs" /> | 18 | <include name="GridServer/GridCommsManagerBase.cs" /> |
23 | <include name="GridServer/GridCommsManagerLocal.cs" /> | 19 | <include name="GridServer/GridCommsManagerLocal.cs" /> |
24 | <include name="Properties/AssemblyInfo.cs" /> | 20 | <include name="GridServer/GridCommsManagerOGS.cs" /> |
25 | <include name="InterSimComms/InterSimsCommsOGS.cs" /> | ||
26 | <include name="InterSimComms/InterSimsCommsBase.cs" /> | 21 | <include name="InterSimComms/InterSimsCommsBase.cs" /> |
27 | <include name="InterSimComms/InterSimsCommsLocal.cs" /> | 22 | <include name="InterSimComms/InterSimsCommsLocal.cs" /> |
23 | <include name="InterSimComms/InterSimsCommsOGS.cs" /> | ||
24 | <include name="Properties/AssemblyInfo.cs" /> | ||
25 | <include name="UserServer/UserCommsManagerBase.cs" /> | ||
26 | <include name="UserServer/UserCommsManagerLocal.cs" /> | ||
27 | <include name="UserServer/UserCommsManagerOGS.cs" /> | ||
28 | </sources> | 28 | </sources> |
29 | <references basedir="${project::get-base-directory()}"> | 29 | <references basedir="${project::get-base-directory()}"> |
30 | <lib> | 30 | <lib> |
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> |
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj index 86f6aaa..61f8be0 100644 --- a/Common/XmlRpcCS/XMLRPC.csproj +++ b/Common/XmlRpcCS/XMLRPC.csproj | |||
@@ -70,58 +70,58 @@ | |||
70 | <ItemGroup> | 70 | <ItemGroup> |
71 | </ItemGroup> | 71 | </ItemGroup> |
72 | <ItemGroup> | 72 | <ItemGroup> |
73 | <Compile Include="XmlRpcBoxcarRequest.cs"> | 73 | <Compile Include="Logger.cs"> |
74 | <SubType>Code</SubType> | 74 | <SubType>Code</SubType> |
75 | </Compile> | 75 | </Compile> |
76 | <Compile Include="XmlRpcRequest.cs"> | 76 | <Compile Include="SimpleHttpRequest.cs"> |
77 | <SubType>Code</SubType> | 77 | <SubType>Code</SubType> |
78 | </Compile> | 78 | </Compile> |
79 | <Compile Include="XmlRpcResponseSerializer.cs"> | 79 | <Compile Include="XmlRpcBoxcarRequest.cs"> |
80 | <SubType>Code</SubType> | 80 | <SubType>Code</SubType> |
81 | </Compile> | 81 | </Compile> |
82 | <Compile Include="Logger.cs"> | 82 | <Compile Include="XmlRpcClientProxy.cs"> |
83 | <SubType>Code</SubType> | 83 | <SubType>Code</SubType> |
84 | </Compile> | 84 | </Compile> |
85 | <Compile Include="XmlRpcRequestDeserializer.cs"> | 85 | <Compile Include="XmlRpcDeserializer.cs"> |
86 | <SubType>Code</SubType> | 86 | <SubType>Code</SubType> |
87 | </Compile> | 87 | </Compile> |
88 | <Compile Include="XmlRpcExposedAttribute.cs"> | 88 | <Compile Include="XmlRpcErrorCodes.cs"> |
89 | <SubType>Code</SubType> | 89 | <SubType>Code</SubType> |
90 | </Compile> | 90 | </Compile> |
91 | <Compile Include="XmlRpcResponse.cs"> | 91 | <Compile Include="XmlRpcException.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="XmlRpcException.cs"> | 94 | <Compile Include="XmlRpcExposedAttribute.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="XmlRpcResponseDeserializer.cs"> | 97 | <Compile Include="XmlRpcRequest.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="XmlRpcResponder.cs"> | 100 | <Compile Include="XmlRpcRequestDeserializer.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="XmlRpcServer.cs"> | 103 | <Compile Include="XmlRpcRequestSerializer.cs"> |
104 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
105 | </Compile> | 105 | </Compile> |
106 | <Compile Include="XmlRpcErrorCodes.cs"> | 106 | <Compile Include="XmlRpcResponder.cs"> |
107 | <SubType>Code</SubType> | 107 | <SubType>Code</SubType> |
108 | </Compile> | 108 | </Compile> |
109 | <Compile Include="XmlRpcSerializer.cs"> | 109 | <Compile Include="XmlRpcResponse.cs"> |
110 | <SubType>Code</SubType> | 110 | <SubType>Code</SubType> |
111 | </Compile> | 111 | </Compile> |
112 | <Compile Include="XmlRpcSystemObject.cs"> | 112 | <Compile Include="XmlRpcResponseDeserializer.cs"> |
113 | <SubType>Code</SubType> | 113 | <SubType>Code</SubType> |
114 | </Compile> | 114 | </Compile> |
115 | <Compile Include="SimpleHttpRequest.cs"> | 115 | <Compile Include="XmlRpcResponseSerializer.cs"> |
116 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
117 | </Compile> | 117 | </Compile> |
118 | <Compile Include="XmlRpcClientProxy.cs"> | 118 | <Compile Include="XmlRpcSerializer.cs"> |
119 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
120 | </Compile> | 120 | </Compile> |
121 | <Compile Include="XmlRpcRequestSerializer.cs"> | 121 | <Compile Include="XmlRpcServer.cs"> |
122 | <SubType>Code</SubType> | 122 | <SubType>Code</SubType> |
123 | </Compile> | 123 | </Compile> |
124 | <Compile Include="XmlRpcDeserializer.cs"> | 124 | <Compile Include="XmlRpcSystemObject.cs"> |
125 | <SubType>Code</SubType> | 125 | <SubType>Code</SubType> |
126 | </Compile> | 126 | </Compile> |
127 | <Compile Include="XmlRpcXmlTokens.cs"> | 127 | <Compile Include="XmlRpcXmlTokens.cs"> |
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build index 8d5efd1..2eabfcd 100644 --- a/Common/XmlRpcCS/XMLRPC.dll.build +++ b/Common/XmlRpcCS/XMLRPC.dll.build | |||
@@ -11,24 +11,24 @@ | |||
11 | <resources prefix="XMLRPC" dynamicprefix="true" > | 11 | <resources prefix="XMLRPC" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Logger.cs" /> | ||
15 | <include name="SimpleHttpRequest.cs" /> | ||
14 | <include name="XmlRpcBoxcarRequest.cs" /> | 16 | <include name="XmlRpcBoxcarRequest.cs" /> |
17 | <include name="XmlRpcClientProxy.cs" /> | ||
18 | <include name="XmlRpcDeserializer.cs" /> | ||
19 | <include name="XmlRpcErrorCodes.cs" /> | ||
20 | <include name="XmlRpcException.cs" /> | ||
21 | <include name="XmlRpcExposedAttribute.cs" /> | ||
15 | <include name="XmlRpcRequest.cs" /> | 22 | <include name="XmlRpcRequest.cs" /> |
16 | <include name="XmlRpcResponseSerializer.cs" /> | ||
17 | <include name="Logger.cs" /> | ||
18 | <include name="XmlRpcRequestDeserializer.cs" /> | 23 | <include name="XmlRpcRequestDeserializer.cs" /> |
19 | <include name="XmlRpcExposedAttribute.cs" /> | 24 | <include name="XmlRpcRequestSerializer.cs" /> |
25 | <include name="XmlRpcResponder.cs" /> | ||
20 | <include name="XmlRpcResponse.cs" /> | 26 | <include name="XmlRpcResponse.cs" /> |
21 | <include name="XmlRpcException.cs" /> | ||
22 | <include name="XmlRpcResponseDeserializer.cs" /> | 27 | <include name="XmlRpcResponseDeserializer.cs" /> |
23 | <include name="XmlRpcResponder.cs" /> | 28 | <include name="XmlRpcResponseSerializer.cs" /> |
24 | <include name="XmlRpcServer.cs" /> | ||
25 | <include name="XmlRpcErrorCodes.cs" /> | ||
26 | <include name="XmlRpcSerializer.cs" /> | 29 | <include name="XmlRpcSerializer.cs" /> |
30 | <include name="XmlRpcServer.cs" /> | ||
27 | <include name="XmlRpcSystemObject.cs" /> | 31 | <include name="XmlRpcSystemObject.cs" /> |
28 | <include name="SimpleHttpRequest.cs" /> | ||
29 | <include name="XmlRpcClientProxy.cs" /> | ||
30 | <include name="XmlRpcRequestSerializer.cs" /> | ||
31 | <include name="XmlRpcDeserializer.cs" /> | ||
32 | <include name="XmlRpcXmlTokens.cs" /> | 32 | <include name="XmlRpcXmlTokens.cs" /> |
33 | </sources> | 33 | </sources> |
34 | <references basedir="${project::get-base-directory()}"> | 34 | <references basedir="${project::get-base-directory()}"> |