diff options
Diffstat (limited to 'OpenSim/Region')
14 files changed, 73 insertions, 73 deletions
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj index bec85cc..13619eb 100644 --- a/OpenSim/Region/Application/OpenSim.csproj +++ b/OpenSim/Region/Application/OpenSim.csproj | |||
@@ -170,15 +170,15 @@ | |||
170 | </ProjectReference> | 170 | </ProjectReference> |
171 | </ItemGroup> | 171 | </ItemGroup> |
172 | <ItemGroup> | 172 | <ItemGroup> |
173 | <Compile Include="Application.cs"> | ||
174 | <SubType>Code</SubType> | ||
175 | </Compile> | ||
176 | <Compile Include="OpenSimMain.cs"> | 173 | <Compile Include="OpenSimMain.cs"> |
177 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
178 | </Compile> | 175 | </Compile> |
179 | <Compile Include="VersionInfo.cs"> | 176 | <Compile Include="VersionInfo.cs"> |
180 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
181 | </Compile> | 178 | </Compile> |
179 | <Compile Include="Application.cs"> | ||
180 | <SubType>Code</SubType> | ||
181 | </Compile> | ||
182 | </ItemGroup> | 182 | </ItemGroup> |
183 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 183 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
184 | <PropertyGroup> | 184 | <PropertyGroup> |
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build index 6c7d7ac..355092b 100644 --- a/OpenSim/Region/Application/OpenSim.exe.build +++ b/OpenSim/Region/Application/OpenSim.exe.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenSim" dynamicprefix="true" > | 11 | <resources prefix="OpenSim" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Application.cs" /> | ||
15 | <include name="OpenSimMain.cs" /> | 14 | <include name="OpenSimMain.cs" /> |
16 | <include name="VersionInfo.cs" /> | 15 | <include name="VersionInfo.cs" /> |
16 | <include name="Application.cs" /> | ||
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj index 4667d52..1ed28d2 100644 --- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj +++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj | |||
@@ -96,40 +96,40 @@ | |||
96 | </ProjectReference> | 96 | </ProjectReference> |
97 | </ItemGroup> | 97 | </ItemGroup> |
98 | <ItemGroup> | 98 | <ItemGroup> |
99 | <Compile Include="Caps.cs"> | 99 | <Compile Include="LLSDCapsDetails.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | <Compile Include="LLSDArray.cs"> | 102 | <Compile Include="LLSDArray.cs"> |
103 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
104 | </Compile> | 104 | </Compile> |
105 | <Compile Include="LLSDCapEvent.cs"> | 105 | <Compile Include="LLSDEmpty.cs"> |
106 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
107 | </Compile> | 107 | </Compile> |
108 | <Compile Include="LLSDCapsDetails.cs"> | 108 | <Compile Include="LLSDTest.cs"> |
109 | <SubType>Code</SubType> | 109 | <SubType>Code</SubType> |
110 | </Compile> | 110 | </Compile> |
111 | <Compile Include="LLSDEmpty.cs"> | 111 | <Compile Include="LLSDUploadReply.cs"> |
112 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
113 | </Compile> | 113 | </Compile> |
114 | <Compile Include="LLSDHelpers.cs"> | 114 | <Compile Include="LLSDType.cs"> |
115 | <SubType>Code</SubType> | 115 | <SubType>Code</SubType> |
116 | </Compile> | 116 | </Compile> |
117 | <Compile Include="LLSDMapLayer.cs"> | 117 | <Compile Include="LLSDHelpers.cs"> |
118 | <SubType>Code</SubType> | 118 | <SubType>Code</SubType> |
119 | </Compile> | 119 | </Compile> |
120 | <Compile Include="LLSDMapLayerResponse.cs"> | 120 | <Compile Include="LLSDCapEvent.cs"> |
121 | <SubType>Code</SubType> | 121 | <SubType>Code</SubType> |
122 | </Compile> | 122 | </Compile> |
123 | <Compile Include="LLSDMapRequest.cs"> | 123 | <Compile Include="LLSDMapRequest.cs"> |
124 | <SubType>Code</SubType> | 124 | <SubType>Code</SubType> |
125 | </Compile> | 125 | </Compile> |
126 | <Compile Include="LLSDTest.cs"> | 126 | <Compile Include="Caps.cs"> |
127 | <SubType>Code</SubType> | 127 | <SubType>Code</SubType> |
128 | </Compile> | 128 | </Compile> |
129 | <Compile Include="LLSDType.cs"> | 129 | <Compile Include="LLSDMapLayerResponse.cs"> |
130 | <SubType>Code</SubType> | 130 | <SubType>Code</SubType> |
131 | </Compile> | 131 | </Compile> |
132 | <Compile Include="LLSDUploadReply.cs"> | 132 | <Compile Include="LLSDMapLayer.cs"> |
133 | <SubType>Code</SubType> | 133 | <SubType>Code</SubType> |
134 | </Compile> | 134 | </Compile> |
135 | </ItemGroup> | 135 | </ItemGroup> |
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build index a091b5c..dd853e7 100644 --- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build +++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build | |||
@@ -11,18 +11,18 @@ | |||
11 | <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Caps.cs" /> | ||
15 | <include name="LLSDArray.cs" /> | ||
16 | <include name="LLSDCapEvent.cs" /> | ||
17 | <include name="LLSDCapsDetails.cs" /> | 14 | <include name="LLSDCapsDetails.cs" /> |
15 | <include name="LLSDArray.cs" /> | ||
18 | <include name="LLSDEmpty.cs" /> | 16 | <include name="LLSDEmpty.cs" /> |
19 | <include name="LLSDHelpers.cs" /> | ||
20 | <include name="LLSDMapLayer.cs" /> | ||
21 | <include name="LLSDMapLayerResponse.cs" /> | ||
22 | <include name="LLSDMapRequest.cs" /> | ||
23 | <include name="LLSDTest.cs" /> | 17 | <include name="LLSDTest.cs" /> |
24 | <include name="LLSDType.cs" /> | ||
25 | <include name="LLSDUploadReply.cs" /> | 18 | <include name="LLSDUploadReply.cs" /> |
19 | <include name="LLSDType.cs" /> | ||
20 | <include name="LLSDHelpers.cs" /> | ||
21 | <include name="LLSDCapEvent.cs" /> | ||
22 | <include name="LLSDMapRequest.cs" /> | ||
23 | <include name="Caps.cs" /> | ||
24 | <include name="LLSDMapLayerResponse.cs" /> | ||
25 | <include name="LLSDMapLayer.cs" /> | ||
26 | </sources> | 26 | </sources> |
27 | <references basedir="${project::get-base-directory()}"> | 27 | <references basedir="${project::get-base-directory()}"> |
28 | <lib> | 28 | <lib> |
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj index 3093eb0..2e1d8e2 100644 --- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj | |||
@@ -122,34 +122,34 @@ | |||
122 | </ProjectReference> | 122 | </ProjectReference> |
123 | </ItemGroup> | 123 | </ItemGroup> |
124 | <ItemGroup> | 124 | <ItemGroup> |
125 | <Compile Include="ClientStackNetworkHandler.cs"> | 125 | <Compile Include="ClientView.AgentAssetUpload.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="ClientView.AgentAssetUpload.cs"> | 128 | <Compile Include="ClientStackNetworkHandler.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="ClientView.API.cs"> | 131 | <Compile Include="PacketServer.cs"> |
132 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
133 | </Compile> | 133 | </Compile> |
134 | <Compile Include="ClientView.cs"> | 134 | <Compile Include="UDPServer.cs"> |
135 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
136 | </Compile> | 136 | </Compile> |
137 | <Compile Include="ClientView.PacketHandlers.cs"> | 137 | <Compile Include="ClientView.PacketHandlers.cs"> |
138 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
139 | </Compile> | 139 | </Compile> |
140 | <Compile Include="ClientView.ProcessPackets.cs"> | 140 | <Compile Include="ClientView.API.cs"> |
141 | <SubType>Code</SubType> | 141 | <SubType>Code</SubType> |
142 | </Compile> | 142 | </Compile> |
143 | <Compile Include="ClientViewBase.cs"> | 143 | <Compile Include="ClientView.ProcessPackets.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | <Compile Include="PacketServer.cs"> | 146 | <Compile Include="RegionApplicationBase.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="RegionApplicationBase.cs"> | 149 | <Compile Include="ClientViewBase.cs"> |
150 | <SubType>Code</SubType> | 150 | <SubType>Code</SubType> |
151 | </Compile> | 151 | </Compile> |
152 | <Compile Include="UDPServer.cs"> | 152 | <Compile Include="ClientView.cs"> |
153 | <SubType>Code</SubType> | 153 | <SubType>Code</SubType> |
154 | </Compile> | 154 | </Compile> |
155 | <Compile Include="Assets\InventoryCache.cs"> | 155 | <Compile Include="Assets\InventoryCache.cs"> |
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build index f76a4c8..1c791d3 100644 --- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build | |||
@@ -11,16 +11,16 @@ | |||
11 | <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ClientStackNetworkHandler.cs" /> | ||
15 | <include name="ClientView.AgentAssetUpload.cs" /> | 14 | <include name="ClientView.AgentAssetUpload.cs" /> |
16 | <include name="ClientView.API.cs" /> | 15 | <include name="ClientStackNetworkHandler.cs" /> |
17 | <include name="ClientView.cs" /> | 16 | <include name="PacketServer.cs" /> |
17 | <include name="UDPServer.cs" /> | ||
18 | <include name="ClientView.PacketHandlers.cs" /> | 18 | <include name="ClientView.PacketHandlers.cs" /> |
19 | <include name="ClientView.API.cs" /> | ||
19 | <include name="ClientView.ProcessPackets.cs" /> | 20 | <include name="ClientView.ProcessPackets.cs" /> |
20 | <include name="ClientViewBase.cs" /> | ||
21 | <include name="PacketServer.cs" /> | ||
22 | <include name="RegionApplicationBase.cs" /> | 21 | <include name="RegionApplicationBase.cs" /> |
23 | <include name="UDPServer.cs" /> | 22 | <include name="ClientViewBase.cs" /> |
23 | <include name="ClientView.cs" /> | ||
24 | <include name="Assets/InventoryCache.cs" /> | 24 | <include name="Assets/InventoryCache.cs" /> |
25 | </sources> | 25 | </sources> |
26 | <references basedir="${project::get-base-directory()}"> | 26 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj index 0a15a49..f9f6b7d 100644 --- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj | |||
@@ -98,13 +98,13 @@ | |||
98 | </ProjectReference> | 98 | </ProjectReference> |
99 | </ItemGroup> | 99 | </ItemGroup> |
100 | <ItemGroup> | 100 | <ItemGroup> |
101 | <Compile Include="CommunicationsLocal.cs"> | 101 | <Compile Include="LocalUserServices.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | <Compile Include="LocalBackEndServices.cs"> | 104 | <Compile Include="CommunicationsLocal.cs"> |
105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
106 | </Compile> | 106 | </Compile> |
107 | <Compile Include="LocalUserServices.cs"> | 107 | <Compile Include="LocalBackEndServices.cs"> |
108 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
109 | </Compile> | 109 | </Compile> |
110 | <Compile Include="Properties\AssemblyInfo.cs"> | 110 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build index 3cac9d3..bfefabf 100644 --- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="LocalUserServices.cs" /> | ||
14 | <include name="CommunicationsLocal.cs" /> | 15 | <include name="CommunicationsLocal.cs" /> |
15 | <include name="LocalBackEndServices.cs" /> | 16 | <include name="LocalBackEndServices.cs" /> |
16 | <include name="LocalUserServices.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/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj index d6abd13..90a01b6 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj | |||
@@ -116,6 +116,9 @@ | |||
116 | </ProjectReference> | 116 | </ProjectReference> |
117 | </ItemGroup> | 117 | </ItemGroup> |
118 | <ItemGroup> | 118 | <ItemGroup> |
119 | <Compile Include="OGS1UserServices.cs"> | ||
120 | <SubType>Code</SubType> | ||
121 | </Compile> | ||
119 | <Compile Include="CommunicationsOGS1.cs"> | 122 | <Compile Include="CommunicationsOGS1.cs"> |
120 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
121 | </Compile> | 124 | </Compile> |
@@ -125,9 +128,6 @@ | |||
125 | <Compile Include="OGS1InterSimComms.cs"> | 128 | <Compile Include="OGS1InterSimComms.cs"> |
126 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
127 | </Compile> | 130 | </Compile> |
128 | <Compile Include="OGS1UserServices.cs"> | ||
129 | <SubType>Code</SubType> | ||
130 | </Compile> | ||
131 | <Compile Include="Properties\AssemblyInfo.cs"> | 131 | <Compile Include="Properties\AssemblyInfo.cs"> |
132 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
133 | </Compile> | 133 | </Compile> |
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build index 04d61b9..960a84a 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build | |||
@@ -11,10 +11,10 @@ | |||
11 | <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="OGS1UserServices.cs" /> | ||
14 | <include name="CommunicationsOGS1.cs" /> | 15 | <include name="CommunicationsOGS1.cs" /> |
15 | <include name="OGS1GridServices.cs" /> | 16 | <include name="OGS1GridServices.cs" /> |
16 | <include name="OGS1InterSimComms.cs" /> | 17 | <include name="OGS1InterSimComms.cs" /> |
17 | <include name="OGS1UserServices.cs" /> | ||
18 | <include name="Properties/AssemblyInfo.cs" /> | 18 | <include name="Properties/AssemblyInfo.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj index 428f381..6dabd05 100644 --- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj | |||
@@ -144,55 +144,55 @@ | |||
144 | </ProjectReference> | 144 | </ProjectReference> |
145 | </ItemGroup> | 145 | </ItemGroup> |
146 | <ItemGroup> | 146 | <ItemGroup> |
147 | <Compile Include="EstateManager.cs"> | 147 | <Compile Include="RegionManager.cs"> |
148 | <SubType>Code</SubType> | 148 | <SubType>Code</SubType> |
149 | </Compile> | 149 | </Compile> |
150 | <Compile Include="ParcelManager.cs"> | 150 | <Compile Include="EstateManager.cs"> |
151 | <SubType>Code</SubType> | 151 | <SubType>Code</SubType> |
152 | </Compile> | 152 | </Compile> |
153 | <Compile Include="RegionManager.cs"> | 153 | <Compile Include="ParcelManager.cs"> |
154 | <SubType>Code</SubType> | 154 | <SubType>Code</SubType> |
155 | </Compile> | 155 | </Compile> |
156 | <Compile Include="Scenes\Entity.cs"> | 156 | <Compile Include="Scenes\Entity.cs"> |
157 | <SubType>Code</SubType> | 157 | <SubType>Code</SubType> |
158 | </Compile> | 158 | </Compile> |
159 | <Compile Include="Scenes\IScenePresenceBody.cs"> | 159 | <Compile Include="Scenes\Scene.cs"> |
160 | <SubType>Code</SubType> | 160 | <SubType>Code</SubType> |
161 | </Compile> | 161 | </Compile> |
162 | <Compile Include="Scenes\Primitive.cs"> | 162 | <Compile Include="Scenes\ScenePresence.Body.cs"> |
163 | <SubType>Code</SubType> | 163 | <SubType>Code</SubType> |
164 | </Compile> | 164 | </Compile> |
165 | <Compile Include="Scenes\Scene.cs"> | 165 | <Compile Include="Scenes\SceneEvents.cs"> |
166 | <SubType>Code</SubType> | 166 | <SubType>Code</SubType> |
167 | </Compile> | 167 | </Compile> |
168 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> | 168 | <Compile Include="Scenes\ScenePresence.cs"> |
169 | <SubType>Code</SubType> | 169 | <SubType>Code</SubType> |
170 | </Compile> | 170 | </Compile> |
171 | <Compile Include="Scenes\SceneBase.cs"> | 171 | <Compile Include="Scenes\ScenePresence.Animations.cs"> |
172 | <SubType>Code</SubType> | 172 | <SubType>Code</SubType> |
173 | </Compile> | 173 | </Compile> |
174 | <Compile Include="Scenes\SceneEvents.cs"> | 174 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> |
175 | <SubType>Code</SubType> | 175 | <SubType>Code</SubType> |
176 | </Compile> | 176 | </Compile> |
177 | <Compile Include="Scenes\SceneObject.cs"> | 177 | <Compile Include="Scenes\SceneObject.cs"> |
178 | <SubType>Code</SubType> | 178 | <SubType>Code</SubType> |
179 | </Compile> | 179 | </Compile> |
180 | <Compile Include="Scenes\ScenePresence.Animations.cs"> | 180 | <Compile Include="Scenes\Primitive.cs"> |
181 | <SubType>Code</SubType> | 181 | <SubType>Code</SubType> |
182 | </Compile> | 182 | </Compile> |
183 | <Compile Include="Scenes\ScenePresence.Body.cs"> | 183 | <Compile Include="Scenes\SceneBase.cs"> |
184 | <SubType>Code</SubType> | 184 | <SubType>Code</SubType> |
185 | </Compile> | 185 | </Compile> |
186 | <Compile Include="Scenes\ScenePresence.cs"> | 186 | <Compile Include="Scenes\IScenePresenceBody.cs"> |
187 | <SubType>Code</SubType> | 187 | <SubType>Code</SubType> |
188 | </Compile> | 188 | </Compile> |
189 | <Compile Include="Scenes\scripting\Script.cs"> | 189 | <Compile Include="Scenes\scripting\ScriptManager.cs"> |
190 | <SubType>Code</SubType> | 190 | <SubType>Code</SubType> |
191 | </Compile> | 191 | </Compile> |
192 | <Compile Include="Scenes\scripting\ScriptInfo.cs"> | 192 | <Compile Include="Scenes\scripting\ScriptInfo.cs"> |
193 | <SubType>Code</SubType> | 193 | <SubType>Code</SubType> |
194 | </Compile> | 194 | </Compile> |
195 | <Compile Include="Scenes\scripting\ScriptManager.cs"> | 195 | <Compile Include="Scenes\scripting\Script.cs"> |
196 | <SubType>Code</SubType> | 196 | <SubType>Code</SubType> |
197 | </Compile> | 197 | </Compile> |
198 | <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs"> | 198 | <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs"> |
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build index 2fa5e76..eb26ea0 100644 --- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build | |||
@@ -11,23 +11,23 @@ | |||
11 | <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="RegionManager.cs" /> | ||
14 | <include name="EstateManager.cs" /> | 15 | <include name="EstateManager.cs" /> |
15 | <include name="ParcelManager.cs" /> | 16 | <include name="ParcelManager.cs" /> |
16 | <include name="RegionManager.cs" /> | ||
17 | <include name="Scenes/Entity.cs" /> | 17 | <include name="Scenes/Entity.cs" /> |
18 | <include name="Scenes/IScenePresenceBody.cs" /> | ||
19 | <include name="Scenes/Primitive.cs" /> | ||
20 | <include name="Scenes/Scene.cs" /> | 18 | <include name="Scenes/Scene.cs" /> |
21 | <include name="Scenes/Scene.PacketHandlers.cs" /> | ||
22 | <include name="Scenes/SceneBase.cs" /> | ||
23 | <include name="Scenes/SceneEvents.cs" /> | ||
24 | <include name="Scenes/SceneObject.cs" /> | ||
25 | <include name="Scenes/ScenePresence.Animations.cs" /> | ||
26 | <include name="Scenes/ScenePresence.Body.cs" /> | 19 | <include name="Scenes/ScenePresence.Body.cs" /> |
20 | <include name="Scenes/SceneEvents.cs" /> | ||
27 | <include name="Scenes/ScenePresence.cs" /> | 21 | <include name="Scenes/ScenePresence.cs" /> |
28 | <include name="Scenes/scripting/Script.cs" /> | 22 | <include name="Scenes/ScenePresence.Animations.cs" /> |
29 | <include name="Scenes/scripting/ScriptInfo.cs" /> | 23 | <include name="Scenes/Scene.PacketHandlers.cs" /> |
24 | <include name="Scenes/SceneObject.cs" /> | ||
25 | <include name="Scenes/Primitive.cs" /> | ||
26 | <include name="Scenes/SceneBase.cs" /> | ||
27 | <include name="Scenes/IScenePresenceBody.cs" /> | ||
30 | <include name="Scenes/scripting/ScriptManager.cs" /> | 28 | <include name="Scenes/scripting/ScriptManager.cs" /> |
29 | <include name="Scenes/scripting/ScriptInfo.cs" /> | ||
30 | <include name="Scenes/scripting/Script.cs" /> | ||
31 | <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" /> | 31 | <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" /> |
32 | <include name="Scenes/scripting/Engines/JScriptEngine.cs" /> | 32 | <include name="Scenes/scripting/Engines/JScriptEngine.cs" /> |
33 | </sources> | 33 | </sources> |
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj index 147158c..716fd57 100644 --- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj | |||
@@ -93,9 +93,6 @@ | |||
93 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="AssemblyInfo.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="Db4LocalStorage.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
99 | <Compile Include="MapStorage.cs"> | 96 | <Compile Include="MapStorage.cs"> |
100 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
101 | </Compile> | 98 | </Compile> |
@@ -105,6 +102,9 @@ | |||
105 | <Compile Include="UUIDPrimQuery.cs"> | 102 | <Compile Include="UUIDPrimQuery.cs"> |
106 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
107 | </Compile> | 104 | </Compile> |
105 | <Compile Include="Db4LocalStorage.cs"> | ||
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
108 | </ItemGroup> | 108 | </ItemGroup> |
109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
110 | <PropertyGroup> | 110 | <PropertyGroup> |
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build index fc9f055..112ff1c 100644 --- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build | |||
@@ -12,10 +12,10 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="Db4LocalStorage.cs" /> | ||
16 | <include name="MapStorage.cs" /> | 15 | <include name="MapStorage.cs" /> |
17 | <include name="UUIDParcelQuery.cs" /> | 16 | <include name="UUIDParcelQuery.cs" /> |
18 | <include name="UUIDPrimQuery.cs" /> | 17 | <include name="UUIDPrimQuery.cs" /> |
18 | <include name="Db4LocalStorage.cs" /> | ||
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |