diff options
author | MW | 2007-06-12 14:50:08 +0000 |
---|---|---|
committer | MW | 2007-06-12 14:50:08 +0000 |
commit | a7b55fb26fad9c66df091e0787afe89e021229f1 (patch) | |
tree | 7920939c67a9275d72dc4a494032b66355d6eb9f | |
parent | Some Work on the Primitive class (diff) | |
download | opensim-SC-a7b55fb26fad9c66df091e0787afe89e021229f1.zip opensim-SC-a7b55fb26fad9c66df091e0787afe89e021229f1.tar.gz opensim-SC-a7b55fb26fad9c66df091e0787afe89e021229f1.tar.bz2 opensim-SC-a7b55fb26fad9c66df091e0787afe89e021229f1.tar.xz |
Some rearranging of folders in OpenSim.Region
33 files changed, 344 insertions, 301 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()}"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj index 3b783ca..82d4f5f 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj | |||
@@ -88,13 +88,13 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="DB4oUserData.cs"> | 91 | <Compile Include="DB4oGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="DB4oManager.cs"> | 94 | <Compile Include="DB4oManager.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="DB4oGridData.cs"> | 97 | <Compile Include="DB4oUserData.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="Properties\AssemblyInfo.cs"> | 100 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build index db8662d..8e0f53a 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="DB4oUserData.cs" /> | ||
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oGridData.cs" /> | 14 | <include name="DB4oGridData.cs" /> |
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oUserData.cs" /> | ||
17 | <include name="Properties/AssemblyInfo.cs" /> | 17 | <include name="Properties/AssemblyInfo.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj index 5fe0cf7..75ef149 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj | |||
@@ -88,19 +88,19 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="MySQLInventoryData.cs"> | 91 | <Compile Include="MySQLGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="MySQLUserData.cs"> | 94 | <Compile Include="MySQLInventoryData.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="MySQLManager.cs"> | 97 | <Compile Include="MySQLLogData.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="MySQLLogData.cs"> | 100 | <Compile Include="MySQLManager.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="MySQLGridData.cs"> | 103 | <Compile Include="MySQLUserData.cs"> |
104 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
105 | </Compile> | 105 | </Compile> |
106 | <Compile Include="Properties\AssemblyInfo.cs"> | 106 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build index 84d3d56..78f4afe 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build | |||
@@ -11,11 +11,11 @@ | |||
11 | <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="MySQLGridData.cs" /> | ||
14 | <include name="MySQLInventoryData.cs" /> | 15 | <include name="MySQLInventoryData.cs" /> |
15 | <include name="MySQLUserData.cs" /> | ||
16 | <include name="MySQLManager.cs" /> | ||
17 | <include name="MySQLLogData.cs" /> | 16 | <include name="MySQLLogData.cs" /> |
18 | <include name="MySQLGridData.cs" /> | 17 | <include name="MySQLManager.cs" /> |
18 | <include name="MySQLUserData.cs" /> | ||
19 | <include name="Properties/AssemblyInfo.cs" /> | 19 | <include name="Properties/AssemblyInfo.cs" /> |
20 | </sources> | 20 | </sources> |
21 | <references basedir="${project::get-base-directory()}"> | 21 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj index fa17367..463cf86 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj | |||
@@ -88,10 +88,10 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="SQLiteManager.cs"> | 91 | <Compile Include="SQLiteGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="SQLiteGridData.cs"> | 94 | <Compile Include="SQLiteManager.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="Properties\AssemblyInfo.cs"> | 97 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build index 8c0f8fe..1be9b43 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="SQLiteManager.cs" /> | ||
15 | <include name="SQLiteGridData.cs" /> | 14 | <include name="SQLiteGridData.cs" /> |
15 | <include name="SQLiteManager.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj index 990cd16..a572204 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj | |||
@@ -81,9 +81,6 @@ | |||
81 | <Compile Include="GridData.cs"> | 81 | <Compile Include="GridData.cs"> |
82 | <SubType>Code</SubType> | 82 | <SubType>Code</SubType> |
83 | </Compile> | 83 | </Compile> |
84 | <Compile Include="SimProfileData.cs"> | ||
85 | <SubType>Code</SubType> | ||
86 | </Compile> | ||
87 | <Compile Include="ILogData.cs"> | 84 | <Compile Include="ILogData.cs"> |
88 | <SubType>Code</SubType> | 85 | <SubType>Code</SubType> |
89 | </Compile> | 86 | </Compile> |
@@ -93,6 +90,9 @@ | |||
93 | <Compile Include="InventoryData.cs"> | 90 | <Compile Include="InventoryData.cs"> |
94 | <SubType>Code</SubType> | 91 | <SubType>Code</SubType> |
95 | </Compile> | 92 | </Compile> |
93 | <Compile Include="SimProfileData.cs"> | ||
94 | <SubType>Code</SubType> | ||
95 | </Compile> | ||
96 | <Compile Include="UserData.cs"> | 96 | <Compile Include="UserData.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build index c993a8d..e6e0313 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build | |||
@@ -12,10 +12,10 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="GridData.cs" /> | 14 | <include name="GridData.cs" /> |
15 | <include name="SimProfileData.cs" /> | ||
16 | <include name="ILogData.cs" /> | 15 | <include name="ILogData.cs" /> |
17 | <include name="IniConfig.cs" /> | 16 | <include name="IniConfig.cs" /> |
18 | <include name="InventoryData.cs" /> | 17 | <include name="InventoryData.cs" /> |
18 | <include name="SimProfileData.cs" /> | ||
19 | <include name="UserData.cs" /> | 19 | <include name="UserData.cs" /> |
20 | <include name="UserProfileData.cs" /> | 20 | <include name="UserProfileData.cs" /> |
21 | <include name="Properties/AssemblyInfo.cs" /> | 21 | <include name="Properties/AssemblyInfo.cs" /> |
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 8c0f513..1bd07fb 100644 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj | |||
@@ -108,10 +108,10 @@ | |||
108 | </ProjectReference> | 108 | </ProjectReference> |
109 | </ItemGroup> | 109 | </ItemGroup> |
110 | <ItemGroup> | 110 | <ItemGroup> |
111 | <Compile Include="UserManager.cs"> | 111 | <Compile Include="Main.cs"> |
112 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
113 | </Compile> | 113 | </Compile> |
114 | <Compile Include="Main.cs"> | 114 | <Compile Include="UserManager.cs"> |
115 | <SubType>Code</SubType> | 115 | <SubType>Code</SubType> |
116 | </Compile> | 116 | </Compile> |
117 | <Compile Include="Properties\AssemblyInfo.cs"> | 117 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 1183d65..5275ef4 100644 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="UserManager.cs" /> | ||
15 | <include name="Main.cs" /> | 14 | <include name="Main.cs" /> |
15 | <include name="UserManager.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim.sln b/OpenSim.sln index 4b87349..ca590f4 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" |
@@ -41,93 +41,144 @@ EndProject | |||
41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" | 41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" |
42 | EndProject | 42 | EndProject |
43 | Global | 43 | Global |
44 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 44 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
45 | Debug|Any CPU = Debug|Any CPU | 45 | Debug|Any CPU = Debug|Any CPU |
46 | Release|Any CPU = Release|Any CPU | 46 | Release|Any CPU = Release|Any CPU |
47 | EndGlobalSection | 47 | EndGlobalSection |
48 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 48 | GlobalSection(ProjectDependencies) = postSolution |
49 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 49 | ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
50 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 50 | ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
51 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 51 | ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) |
52 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 52 | ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
53 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 53 | ({196916AF-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) |
54 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 54 | ({196916AF-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
55 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 55 | ({196916AF-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
56 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 56 | ({196916AF-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) |
57 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 57 | ({196916AF-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) |
58 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 58 | ({196916AF-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) |
59 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 59 | ({196916AF-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000}) |
60 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 60 | ({196916AF-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000}) |
61 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 61 | ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) |
62 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 62 | ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
63 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 63 | ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
64 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 64 | ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000}) |
65 | {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 65 | ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000}) |
66 | {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 66 | ({438A9556-0000-0000-0000-000000000000}).10 = ({196916AF-0000-0000-0000-000000000000}) |
67 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 67 | ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000}) |
68 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 68 | ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000}) |
69 | {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 | ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000}) |
70 | {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 | ({438A9556-0000-0000-0000-000000000000}).14 = ({8E81D43C-0000-0000-0000-000000000000}) |
71 | {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 | ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) |
72 | {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 72 | ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
73 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 73 | ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
74 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 74 | ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) |
75 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 75 | ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) |
76 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 76 | ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) |
77 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 77 | ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000}) |
78 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 78 | ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
79 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 79 | ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
80 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 80 | ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
81 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 81 | ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) |
82 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 82 | ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) |
83 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 83 | ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
84 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 84 | ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
85 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 85 | ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) |
86 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 86 | ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000}) |
87 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 87 | ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) |
88 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 88 | ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
89 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 89 | ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
90 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 90 | ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) |
91 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 91 | ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) |
92 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 92 | ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) |
93 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 93 | ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) |
94 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 94 | ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) |
95 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 95 | ({97A82740-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
96 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 96 | ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) |
97 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 97 | ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) |
98 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 98 | EndGlobalSection |
99 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 99 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
100 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 100 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
101 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 101 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
102 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 102 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
103 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 103 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
104 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 104 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
105 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 105 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
106 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 106 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
107 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 107 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
108 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 108 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
109 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 109 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
110 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 110 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
111 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 111 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
112 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 112 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
113 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 113 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
114 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 114 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
115 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 115 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
116 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 116 | {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
117 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 117 | {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
118 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 118 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
119 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 119 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
120 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 120 | {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
121 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 121 | {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
122 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 122 | {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
123 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 123 | {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
124 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 124 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
125 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 125 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
126 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 126 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
127 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 127 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
128 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 128 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
129 | EndGlobalSection | 129 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
130 | GlobalSection(SolutionProperties) = preSolution | 130 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
131 | HideSolutionNode = FALSE | 131 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
132 | EndGlobalSection | 132 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
133 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
134 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
135 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
136 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
137 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
138 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
139 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
140 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
141 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
142 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
143 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
144 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
145 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
146 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
147 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
148 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
149 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
150 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
151 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
152 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
153 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
154 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
155 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
156 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
157 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
158 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
159 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
160 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
161 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
162 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
163 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
164 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
165 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
166 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
167 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
168 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
169 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
170 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
171 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
172 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
173 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
174 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
175 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
176 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
177 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
178 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
179 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
180 | EndGlobalSection | ||
181 | GlobalSection(SolutionProperties) = preSolution | ||
182 | HideSolutionNode = FALSE | ||
183 | EndGlobalSection | ||
133 | EndGlobal | 184 | EndGlobal |
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj index 9a5e5da..897f70f 100644 --- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj +++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj | |||
@@ -136,34 +136,34 @@ | |||
136 | <Compile Include="Estate\EstateManager.cs"> | 136 | <Compile Include="Estate\EstateManager.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="World\AvatarAnimations.cs"> | 139 | <Compile Include="World\World.cs"> |
140 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
141 | </Compile> | 141 | </Compile> |
142 | <Compile Include="World\Avatar.cs"> | 142 | <Compile Include="World\World.PacketHandlers.cs"> |
143 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
144 | </Compile> | 144 | </Compile> |
145 | <Compile Include="World\Avatar.Update.cs"> | 145 | <Compile Include="World\World.Scripting.cs"> |
146 | <SubType>Code</SubType> | 146 | <SubType>Code</SubType> |
147 | </Compile> | 147 | </Compile> |
148 | <Compile Include="World\Entity.cs"> | 148 | <Compile Include="World\WorldBase.cs"> |
149 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
150 | </Compile> | 150 | </Compile> |
151 | <Compile Include="World\Primitive.cs"> | 151 | <Compile Include="World\Entities\Entity.cs"> |
152 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
153 | </Compile> | 153 | </Compile> |
154 | <Compile Include="World\SceneObject.cs"> | 154 | <Compile Include="World\Entities\Primitive.cs"> |
155 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
156 | </Compile> | 156 | </Compile> |
157 | <Compile Include="World\World.cs"> | 157 | <Compile Include="World\Entities\SceneObject.cs"> |
158 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
159 | </Compile> | 159 | </Compile> |
160 | <Compile Include="World\World.PacketHandlers.cs"> | 160 | <Compile Include="World\Entities\Avatar\Avatar.cs"> |
161 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
162 | </Compile> | 162 | </Compile> |
163 | <Compile Include="World\WorldBase.cs"> | 163 | <Compile Include="World\Entities\Avatar\Avatar.Update.cs"> |
164 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
165 | </Compile> | 165 | </Compile> |
166 | <Compile Include="World\World.Scripting.cs"> | 166 | <Compile Include="World\Entities\Avatar\AvatarAnimations.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
169 | <Compile Include="World\scripting\IScriptContext.cs"> | 169 | <Compile Include="World\scripting\IScriptContext.cs"> |
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build index d6ddf0a..bcfaaa7 100644 --- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build +++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build | |||
@@ -13,16 +13,16 @@ | |||
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ParcelManager.cs" /> | 14 | <include name="ParcelManager.cs" /> |
15 | <include name="Estate/EstateManager.cs" /> | 15 | <include name="Estate/EstateManager.cs" /> |
16 | <include name="World/AvatarAnimations.cs" /> | ||
17 | <include name="World/Avatar.cs" /> | ||
18 | <include name="World/Avatar.Update.cs" /> | ||
19 | <include name="World/Entity.cs" /> | ||
20 | <include name="World/Primitive.cs" /> | ||
21 | <include name="World/SceneObject.cs" /> | ||
22 | <include name="World/World.cs" /> | 16 | <include name="World/World.cs" /> |
23 | <include name="World/World.PacketHandlers.cs" /> | 17 | <include name="World/World.PacketHandlers.cs" /> |
24 | <include name="World/WorldBase.cs" /> | ||
25 | <include name="World/World.Scripting.cs" /> | 18 | <include name="World/World.Scripting.cs" /> |
19 | <include name="World/WorldBase.cs" /> | ||
20 | <include name="World/Entities/Entity.cs" /> | ||
21 | <include name="World/Entities/Primitive.cs" /> | ||
22 | <include name="World/Entities/SceneObject.cs" /> | ||
23 | <include name="World/Entities/Avatar/Avatar.cs" /> | ||
24 | <include name="World/Entities/Avatar/Avatar.Update.cs" /> | ||
25 | <include name="World/Entities/Avatar/AvatarAnimations.cs" /> | ||
26 | <include name="World/scripting/IScriptContext.cs" /> | 26 | <include name="World/scripting/IScriptContext.cs" /> |
27 | <include name="World/scripting/IScriptEntity.cs" /> | 27 | <include name="World/scripting/IScriptEntity.cs" /> |
28 | <include name="World/scripting/IScriptHandler.cs" /> | 28 | <include name="World/scripting/IScriptHandler.cs" /> |
diff --git a/OpenSim/OpenSim.Region/World/Avatar.Update.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Update.cs index d373fdb..d373fdb 100644 --- a/OpenSim/OpenSim.Region/World/Avatar.Update.cs +++ b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Update.cs | |||
diff --git a/OpenSim/OpenSim.Region/World/Avatar.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.cs index c88e0cc..c88e0cc 100644 --- a/OpenSim/OpenSim.Region/World/Avatar.cs +++ b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.cs | |||
diff --git a/OpenSim/OpenSim.Region/World/AvatarAnimations.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs index 585cf3c..585cf3c 100644 --- a/OpenSim/OpenSim.Region/World/AvatarAnimations.cs +++ b/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs | |||
diff --git a/OpenSim/OpenSim.Region/World/Entity.cs b/OpenSim/OpenSim.Region/World/Entities/Entity.cs index 1620c89..1620c89 100644 --- a/OpenSim/OpenSim.Region/World/Entity.cs +++ b/OpenSim/OpenSim.Region/World/Entities/Entity.cs | |||
diff --git a/OpenSim/OpenSim.Region/World/Primitive.cs b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs index 0680eb3..0680eb3 100644 --- a/OpenSim/OpenSim.Region/World/Primitive.cs +++ b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs | |||
diff --git a/OpenSim/OpenSim.Region/World/SceneObject.cs b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs index 6ded881..6ded881 100644 --- a/OpenSim/OpenSim.Region/World/SceneObject.cs +++ b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs | |||
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 259d839..a6605a8 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -154,16 +154,16 @@ | |||
154 | <Compile Include="PacketServer.cs"> | 154 | <Compile Include="PacketServer.cs"> |
155 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
156 | </Compile> | 156 | </Compile> |
157 | <Compile Include="UserConfigUtility.cs"> | 157 | <Compile Include="RegionServerBase.cs"> |
158 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
159 | </Compile> | 159 | </Compile> |
160 | <Compile Include="VersionInfo.cs"> | 160 | <Compile Include="UDPServer.cs"> |
161 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
162 | </Compile> | 162 | </Compile> |
163 | <Compile Include="RegionServerBase.cs"> | 163 | <Compile Include="UserConfigUtility.cs"> |
164 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
165 | </Compile> | 165 | </Compile> |
166 | <Compile Include="UDPServer.cs"> | 166 | <Compile Include="VersionInfo.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
169 | <Compile Include="Assets\AssetCache.cs"> | 169 | <Compile Include="Assets\AssetCache.cs"> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 32c1699..42792f0 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -21,10 +21,10 @@ | |||
21 | <include name="NetworkServersInfo.cs" /> | 21 | <include name="NetworkServersInfo.cs" /> |
22 | <include name="OpenSimNetworkHandler.cs" /> | 22 | <include name="OpenSimNetworkHandler.cs" /> |
23 | <include name="PacketServer.cs" /> | 23 | <include name="PacketServer.cs" /> |
24 | <include name="UserConfigUtility.cs" /> | ||
25 | <include name="VersionInfo.cs" /> | ||
26 | <include name="RegionServerBase.cs" /> | 24 | <include name="RegionServerBase.cs" /> |
27 | <include name="UDPServer.cs" /> | 25 | <include name="UDPServer.cs" /> |
26 | <include name="UserConfigUtility.cs" /> | ||
27 | <include name="VersionInfo.cs" /> | ||
28 | <include name="Assets/AssetCache.cs" /> | 28 | <include name="Assets/AssetCache.cs" /> |
29 | <include name="Assets/InventoryCache.cs" /> | 29 | <include name="Assets/InventoryCache.cs" /> |
30 | </sources> | 30 | </sources> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj index 6bcf38a..285c5be 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj | |||
@@ -95,6 +95,9 @@ | |||
95 | <Compile Include="InterpreterLogic.cs"> | 95 | <Compile Include="InterpreterLogic.cs"> |
96 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
97 | </Compile> | 97 | </Compile> |
98 | <Compile Include="InterpreterMethods.cs"> | ||
99 | <SubType>Code</SubType> | ||
100 | </Compile> | ||
98 | <Compile Include="InterpreterReturn.cs"> | 101 | <Compile Include="InterpreterReturn.cs"> |
99 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
100 | </Compile> | 103 | </Compile> |
@@ -119,9 +122,6 @@ | |||
119 | <Compile Include="Thread.cs"> | 122 | <Compile Include="Thread.cs"> |
120 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
121 | </Compile> | 124 | </Compile> |
122 | <Compile Include="InterpreterMethods.cs"> | ||
123 | <SubType>Code</SubType> | ||
124 | </Compile> | ||
125 | <Compile Include="Properties\AssemblyInfo.cs"> | 125 | <Compile Include="Properties\AssemblyInfo.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build index 2ff51ef..4eff97b 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build | |||
@@ -16,6 +16,7 @@ | |||
16 | <include name="Heap.cs" /> | 16 | <include name="Heap.cs" /> |
17 | <include name="Interpreter.cs" /> | 17 | <include name="Interpreter.cs" /> |
18 | <include name="InterpreterLogic.cs" /> | 18 | <include name="InterpreterLogic.cs" /> |
19 | <include name="InterpreterMethods.cs" /> | ||
19 | <include name="InterpreterReturn.cs" /> | 20 | <include name="InterpreterReturn.cs" /> |
20 | <include name="MainMemory.cs" /> | 21 | <include name="MainMemory.cs" /> |
21 | <include name="MethodMemory.cs" /> | 22 | <include name="MethodMemory.cs" /> |
@@ -24,7 +25,6 @@ | |||
24 | <include name="Stack.cs" /> | 25 | <include name="Stack.cs" /> |
25 | <include name="StackFrame.cs" /> | 26 | <include name="StackFrame.cs" /> |
26 | <include name="Thread.cs" /> | 27 | <include name="Thread.cs" /> |
27 | <include name="InterpreterMethods.cs" /> | ||
28 | <include name="Properties/AssemblyInfo.cs" /> | 28 | <include name="Properties/AssemblyInfo.cs" /> |
29 | <include name="Types/ArrayReference.cs" /> | 29 | <include name="Types/ArrayReference.cs" /> |
30 | <include name="Types/BaseType.cs" /> | 30 | <include name="Types/BaseType.cs" /> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 6f92e76..15ae5bf 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj | |||
@@ -90,19 +90,19 @@ | |||
90 | </ProjectReference> | 90 | </ProjectReference> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
93 | <Compile Include="UUIDParcelQuery.cs"> | 93 | <Compile Include="AssemblyInfo.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="UUIDPrimQuery.cs"> | 96 | <Compile Include="Db4LocalStorage.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="Db4LocalStorage.cs"> | 99 | <Compile Include="MapStorage.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | <Compile Include="AssemblyInfo.cs"> | 102 | <Compile Include="UUIDParcelQuery.cs"> |
103 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
104 | </Compile> | 104 | </Compile> |
105 | <Compile Include="MapStorage.cs"> | 105 | <Compile Include="UUIDPrimQuery.cs"> |
106 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
107 | </Compile> | 107 | </Compile> |
108 | </ItemGroup> | 108 | </ItemGroup> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 7fb50c8..c2fd2bd 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build | |||
@@ -11,11 +11,11 @@ | |||
11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="UUIDParcelQuery.cs" /> | ||
15 | <include name="UUIDPrimQuery.cs" /> | ||
16 | <include name="Db4LocalStorage.cs" /> | ||
17 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="Db4LocalStorage.cs" /> | ||
18 | <include name="MapStorage.cs" /> | 16 | <include name="MapStorage.cs" /> |
17 | <include name="UUIDParcelQuery.cs" /> | ||
18 | <include name="UUIDPrimQuery.cs" /> | ||
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index df6b4f4..55efffa 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj | |||
@@ -83,6 +83,9 @@ | |||
83 | <Compile Include="Prebuild.cs"> | 83 | <Compile Include="Prebuild.cs"> |
84 | <SubType>Code</SubType> | 84 | <SubType>Code</SubType> |
85 | </Compile> | 85 | </Compile> |
86 | <Compile Include="Core\FatalException.cs"> | ||
87 | <SubType>Code</SubType> | ||
88 | </Compile> | ||
86 | <Compile Include="Core\Kernel.cs"> | 89 | <Compile Include="Core\Kernel.cs"> |
87 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
88 | </Compile> | 91 | </Compile> |
@@ -92,25 +95,19 @@ | |||
92 | <Compile Include="Core\WarningException.cs"> | 95 | <Compile Include="Core\WarningException.cs"> |
93 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
94 | </Compile> | 97 | </Compile> |
95 | <Compile Include="Core\FatalException.cs"> | 98 | <Compile Include="Core\Attributes\DataNodeAttribute.cs"> |
96 | <SubType>Code</SubType> | ||
97 | </Compile> | ||
98 | <Compile Include="Core\Interfaces\ITarget.cs"> | ||
99 | <SubType>Code</SubType> | ||
100 | </Compile> | ||
101 | <Compile Include="Core\Interfaces\IDataNode.cs"> | ||
102 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
103 | </Compile> | 100 | </Compile> |
104 | <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> | 101 | <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> |
105 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
106 | </Compile> | 103 | </Compile> |
107 | <Compile Include="Core\Attributes\DataNodeAttribute.cs"> | 104 | <Compile Include="Core\Attributes\TargetAttribute.cs"> |
108 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
109 | </Compile> | 106 | </Compile> |
110 | <Compile Include="Core\Attributes\TargetAttribute.cs"> | 107 | <Compile Include="Core\Interfaces\IDataNode.cs"> |
111 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
112 | </Compile> | 109 | </Compile> |
113 | <Compile Include="Core\Nodes\ProjectNode.cs"> | 110 | <Compile Include="Core\Interfaces\ITarget.cs"> |
114 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
115 | </Compile> | 112 | </Compile> |
116 | <Compile Include="Core\Nodes\ConfigurationNode.cs"> | 113 | <Compile Include="Core\Nodes\ConfigurationNode.cs"> |
@@ -122,73 +119,76 @@ | |||
122 | <Compile Include="Core\Nodes\ExcludeNode.cs"> | 119 | <Compile Include="Core\Nodes\ExcludeNode.cs"> |
123 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
124 | </Compile> | 121 | </Compile> |
125 | <Compile Include="Core\Nodes\OptionsNode.cs"> | 122 | <Compile Include="Core\Nodes\FileNode.cs"> |
126 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
127 | </Compile> | 124 | </Compile> |
128 | <Compile Include="Core\Nodes\ReferencePathNode.cs"> | 125 | <Compile Include="Core\Nodes\FilesNode.cs"> |
129 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
130 | </Compile> | 127 | </Compile> |
131 | <Compile Include="Core\Nodes\MatchNode.cs"> | 128 | <Compile Include="Core\Nodes\MatchNode.cs"> |
132 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
133 | </Compile> | 130 | </Compile> |
134 | <Compile Include="Core\Nodes\SolutionNode.cs"> | 131 | <Compile Include="Core\Nodes\OptionsNode.cs"> |
135 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
136 | </Compile> | 133 | </Compile> |
137 | <Compile Include="Core\Nodes\ProcessNode.cs"> | 134 | <Compile Include="Core\Nodes\ProcessNode.cs"> |
138 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
139 | </Compile> | 136 | </Compile> |
137 | <Compile Include="Core\Nodes\ProjectNode.cs"> | ||
138 | <SubType>Code</SubType> | ||
139 | </Compile> | ||
140 | <Compile Include="Core\Nodes\ReferenceNode.cs"> | 140 | <Compile Include="Core\Nodes\ReferenceNode.cs"> |
141 | <SubType>Code</SubType> | 141 | <SubType>Code</SubType> |
142 | </Compile> | 142 | </Compile> |
143 | <Compile Include="Core\Nodes\FileNode.cs"> | 143 | <Compile Include="Core\Nodes\ReferencePathNode.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | <Compile Include="Core\Nodes\FilesNode.cs"> | 146 | <Compile Include="Core\Nodes\SolutionNode.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="Core\Targets\DebugTarget.cs"> | 149 | <Compile Include="Core\Parse\IfContext.cs"> |
150 | <SubType>Code</SubType> | 150 | <SubType>Code</SubType> |
151 | </Compile> | 151 | </Compile> |
152 | <Compile Include="Core\Targets\MonoDevelopTarget.cs"> | 152 | <Compile Include="Core\Parse\Preprocessor.cs"> |
153 | <SubType>Code</SubType> | 153 | <SubType>Code</SubType> |
154 | </Compile> | 154 | </Compile> |
155 | <Compile Include="Core\Targets\AutotoolsTarget.cs"> | 155 | <Compile Include="Core\Targets\AutotoolsTarget.cs"> |
156 | <SubType>Code</SubType> | 156 | <SubType>Code</SubType> |
157 | </Compile> | 157 | </Compile> |
158 | <Compile Include="Core\Targets\SharpDevelopTarget.cs"> | 158 | <Compile Include="Core\Targets\DebugTarget.cs"> |
159 | <SubType>Code</SubType> | 159 | <SubType>Code</SubType> |
160 | </Compile> | 160 | </Compile> |
161 | <Compile Include="Core\Targets\VS2002Target.cs"> | 161 | <Compile Include="Core\Targets\MonoDevelopTarget.cs"> |
162 | <SubType>Code</SubType> | 162 | <SubType>Code</SubType> |
163 | </Compile> | 163 | </Compile> |
164 | <Compile Include="Core\Targets\VS2003Target.cs"> | 164 | <Compile Include="Core\Targets\NAntTarget.cs"> |
165 | <SubType>Code</SubType> | 165 | <SubType>Code</SubType> |
166 | </Compile> | 166 | </Compile> |
167 | <Compile Include="Core\Targets\SharpDevelop2Target.cs"> | 167 | <Compile Include="Core\Targets\SharpDevelop2Target.cs"> |
168 | <SubType>Code</SubType> | 168 | <SubType>Code</SubType> |
169 | </Compile> | 169 | </Compile> |
170 | <Compile Include="Core\Targets\VS2005Target.cs"> | 170 | <Compile Include="Core\Targets\SharpDevelopTarget.cs"> |
171 | <SubType>Code</SubType> | 171 | <SubType>Code</SubType> |
172 | </Compile> | 172 | </Compile> |
173 | <Compile Include="Core\Targets\NAntTarget.cs"> | 173 | <Compile Include="Core\Targets\VS2002Target.cs"> |
174 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
175 | </Compile> | 175 | </Compile> |
176 | <Compile Include="Core\Parse\IfContext.cs"> | 176 | <Compile Include="Core\Targets\VS2003Target.cs"> |
177 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
178 | </Compile> | 178 | </Compile> |
179 | <Compile Include="Core\Parse\Preprocessor.cs"> | 179 | <Compile Include="Core\Targets\VS2005Target.cs"> |
180 | <SubType>Code</SubType> | 180 | <SubType>Code</SubType> |
181 | </Compile> | 181 | </Compile> |
182 | <Compile Include="Core\Utilities\Helper.cs"> | 182 | <Compile Include="Core\Utilities\CommandLineCollection.cs"> |
183 | <SubType>Code</SubType> | 183 | <SubType>Code</SubType> |
184 | </Compile> | 184 | </Compile> |
185 | <Compile Include="Core\Utilities\Log.cs"> | 185 | <Compile Include="Core\Utilities\CurrentDirectory.cs"> |
186 | <SubType>Code</SubType> | 186 | <SubType>Code</SubType> |
187 | </Compile> | 187 | </Compile> |
188 | <Compile Include="Core\Utilities\CommandLineCollection.cs"> | 188 | <Compile Include="Core\Utilities\Helper.cs"> |
189 | <SubType>Code</SubType> | 189 | <SubType>Code</SubType> |
190 | </Compile> | 190 | </Compile> |
191 | <Compile Include="Core\Utilities\CurrentDirectory.cs"> | 191 | <Compile Include="Core\Utilities\Log.cs"> |
192 | <SubType>Code</SubType> | 192 | <SubType>Code</SubType> |
193 | </Compile> | 193 | </Compile> |
194 | <Compile Include="Properties\AssemblyInfo.cs"> | 194 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index f2c8cab..43f5516 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build | |||
@@ -14,42 +14,42 @@ | |||
14 | </resources> | 14 | </resources> |
15 | <sources failonempty="true"> | 15 | <sources failonempty="true"> |
16 | <include name="Prebuild.cs" /> | 16 | <include name="Prebuild.cs" /> |
17 | <include name="Core/FatalException.cs" /> | ||
17 | <include name="Core/Kernel.cs" /> | 18 | <include name="Core/Kernel.cs" /> |
18 | <include name="Core/UnknownLanguageException.cs" /> | 19 | <include name="Core/UnknownLanguageException.cs" /> |
19 | <include name="Core/WarningException.cs" /> | 20 | <include name="Core/WarningException.cs" /> |
20 | <include name="Core/FatalException.cs" /> | ||
21 | <include name="Core/Interfaces/ITarget.cs" /> | ||
22 | <include name="Core/Interfaces/IDataNode.cs" /> | ||
23 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | ||
24 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | 21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> |
22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | ||
25 | <include name="Core/Attributes/TargetAttribute.cs" /> | 23 | <include name="Core/Attributes/TargetAttribute.cs" /> |
26 | <include name="Core/Nodes/ProjectNode.cs" /> | 24 | <include name="Core/Interfaces/IDataNode.cs" /> |
25 | <include name="Core/Interfaces/ITarget.cs" /> | ||
27 | <include name="Core/Nodes/ConfigurationNode.cs" /> | 26 | <include name="Core/Nodes/ConfigurationNode.cs" /> |
28 | <include name="Core/Nodes/DataNode.cs" /> | 27 | <include name="Core/Nodes/DataNode.cs" /> |
29 | <include name="Core/Nodes/ExcludeNode.cs" /> | 28 | <include name="Core/Nodes/ExcludeNode.cs" /> |
30 | <include name="Core/Nodes/OptionsNode.cs" /> | 29 | <include name="Core/Nodes/FileNode.cs" /> |
31 | <include name="Core/Nodes/ReferencePathNode.cs" /> | 30 | <include name="Core/Nodes/FilesNode.cs" /> |
32 | <include name="Core/Nodes/MatchNode.cs" /> | 31 | <include name="Core/Nodes/MatchNode.cs" /> |
33 | <include name="Core/Nodes/SolutionNode.cs" /> | 32 | <include name="Core/Nodes/OptionsNode.cs" /> |
34 | <include name="Core/Nodes/ProcessNode.cs" /> | 33 | <include name="Core/Nodes/ProcessNode.cs" /> |
34 | <include name="Core/Nodes/ProjectNode.cs" /> | ||
35 | <include name="Core/Nodes/ReferenceNode.cs" /> | 35 | <include name="Core/Nodes/ReferenceNode.cs" /> |
36 | <include name="Core/Nodes/FileNode.cs" /> | 36 | <include name="Core/Nodes/ReferencePathNode.cs" /> |
37 | <include name="Core/Nodes/FilesNode.cs" /> | 37 | <include name="Core/Nodes/SolutionNode.cs" /> |
38 | <include name="Core/Parse/IfContext.cs" /> | ||
39 | <include name="Core/Parse/Preprocessor.cs" /> | ||
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | ||
38 | <include name="Core/Targets/DebugTarget.cs" /> | 41 | <include name="Core/Targets/DebugTarget.cs" /> |
39 | <include name="Core/Targets/MonoDevelopTarget.cs" /> | 42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> |
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | 43 | <include name="Core/Targets/NAntTarget.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | ||
41 | <include name="Core/Targets/SharpDevelopTarget.cs" /> | 45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> |
42 | <include name="Core/Targets/VS2002Target.cs" /> | 46 | <include name="Core/Targets/VS2002Target.cs" /> |
43 | <include name="Core/Targets/VS2003Target.cs" /> | 47 | <include name="Core/Targets/VS2003Target.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | ||
45 | <include name="Core/Targets/VS2005Target.cs" /> | 48 | <include name="Core/Targets/VS2005Target.cs" /> |
46 | <include name="Core/Targets/NAntTarget.cs" /> | ||
47 | <include name="Core/Parse/IfContext.cs" /> | ||
48 | <include name="Core/Parse/Preprocessor.cs" /> | ||
49 | <include name="Core/Utilities/Helper.cs" /> | ||
50 | <include name="Core/Utilities/Log.cs" /> | ||
51 | <include name="Core/Utilities/CommandLineCollection.cs" /> | 49 | <include name="Core/Utilities/CommandLineCollection.cs" /> |
52 | <include name="Core/Utilities/CurrentDirectory.cs" /> | 50 | <include name="Core/Utilities/CurrentDirectory.cs" /> |
51 | <include name="Core/Utilities/Helper.cs" /> | ||
52 | <include name="Core/Utilities/Log.cs" /> | ||
53 | <include name="Properties/AssemblyInfo.cs" /> | 53 | <include name="Properties/AssemblyInfo.cs" /> |
54 | </sources> | 54 | </sources> |
55 | <references basedir="${project::get-base-directory()}"> | 55 | <references basedir="${project::get-base-directory()}"> |