diff options
Diffstat (limited to 'OpenSim')
8 files changed, 113 insertions, 117 deletions
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 256d3e1..9161a4e 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -124,10 +124,10 @@ | |||
124 | </ProjectReference> | 124 | </ProjectReference> |
125 | </ItemGroup> | 125 | </ItemGroup> |
126 | <ItemGroup> | 126 | <ItemGroup> |
127 | <Compile Include="AgentAssetUpload.cs"> | 127 | <Compile Include="OpenSimMain.cs"> |
128 | <SubType>Code</SubType> | 128 | <SubType>Code</SubType> |
129 | </Compile> | 129 | </Compile> |
130 | <Compile Include="AuthenticateSessionsBase.cs"> | 130 | <Compile Include="UDPServer.cs"> |
131 | <SubType>Code</SubType> | 131 | <SubType>Code</SubType> |
132 | </Compile> | 132 | </Compile> |
133 | <Compile Include="AuthenticateSessionsLocal.cs"> | 133 | <Compile Include="AuthenticateSessionsLocal.cs"> |
@@ -136,28 +136,16 @@ | |||
136 | <Compile Include="AuthenticateSessionsRemote.cs"> | 136 | <Compile Include="AuthenticateSessionsRemote.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="ClientView.cs"> | 139 | <Compile Include="OpenSimNetworkHandler.cs"> |
140 | <SubType>Code</SubType> | ||
141 | </Compile> | ||
142 | <Compile Include="ClientView.Grid.cs"> | ||
143 | <SubType>Code</SubType> | ||
144 | </Compile> | ||
145 | <Compile Include="ClientView.PacketHandlers.cs"> | ||
146 | <SubType>Code</SubType> | ||
147 | </Compile> | ||
148 | <Compile Include="ClientView.ProcessPackets.cs"> | ||
149 | <SubType>Code</SubType> | ||
150 | </Compile> | ||
151 | <Compile Include="ClientViewBase.cs"> | ||
152 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
153 | </Compile> | 141 | </Compile> |
154 | <Compile Include="Grid.cs"> | 142 | <Compile Include="Grid.cs"> |
155 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
156 | </Compile> | 144 | </Compile> |
157 | <Compile Include="OpenSimMain.cs"> | 145 | <Compile Include="RegionInfoBase.cs"> |
158 | <SubType>Code</SubType> | 146 | <SubType>Code</SubType> |
159 | </Compile> | 147 | </Compile> |
160 | <Compile Include="OpenSimNetworkHandler.cs"> | 148 | <Compile Include="ClientView.Grid.cs"> |
161 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
162 | </Compile> | 150 | </Compile> |
163 | <Compile Include="PacketServer.cs"> | 151 | <Compile Include="PacketServer.cs"> |
@@ -166,55 +154,55 @@ | |||
166 | <Compile Include="RegionInfo.cs"> | 154 | <Compile Include="RegionInfo.cs"> |
167 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
168 | </Compile> | 156 | </Compile> |
169 | <Compile Include="RegionInfoBase.cs"> | 157 | <Compile Include="ClientView.PacketHandlers.cs"> |
170 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
171 | </Compile> | 159 | </Compile> |
172 | <Compile Include="RegionServerBase.cs"> | 160 | <Compile Include="AuthenticateSessionsBase.cs"> |
173 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
174 | </Compile> | 162 | </Compile> |
175 | <Compile Include="UDPServer.cs"> | 163 | <Compile Include="ClientView.ProcessPackets.cs"> |
176 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
177 | </Compile> | 165 | </Compile> |
178 | <Compile Include="VersionInfo.cs"> | 166 | <Compile Include="VersionInfo.cs"> |
179 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
180 | </Compile> | 168 | </Compile> |
181 | <Compile Include="Assets\AssetCache.cs"> | 169 | <Compile Include="AgentAssetUpload.cs"> |
182 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
183 | </Compile> | 171 | </Compile> |
184 | <Compile Include="Assets\InventoryCache.cs"> | 172 | <Compile Include="ClientViewBase.cs"> |
185 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
186 | </Compile> | 174 | </Compile> |
187 | <Compile Include="CAPS\AdminWebFront.cs"> | 175 | <Compile Include="RegionServerBase.cs"> |
188 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
189 | </Compile> | 177 | </Compile> |
190 | <Compile Include="types\Mesh.cs"> | 178 | <Compile Include="ClientView.cs"> |
191 | <SubType>Code</SubType> | 179 | <SubType>Code</SubType> |
192 | </Compile> | 180 | </Compile> |
193 | <Compile Include="types\Triangle.cs"> | 181 | <Compile Include="CAPS\AdminWebFront.cs"> |
194 | <SubType>Code</SubType> | 182 | <SubType>Code</SubType> |
195 | </Compile> | 183 | </Compile> |
196 | <Compile Include="world\Avatar.Client.cs"> | 184 | <Compile Include="world\Avatar.Client.cs"> |
197 | <SubType>Code</SubType> | 185 | <SubType>Code</SubType> |
198 | </Compile> | 186 | </Compile> |
199 | <Compile Include="world\Avatar.cs"> | 187 | <Compile Include="world\Entity.cs"> |
200 | <SubType>Code</SubType> | 188 | <SubType>Code</SubType> |
201 | </Compile> | 189 | </Compile> |
202 | <Compile Include="world\Avatar.Update.cs"> | 190 | <Compile Include="world\Avatar.cs"> |
203 | <SubType>Code</SubType> | 191 | <SubType>Code</SubType> |
204 | </Compile> | 192 | </Compile> |
205 | <Compile Include="world\AvatarAnimations.cs"> | 193 | <Compile Include="world\World.PacketHandlers.cs"> |
206 | <SubType>Code</SubType> | 194 | <SubType>Code</SubType> |
207 | </Compile> | 195 | </Compile> |
208 | <Compile Include="world\Entity.cs"> | 196 | <Compile Include="world\Avatar.Update.cs"> |
209 | <SubType>Code</SubType> | 197 | <SubType>Code</SubType> |
210 | </Compile> | 198 | </Compile> |
211 | <Compile Include="world\ParcelManager.cs"> | 199 | <Compile Include="world\AvatarAnimations.cs"> |
212 | <SubType>Code</SubType> | 200 | <SubType>Code</SubType> |
213 | </Compile> | 201 | </Compile> |
214 | <Compile Include="world\Primitive.cs"> | 202 | <Compile Include="world\ParcelManager.cs"> |
215 | <SubType>Code</SubType> | 203 | <SubType>Code</SubType> |
216 | </Compile> | 204 | </Compile> |
217 | <Compile Include="world\Primitive2.cs"> | 205 | <Compile Include="world\WorldBase.cs"> |
218 | <SubType>Code</SubType> | 206 | <SubType>Code</SubType> |
219 | </Compile> | 207 | </Compile> |
220 | <Compile Include="world\SceneObject.cs"> | 208 | <Compile Include="world\SceneObject.cs"> |
@@ -223,33 +211,45 @@ | |||
223 | <Compile Include="world\World.cs"> | 211 | <Compile Include="world\World.cs"> |
224 | <SubType>Code</SubType> | 212 | <SubType>Code</SubType> |
225 | </Compile> | 213 | </Compile> |
226 | <Compile Include="world\World.PacketHandlers.cs"> | 214 | <Compile Include="world\Primitive.cs"> |
227 | <SubType>Code</SubType> | 215 | <SubType>Code</SubType> |
228 | </Compile> | 216 | </Compile> |
229 | <Compile Include="world\World.Scripting.cs"> | 217 | <Compile Include="world\World.Scripting.cs"> |
230 | <SubType>Code</SubType> | 218 | <SubType>Code</SubType> |
231 | </Compile> | 219 | </Compile> |
232 | <Compile Include="world\WorldBase.cs"> | 220 | <Compile Include="world\Primitive2.cs"> |
233 | <SubType>Code</SubType> | 221 | <SubType>Code</SubType> |
234 | </Compile> | 222 | </Compile> |
235 | <Compile Include="world\scripting\IScriptContext.cs"> | 223 | <Compile Include="world\scripting\IScriptHandler.cs"> |
236 | <SubType>Code</SubType> | 224 | <SubType>Code</SubType> |
237 | </Compile> | 225 | </Compile> |
238 | <Compile Include="world\scripting\IScriptEntity.cs"> | 226 | <Compile Include="world\scripting\ScriptFactory.cs"> |
239 | <SubType>Code</SubType> | 227 | <SubType>Code</SubType> |
240 | </Compile> | 228 | </Compile> |
241 | <Compile Include="world\scripting\IScriptHandler.cs"> | 229 | <Compile Include="world\scripting\IScriptContext.cs"> |
242 | <SubType>Code</SubType> | 230 | <SubType>Code</SubType> |
243 | </Compile> | 231 | </Compile> |
244 | <Compile Include="world\scripting\Script.cs"> | 232 | <Compile Include="world\scripting\Script.cs"> |
245 | <SubType>Code</SubType> | 233 | <SubType>Code</SubType> |
246 | </Compile> | 234 | </Compile> |
247 | <Compile Include="world\scripting\ScriptFactory.cs"> | 235 | <Compile Include="world\scripting\IScriptEntity.cs"> |
248 | <SubType>Code</SubType> | 236 | <SubType>Code</SubType> |
249 | </Compile> | 237 | </Compile> |
250 | <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs"> | 238 | <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs"> |
251 | <SubType>Code</SubType> | 239 | <SubType>Code</SubType> |
252 | </Compile> | 240 | </Compile> |
241 | <Compile Include="Assets\InventoryCache.cs"> | ||
242 | <SubType>Code</SubType> | ||
243 | </Compile> | ||
244 | <Compile Include="Assets\AssetCache.cs"> | ||
245 | <SubType>Code</SubType> | ||
246 | </Compile> | ||
247 | <Compile Include="types\Mesh.cs"> | ||
248 | <SubType>Code</SubType> | ||
249 | </Compile> | ||
250 | <Compile Include="types\Triangle.cs"> | ||
251 | <SubType>Code</SubType> | ||
252 | </Compile> | ||
253 | </ItemGroup> | 253 | </ItemGroup> |
254 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 254 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
255 | <PropertyGroup> | 255 | <PropertyGroup> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 25bbf07..bbd63f1 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -11,48 +11,48 @@ | |||
11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentAssetUpload.cs" /> | 14 | <include name="OpenSimMain.cs" /> |
15 | <include name="AuthenticateSessionsBase.cs" /> | 15 | <include name="UDPServer.cs" /> |
16 | <include name="AuthenticateSessionsLocal.cs" /> | 16 | <include name="AuthenticateSessionsLocal.cs" /> |
17 | <include name="AuthenticateSessionsRemote.cs" /> | 17 | <include name="AuthenticateSessionsRemote.cs" /> |
18 | <include name="ClientView.cs" /> | 18 | <include name="OpenSimNetworkHandler.cs" /> |
19 | <include name="Grid.cs" /> | ||
20 | <include name="RegionInfoBase.cs" /> | ||
19 | <include name="ClientView.Grid.cs" /> | 21 | <include name="ClientView.Grid.cs" /> |
22 | <include name="PacketServer.cs" /> | ||
23 | <include name="RegionInfo.cs" /> | ||
20 | <include name="ClientView.PacketHandlers.cs" /> | 24 | <include name="ClientView.PacketHandlers.cs" /> |
25 | <include name="AuthenticateSessionsBase.cs" /> | ||
21 | <include name="ClientView.ProcessPackets.cs" /> | 26 | <include name="ClientView.ProcessPackets.cs" /> |
27 | <include name="VersionInfo.cs" /> | ||
28 | <include name="AgentAssetUpload.cs" /> | ||
22 | <include name="ClientViewBase.cs" /> | 29 | <include name="ClientViewBase.cs" /> |
23 | <include name="Grid.cs" /> | ||
24 | <include name="OpenSimMain.cs" /> | ||
25 | <include name="OpenSimNetworkHandler.cs" /> | ||
26 | <include name="PacketServer.cs" /> | ||
27 | <include name="RegionInfo.cs" /> | ||
28 | <include name="RegionInfoBase.cs" /> | ||
29 | <include name="RegionServerBase.cs" /> | 30 | <include name="RegionServerBase.cs" /> |
30 | <include name="UDPServer.cs" /> | 31 | <include name="ClientView.cs" /> |
31 | <include name="VersionInfo.cs" /> | ||
32 | <include name="Assets/AssetCache.cs" /> | ||
33 | <include name="Assets/InventoryCache.cs" /> | ||
34 | <include name="CAPS/AdminWebFront.cs" /> | 32 | <include name="CAPS/AdminWebFront.cs" /> |
35 | <include name="types/Mesh.cs" /> | ||
36 | <include name="types/Triangle.cs" /> | ||
37 | <include name="world/Avatar.Client.cs" /> | 33 | <include name="world/Avatar.Client.cs" /> |
34 | <include name="world/Entity.cs" /> | ||
38 | <include name="world/Avatar.cs" /> | 35 | <include name="world/Avatar.cs" /> |
36 | <include name="world/World.PacketHandlers.cs" /> | ||
39 | <include name="world/Avatar.Update.cs" /> | 37 | <include name="world/Avatar.Update.cs" /> |
40 | <include name="world/AvatarAnimations.cs" /> | 38 | <include name="world/AvatarAnimations.cs" /> |
41 | <include name="world/Entity.cs" /> | ||
42 | <include name="world/ParcelManager.cs" /> | 39 | <include name="world/ParcelManager.cs" /> |
43 | <include name="world/Primitive.cs" /> | 40 | <include name="world/WorldBase.cs" /> |
44 | <include name="world/Primitive2.cs" /> | ||
45 | <include name="world/SceneObject.cs" /> | 41 | <include name="world/SceneObject.cs" /> |
46 | <include name="world/World.cs" /> | 42 | <include name="world/World.cs" /> |
47 | <include name="world/World.PacketHandlers.cs" /> | 43 | <include name="world/Primitive.cs" /> |
48 | <include name="world/World.Scripting.cs" /> | 44 | <include name="world/World.Scripting.cs" /> |
49 | <include name="world/WorldBase.cs" /> | 45 | <include name="world/Primitive2.cs" /> |
50 | <include name="world/scripting/IScriptContext.cs" /> | ||
51 | <include name="world/scripting/IScriptEntity.cs" /> | ||
52 | <include name="world/scripting/IScriptHandler.cs" /> | 46 | <include name="world/scripting/IScriptHandler.cs" /> |
53 | <include name="world/scripting/Script.cs" /> | ||
54 | <include name="world/scripting/ScriptFactory.cs" /> | 47 | <include name="world/scripting/ScriptFactory.cs" /> |
48 | <include name="world/scripting/IScriptContext.cs" /> | ||
49 | <include name="world/scripting/Script.cs" /> | ||
50 | <include name="world/scripting/IScriptEntity.cs" /> | ||
55 | <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> | 51 | <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> |
52 | <include name="Assets/InventoryCache.cs" /> | ||
53 | <include name="Assets/AssetCache.cs" /> | ||
54 | <include name="types/Mesh.cs" /> | ||
55 | <include name="types/Triangle.cs" /> | ||
56 | </sources> | 56 | </sources> |
57 | <references basedir="${project::get-base-directory()}"> | 57 | <references basedir="${project::get-base-directory()}"> |
58 | <lib> | 58 | <lib> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj index bd1a332..6ffcf9e 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj | |||
@@ -76,66 +76,66 @@ | |||
76 | </ProjectReference> | 76 | </ProjectReference> |
77 | </ItemGroup> | 77 | </ItemGroup> |
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <Compile Include="ClassInstance.cs"> | 79 | <Compile Include="MainMemory.cs"> |
80 | <SubType>Code</SubType> | ||
81 | </Compile> | ||
82 | <Compile Include="ClassRecord.cs"> | ||
83 | <SubType>Code</SubType> | 80 | <SubType>Code</SubType> |
84 | </Compile> | 81 | </Compile> |
85 | <Compile Include="Heap.cs"> | 82 | <Compile Include="Heap.cs"> |
86 | <SubType>Code</SubType> | 83 | <SubType>Code</SubType> |
87 | </Compile> | 84 | </Compile> |
88 | <Compile Include="Interpreter.cs"> | 85 | <Compile Include="StackFrame.cs"> |
89 | <SubType>Code</SubType> | 86 | <SubType>Code</SubType> |
90 | </Compile> | 87 | </Compile> |
91 | <Compile Include="InterpreterLogic.cs"> | 88 | <Compile Include="InterpreterLogic.cs"> |
92 | <SubType>Code</SubType> | 89 | <SubType>Code</SubType> |
93 | </Compile> | 90 | </Compile> |
94 | <Compile Include="InterpreterMethods.cs"> | 91 | <Compile Include="OpenSimJVM.cs"> |
95 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
96 | </Compile> | 93 | </Compile> |
97 | <Compile Include="InterpreterReturn.cs"> | 94 | <Compile Include="InterpreterMethods.cs"> |
98 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
99 | </Compile> | 96 | </Compile> |
100 | <Compile Include="MainMemory.cs"> | 97 | <Compile Include="ClassInstance.cs"> |
101 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
102 | </Compile> | 99 | </Compile> |
103 | <Compile Include="MethodMemory.cs"> | 100 | <Compile Include="InterpreterReturn.cs"> |
104 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
105 | </Compile> | 102 | </Compile> |
106 | <Compile Include="Object.cs"> | 103 | <Compile Include="Interpreter.cs"> |
107 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
108 | </Compile> | 105 | </Compile> |
109 | <Compile Include="OpenSimJVM.cs"> | 106 | <Compile Include="ClassRecord.cs"> |
110 | <SubType>Code</SubType> | 107 | <SubType>Code</SubType> |
111 | </Compile> | 108 | </Compile> |
112 | <Compile Include="Stack.cs"> | 109 | <Compile Include="Stack.cs"> |
113 | <SubType>Code</SubType> | 110 | <SubType>Code</SubType> |
114 | </Compile> | 111 | </Compile> |
115 | <Compile Include="StackFrame.cs"> | 112 | <Compile Include="Object.cs"> |
116 | <SubType>Code</SubType> | 113 | <SubType>Code</SubType> |
117 | </Compile> | 114 | </Compile> |
118 | <Compile Include="Thread.cs"> | 115 | <Compile Include="Thread.cs"> |
119 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
120 | </Compile> | 117 | </Compile> |
121 | <Compile Include="Properties\AssemblyInfo.cs"> | 118 | <Compile Include="MethodMemory.cs"> |
122 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
123 | </Compile> | 120 | </Compile> |
124 | <Compile Include="Types\ArrayReference.cs"> | 121 | <Compile Include="Properties\AssemblyInfo.cs"> |
125 | <SubType>Code</SubType> | 122 | <SubType>Code</SubType> |
126 | </Compile> | 123 | </Compile> |
127 | <Compile Include="Types\BaseType.cs"> | 124 | <Compile Include="Types\BaseType.cs"> |
128 | <SubType>Code</SubType> | 125 | <SubType>Code</SubType> |
129 | </Compile> | 126 | </Compile> |
130 | <Compile Include="Types\ObjectReference.cs"> | 127 | <Compile Include="Types\ArrayReference.cs"> |
131 | <SubType>Code</SubType> | 128 | <SubType>Code</SubType> |
132 | </Compile> | 129 | </Compile> |
133 | <Compile Include="Types\PrimitiveTypes\Byte.cs"> | 130 | <Compile Include="Types\ObjectReference.cs"> |
134 | <SubType>Code</SubType> | 131 | <SubType>Code</SubType> |
135 | </Compile> | 132 | </Compile> |
136 | <Compile Include="Types\PrimitiveTypes\Char.cs"> | 133 | <Compile Include="Types\PrimitiveTypes\Char.cs"> |
137 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
138 | </Compile> | 135 | </Compile> |
136 | <Compile Include="Types\PrimitiveTypes\Byte.cs"> | ||
137 | <SubType>Code</SubType> | ||
138 | </Compile> | ||
139 | <Compile Include="Types\PrimitiveTypes\Float.cs"> | 139 | <Compile Include="Types\PrimitiveTypes\Float.cs"> |
140 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
141 | </Compile> | 141 | </Compile> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build index c5255db..ac4d564 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build | |||
@@ -11,26 +11,26 @@ | |||
11 | <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ClassInstance.cs" /> | 14 | <include name="MainMemory.cs" /> |
15 | <include name="ClassRecord.cs" /> | ||
16 | <include name="Heap.cs" /> | 15 | <include name="Heap.cs" /> |
17 | <include name="Interpreter.cs" /> | 16 | <include name="StackFrame.cs" /> |
18 | <include name="InterpreterLogic.cs" /> | 17 | <include name="InterpreterLogic.cs" /> |
18 | <include name="OpenSimJVM.cs" /> | ||
19 | <include name="InterpreterMethods.cs" /> | 19 | <include name="InterpreterMethods.cs" /> |
20 | <include name="ClassInstance.cs" /> | ||
20 | <include name="InterpreterReturn.cs" /> | 21 | <include name="InterpreterReturn.cs" /> |
21 | <include name="MainMemory.cs" /> | 22 | <include name="Interpreter.cs" /> |
22 | <include name="MethodMemory.cs" /> | 23 | <include name="ClassRecord.cs" /> |
23 | <include name="Object.cs" /> | ||
24 | <include name="OpenSimJVM.cs" /> | ||
25 | <include name="Stack.cs" /> | 24 | <include name="Stack.cs" /> |
26 | <include name="StackFrame.cs" /> | 25 | <include name="Object.cs" /> |
27 | <include name="Thread.cs" /> | 26 | <include name="Thread.cs" /> |
27 | <include name="MethodMemory.cs" /> | ||
28 | <include name="Properties/AssemblyInfo.cs" /> | 28 | <include name="Properties/AssemblyInfo.cs" /> |
29 | <include name="Types/ArrayReference.cs" /> | ||
30 | <include name="Types/BaseType.cs" /> | 29 | <include name="Types/BaseType.cs" /> |
30 | <include name="Types/ArrayReference.cs" /> | ||
31 | <include name="Types/ObjectReference.cs" /> | 31 | <include name="Types/ObjectReference.cs" /> |
32 | <include name="Types/PrimitiveTypes/Byte.cs" /> | ||
33 | <include name="Types/PrimitiveTypes/Char.cs" /> | 32 | <include name="Types/PrimitiveTypes/Char.cs" /> |
33 | <include name="Types/PrimitiveTypes/Byte.cs" /> | ||
34 | <include name="Types/PrimitiveTypes/Float.cs" /> | 34 | <include name="Types/PrimitiveTypes/Float.cs" /> |
35 | <include name="Types/PrimitiveTypes/Int.cs" /> | 35 | <include name="Types/PrimitiveTypes/Int.cs" /> |
36 | </sources> | 36 | </sources> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 231ba1d..7bb5d6e 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.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>{E1B79ECF-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{E1B79ECF-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.Storage.LocalStorageDb4o</AssemblyName> | 12 | <AssemblyName>OpenSim.Storage.LocalStorageDb4o</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.Storage.LocalStorageDb4o</RootNamespace> | 19 | <RootNamespace>OpenSim.Storage.LocalStorageDb4o</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="Db4objects.Db4o.dll"> | 69 | <Reference Include="Db4objects.Db4o.dll" > |
77 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> | 70 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="libsecondlife.dll"> | 73 | <Reference Include="libsecondlife.dll" > |
81 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
@@ -87,29 +80,31 @@ | |||
87 | <Name>OpenSim.Framework</Name> | 80 | <Name>OpenSim.Framework</Name> |
88 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 81 | <Project>{8ACA2445-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="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 85 | <ProjectReference Include="..\..\..\Common\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> |
100 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="AssemblyInfo.cs"> |
101 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
102 | </Compile> | 95 | </Compile> |
103 | <Compile Include="UUIDParcelQuery.cs" /> | 96 | <Compile Include="MapStorage.cs"> |
104 | <Compile Include="UUIDPrimQuery.cs"> | ||
105 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
106 | </Compile> | 98 | </Compile> |
107 | <Compile Include="MapStorage.cs"> | 99 | <Compile Include="UUIDPrimQuery.cs"> |
108 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
109 | </Compile> | 101 | </Compile> |
110 | <Compile Include="Db4LocalStorage.cs"> | 102 | <Compile Include="Db4LocalStorage.cs"> |
111 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
112 | </Compile> | 104 | </Compile> |
105 | <Compile Include="UUIDParcelQuery.cs"> | ||
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
113 | </ItemGroup> | 108 | </ItemGroup> |
114 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
115 | <PropertyGroup> | 110 | <PropertyGroup> |
@@ -118,4 +113,4 @@ | |||
118 | <PostBuildEvent> | 113 | <PostBuildEvent> |
119 | </PostBuildEvent> | 114 | </PostBuildEvent> |
120 | </PropertyGroup> | 115 | </PropertyGroup> |
121 | </Project> \ No newline at end of file | 116 | </Project> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index da2db14..e18478a 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build | |||
@@ -12,9 +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="UUIDQuery.cs" /> | 16 | <include name="UUIDPrimQuery.cs" /> |
17 | <include name="Db4LocalStorage.cs" /> | ||
18 | <include name="UUIDParcelQuery.cs" /> | ||
18 | </sources> | 19 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
20 | <lib> | 21 | <lib> |
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj index 069c5c6..a3f6ec0 100644 --- a/OpenSim/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim/OpenSim.csproj | |||
@@ -130,10 +130,10 @@ | |||
130 | </ProjectReference> | 130 | </ProjectReference> |
131 | </ItemGroup> | 131 | </ItemGroup> |
132 | <ItemGroup> | 132 | <ItemGroup> |
133 | <Compile Include="Application.cs"> | 133 | <Compile Include="OpenSimMain.cs"> |
134 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
135 | </Compile> | 135 | </Compile> |
136 | <Compile Include="OpenSimMain.cs"> | 136 | <Compile Include="Application.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | </ItemGroup> | 139 | </ItemGroup> |
diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build index 4f8ca8a..670b77c 100644 --- a/OpenSim/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim/OpenSim.exe.build | |||
@@ -11,8 +11,8 @@ | |||
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" /> |
15 | <include name="Application.cs" /> | ||
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |