diff options
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs | 64 | ||||
-rw-r--r-- | README.md | 4 | ||||
-rwxr-xr-x | bin/OpenMetaverse.dll | bin | 1806336 -> 1806336 bytes | |||
-rw-r--r-- | bin/OpenSim.ini.example | 2 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 2 | ||||
-rw-r--r-- | bin/Robust.HG.ini.example | 2 | ||||
-rw-r--r-- | bin/Robust.ini.example | 2 | ||||
-rw-r--r-- | prebuild.xml | 200 | ||||
-rwxr-xr-x | runprebuild.bat | 24 | ||||
-rwxr-xr-x | runprebuild2010.bat | 2 |
11 files changed, 206 insertions, 114 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 7afdd34..d2f74de 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -1408,7 +1408,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1408 | /// </remarks> | 1408 | /// </remarks> |
1409 | private void XmlRpcSaveOARMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) | 1409 | private void XmlRpcSaveOARMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) |
1410 | { | 1410 | { |
1411 | m_log.Info("[RADMIN]: Received Save OAR Administrator Request"); | 1411 | m_log.Info("[RADMIN]: Received Save OAR Request"); |
1412 | 1412 | ||
1413 | Hashtable responseData = (Hashtable)response.Value; | 1413 | Hashtable responseData = (Hashtable)response.Value; |
1414 | Hashtable requestData = (Hashtable)request.Params[0]; | 1414 | Hashtable requestData = (Hashtable)request.Params[0]; |
@@ -1454,8 +1454,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1454 | 1454 | ||
1455 | if (archiver != null) | 1455 | if (archiver != null) |
1456 | { | 1456 | { |
1457 | Guid requestId = Guid.NewGuid(); | ||
1457 | scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted; | 1458 | scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted; |
1458 | archiver.ArchiveRegion(filename, options); | 1459 | |
1460 | m_log.InfoFormat( | ||
1461 | "[RADMIN]: Submitting save OAR request for {0} to file {1}, request ID {2}", | ||
1462 | scene.Name, filename, requestId); | ||
1463 | |||
1464 | archiver.ArchiveRegion(filename, requestId, options); | ||
1459 | 1465 | ||
1460 | lock (m_saveOarLock) | 1466 | lock (m_saveOarLock) |
1461 | Monitor.Wait(m_saveOarLock,5000); | 1467 | Monitor.Wait(m_saveOarLock,5000); |
@@ -1476,12 +1482,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1476 | throw e; | 1482 | throw e; |
1477 | } | 1483 | } |
1478 | 1484 | ||
1479 | m_log.Info("[RADMIN]: Save OAR Administrator Request complete"); | 1485 | m_log.Info("[RADMIN]: Save OAR Request complete"); |
1480 | } | 1486 | } |
1481 | 1487 | ||
1482 | private void RemoteAdminOarSaveCompleted(Guid uuid, string name) | 1488 | private void RemoteAdminOarSaveCompleted(Guid uuid, string name) |
1483 | { | 1489 | { |
1484 | m_log.DebugFormat("[RADMIN]: File processing complete for {0}", name); | 1490 | if (name != "") |
1491 | m_log.ErrorFormat("[RADMIN]: Saving of OAR file with request ID {0} failed with message {1}", uuid, name); | ||
1492 | else | ||
1493 | m_log.DebugFormat("[RADMIN]: Saved OAR file for request {0}", uuid); | ||
1494 | |||
1485 | lock (m_saveOarLock) | 1495 | lock (m_saveOarLock) |
1486 | Monitor.Pulse(m_saveOarLock); | 1496 | Monitor.Pulse(m_saveOarLock); |
1487 | } | 1497 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs new file mode 100644 index 0000000..2a1c19c --- /dev/null +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs | |||
@@ -0,0 +1,64 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text.RegularExpressions; | ||
31 | using NUnit.Framework; | ||
32 | using OpenSim.Region.ScriptEngine.Shared.CodeTools; | ||
33 | using OpenSim.Tests.Common; | ||
34 | |||
35 | namespace OpenSim.Region.ScriptEngine.Shared.Tests | ||
36 | { | ||
37 | public class LSL_EventTests : OpenSimTestCase | ||
38 | { | ||
39 | [Test] | ||
40 | public void TestStateEntryEvent() | ||
41 | { | ||
42 | TestHelpers.InMethod(); | ||
43 | // TestHelpers.EnableLogging(); | ||
44 | |||
45 | CSCodeGenerator cg = new CSCodeGenerator(); | ||
46 | cg.Convert("default { state_entry() {} }"); | ||
47 | |||
48 | { | ||
49 | bool gotException = false; | ||
50 | |||
51 | try | ||
52 | { | ||
53 | cg.Convert("default { state_entry(integer n) {} }"); | ||
54 | } | ||
55 | catch (Exception ) | ||
56 | { | ||
57 | gotException = true; | ||
58 | } | ||
59 | |||
60 | Assert.That(gotException, Is.True); | ||
61 | } | ||
62 | } | ||
63 | } | ||
64 | } \ No newline at end of file | ||
@@ -17,7 +17,7 @@ need to build OpenSim before running it. | |||
17 | 17 | ||
18 | # Running OpenSim on Windows | 18 | # Running OpenSim on Windows |
19 | 19 | ||
20 | You will need .NET Framework 3.5 installed to run OpenSimulator. | 20 | You will need .NET 4.0 installed to run OpenSimulator. |
21 | 21 | ||
22 | We recommend that you run OpenSim from a command prompt on Windows in order | 22 | We recommend that you run OpenSim from a command prompt on Windows in order |
23 | to capture any errors. | 23 | to capture any errors. |
@@ -31,7 +31,7 @@ Now see the "Configuring OpenSim" section | |||
31 | 31 | ||
32 | # Running OpenSim on Linux | 32 | # Running OpenSim on Linux |
33 | 33 | ||
34 | You will need Mono >= 2.4.3 to run OpenSim. On some Linux distributions you | 34 | You will need Mono >= 2.10.8.1 to run OpenSimulator. On some Linux distributions you |
35 | may need to install additional packages. See http://opensimulator.org/wiki/Dependencies | 35 | may need to install additional packages. See http://opensimulator.org/wiki/Dependencies |
36 | for more information. | 36 | for more information. |
37 | 37 | ||
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index a91670d..30ad7e5 100755 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
Binary files differ | |||
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index b78e3b7..d3f9156 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -69,7 +69,7 @@ | |||
69 | 69 | ||
70 | ;# {PIDFile} {} {Path to PID file?} {} | 70 | ;# {PIDFile} {} {Path to PID file?} {} |
71 | ;; Place to create a PID file | 71 | ;; Place to create a PID file |
72 | ; PIDFile = "/tmp/my.pid" | 72 | ; PIDFile = "/tmp/OpenSim.exe.pid" |
73 | 73 | ||
74 | ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem | 74 | ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem |
75 | ;; Determine where OpenSimulator looks for the files which tell it | 75 | ;; Determine where OpenSimulator looks for the files which tell it |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index b56d5d1..ae7b794 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -21,7 +21,7 @@ | |||
21 | crash_dir = "crashes" | 21 | crash_dir = "crashes" |
22 | 22 | ||
23 | ; Place to create a PID file | 23 | ; Place to create a PID file |
24 | ; PIDFile = "/tmp/my.pid" | 24 | ; PIDFile = "/tmp/OpenSim.exe.pid" |
25 | 25 | ||
26 | ; Console commands run at startup | 26 | ; Console commands run at startup |
27 | startup_console_commands_file = "startup_commands.txt" | 27 | startup_console_commands_file = "startup_commands.txt" |
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 2ad262a..965e241 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -23,7 +23,7 @@ | |||
23 | [Startup] | 23 | [Startup] |
24 | ; Place to create a PID file | 24 | ; Place to create a PID file |
25 | ; If no path if specified then a PID file is not created. | 25 | ; If no path if specified then a PID file is not created. |
26 | ; PIDFile = "/tmp/my.pid" | 26 | ; PIDFile = "/tmp/Robust.exe.pid" |
27 | 27 | ||
28 | ; Plugin Registry Location | 28 | ; Plugin Registry Location |
29 | ; Set path to directory for plugin registry. Information | 29 | ; Set path to directory for plugin registry. Information |
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 0660de4..f79059b 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -15,7 +15,7 @@ | |||
15 | [Startup] | 15 | [Startup] |
16 | ; Place to create a PID file | 16 | ; Place to create a PID file |
17 | ; If no path if specified then a PID file is not created. | 17 | ; If no path if specified then a PID file is not created. |
18 | ; PIDFile = "/tmp/my.pid" | 18 | ; PIDFile = "/tmp/Robust.exe.pid" |
19 | 19 | ||
20 | ; Plugin Registry Location | 20 | ; Plugin Registry Location |
21 | ; Set path to directory for plugin registry. Information | 21 | ; Set path to directory for plugin registry. Information |
diff --git a/prebuild.xml b/prebuild.xml index a5357da..de3b89b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | <!-- Core OpenSim Projects --> | 35 | <!-- Core OpenSim Projects --> |
36 | <!-- | 36 | <!-- |
37 | <Project frameworkVersion="v3_5" name="OpenSim.Model" path="OpenSim/Model" type="Library"> | 37 | <Project frameworkVersion="v4_0" name="OpenSim.Model" path="OpenSim/Model" type="Library"> |
38 | <Configuration name="Debug"> | 38 | <Configuration name="Debug"> |
39 | <Options> | 39 | <Options> |
40 | <OutputPath>../../../bin/</OutputPath> | 40 | <OutputPath>../../../bin/</OutputPath> |
@@ -55,7 +55,7 @@ | |||
55 | </Project> | 55 | </Project> |
56 | --> | 56 | --> |
57 | 57 | ||
58 | <Project frameworkVersion="v3_5" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library"> | 58 | <Project frameworkVersion="v4_0" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library"> |
59 | <Configuration name="Debug"> | 59 | <Configuration name="Debug"> |
60 | <Options> | 60 | <Options> |
61 | <OutputPath>../../bin/</OutputPath> | 61 | <OutputPath>../../bin/</OutputPath> |
@@ -77,7 +77,7 @@ | |||
77 | </Files> | 77 | </Files> |
78 | </Project> | 78 | </Project> |
79 | 79 | ||
80 | <Project frameworkVersion="v3_5" name="OpenSim.Framework" path="OpenSim/Framework" type="Library"> | 80 | <Project frameworkVersion="v4_0" name="OpenSim.Framework" path="OpenSim/Framework" type="Library"> |
81 | <Configuration name="Debug"> | 81 | <Configuration name="Debug"> |
82 | <Options> | 82 | <Options> |
83 | <OutputPath>../../bin/</OutputPath> | 83 | <OutputPath>../../bin/</OutputPath> |
@@ -113,7 +113,7 @@ | |||
113 | </Files> | 113 | </Files> |
114 | </Project> | 114 | </Project> |
115 | 115 | ||
116 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library"> | 116 | <Project frameworkVersion="v4_0" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library"> |
117 | <Configuration name="Debug"> | 117 | <Configuration name="Debug"> |
118 | <Options> | 118 | <Options> |
119 | <OutputPath>../../../bin/</OutputPath> | 119 | <OutputPath>../../../bin/</OutputPath> |
@@ -141,7 +141,7 @@ | |||
141 | </Files> | 141 | </Files> |
142 | </Project> | 142 | </Project> |
143 | 143 | ||
144 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library"> | 144 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library"> |
145 | <Configuration name="Debug"> | 145 | <Configuration name="Debug"> |
146 | <Options> | 146 | <Options> |
147 | <OutputPath>../../../bin/</OutputPath> | 147 | <OutputPath>../../../bin/</OutputPath> |
@@ -168,7 +168,7 @@ | |||
168 | </Files> | 168 | </Files> |
169 | </Project> | 169 | </Project> |
170 | 170 | ||
171 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library"> | 171 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library"> |
172 | <Configuration name="Debug"> | 172 | <Configuration name="Debug"> |
173 | <Options> | 173 | <Options> |
174 | <OutputPath>../../../../bin/</OutputPath> | 174 | <OutputPath>../../../../bin/</OutputPath> |
@@ -209,7 +209,7 @@ | |||
209 | </Files> | 209 | </Files> |
210 | </Project> | 210 | </Project> |
211 | 211 | ||
212 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library"> | 212 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library"> |
213 | <Configuration name="Debug"> | 213 | <Configuration name="Debug"> |
214 | <Options> | 214 | <Options> |
215 | <OutputPath>../../../bin/</OutputPath> | 215 | <OutputPath>../../../bin/</OutputPath> |
@@ -236,7 +236,7 @@ | |||
236 | </Files> | 236 | </Files> |
237 | </Project> | 237 | </Project> |
238 | 238 | ||
239 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library"> | 239 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library"> |
240 | <Configuration name="Debug"> | 240 | <Configuration name="Debug"> |
241 | <Options> | 241 | <Options> |
242 | <OutputPath>../../../bin/</OutputPath> | 242 | <OutputPath>../../../bin/</OutputPath> |
@@ -265,7 +265,7 @@ | |||
265 | </Files> | 265 | </Files> |
266 | </Project> | 266 | </Project> |
267 | 267 | ||
268 | <Project frameworkVersion="v3_5" name="OpenSim.Data" path="OpenSim/Data" type="Library"> | 268 | <Project frameworkVersion="v4_0" name="OpenSim.Data" path="OpenSim/Data" type="Library"> |
269 | <Configuration name="Debug"> | 269 | <Configuration name="Debug"> |
270 | <Options> | 270 | <Options> |
271 | <OutputPath>../../bin/</OutputPath> | 271 | <OutputPath>../../bin/</OutputPath> |
@@ -295,7 +295,7 @@ | |||
295 | </Files> | 295 | </Files> |
296 | </Project> | 296 | </Project> |
297 | 297 | ||
298 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library"> | 298 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library"> |
299 | <Configuration name="Debug"> | 299 | <Configuration name="Debug"> |
300 | <Options> | 300 | <Options> |
301 | <OutputPath>../../../../bin/</OutputPath> | 301 | <OutputPath>../../../../bin/</OutputPath> |
@@ -320,7 +320,7 @@ | |||
320 | </Files> | 320 | </Files> |
321 | </Project> | 321 | </Project> |
322 | 322 | ||
323 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.HTTP" path="OpenSim/Framework/Configuration/HTTP" type="Library"> | 323 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Configuration.HTTP" path="OpenSim/Framework/Configuration/HTTP" type="Library"> |
324 | <Configuration name="Debug"> | 324 | <Configuration name="Debug"> |
325 | <Options> | 325 | <Options> |
326 | <OutputPath>../../../../bin/</OutputPath> | 326 | <OutputPath>../../../../bin/</OutputPath> |
@@ -347,7 +347,7 @@ | |||
347 | </Files> | 347 | </Files> |
348 | </Project> | 348 | </Project> |
349 | 349 | ||
350 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library"> | 350 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library"> |
351 | <Configuration name="Debug"> | 351 | <Configuration name="Debug"> |
352 | <Options> | 352 | <Options> |
353 | <OutputPath>../../../../bin/</OutputPath> | 353 | <OutputPath>../../../../bin/</OutputPath> |
@@ -372,7 +372,7 @@ | |||
372 | </Files> | 372 | </Files> |
373 | </Project> | 373 | </Project> |
374 | 374 | ||
375 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.RegionLoader.Web" path="OpenSim/Framework/RegionLoader/Web" type="Library"> | 375 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.RegionLoader.Web" path="OpenSim/Framework/RegionLoader/Web" type="Library"> |
376 | <Configuration name="Debug"> | 376 | <Configuration name="Debug"> |
377 | <Options> | 377 | <Options> |
378 | <OutputPath>../../../../bin/</OutputPath> | 378 | <OutputPath>../../../../bin/</OutputPath> |
@@ -398,7 +398,7 @@ | |||
398 | </Files> | 398 | </Files> |
399 | </Project> | 399 | </Project> |
400 | 400 | ||
401 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.RegionLoader.Filesystem" path="OpenSim/Framework/RegionLoader/Filesystem" type="Library"> | 401 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.RegionLoader.Filesystem" path="OpenSim/Framework/RegionLoader/Filesystem" type="Library"> |
402 | <Configuration name="Debug"> | 402 | <Configuration name="Debug"> |
403 | <Options> | 403 | <Options> |
404 | <OutputPath>../../../../bin/</OutputPath> | 404 | <OutputPath>../../../../bin/</OutputPath> |
@@ -424,7 +424,7 @@ | |||
424 | </Files> | 424 | </Files> |
425 | </Project> | 425 | </Project> |
426 | 426 | ||
427 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library"> | 427 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library"> |
428 | <Configuration name="Debug"> | 428 | <Configuration name="Debug"> |
429 | <Options> | 429 | <Options> |
430 | <OutputPath>../../../bin/</OutputPath> | 430 | <OutputPath>../../../bin/</OutputPath> |
@@ -457,7 +457,7 @@ | |||
457 | </Files> | 457 | </Files> |
458 | </Project> | 458 | </Project> |
459 | 459 | ||
460 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library"> | 460 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library"> |
461 | <Configuration name="Debug"> | 461 | <Configuration name="Debug"> |
462 | <Options> | 462 | <Options> |
463 | <OutputPath>../../../../bin/</OutputPath> | 463 | <OutputPath>../../../../bin/</OutputPath> |
@@ -485,7 +485,7 @@ | |||
485 | </Project> | 485 | </Project> |
486 | 486 | ||
487 | <!-- Physics Plug-ins --> | 487 | <!-- Physics Plug-ins --> |
488 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library"> | 488 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library"> |
489 | <Configuration name="Debug"> | 489 | <Configuration name="Debug"> |
490 | <Options> | 490 | <Options> |
491 | <OutputPath>../../../../bin/Physics/</OutputPath> | 491 | <OutputPath>../../../../bin/Physics/</OutputPath> |
@@ -508,7 +508,7 @@ | |||
508 | </Files> | 508 | </Files> |
509 | </Project> | 509 | </Project> |
510 | 510 | ||
511 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.POSPlugin" path="OpenSim/Region/Physics/POSPlugin" type="Library"> | 511 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.POSPlugin" path="OpenSim/Region/Physics/POSPlugin" type="Library"> |
512 | <Configuration name="Debug"> | 512 | <Configuration name="Debug"> |
513 | <Options> | 513 | <Options> |
514 | <OutputPath>../../../../bin/Physics/</OutputPath> | 514 | <OutputPath>../../../../bin/Physics/</OutputPath> |
@@ -531,7 +531,7 @@ | |||
531 | </Files> | 531 | </Files> |
532 | </Project> | 532 | </Project> |
533 | 533 | ||
534 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library"> | 534 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library"> |
535 | <Configuration name="Debug"> | 535 | <Configuration name="Debug"> |
536 | <Options> | 536 | <Options> |
537 | <OutputPath>../../../../bin/Physics/</OutputPath> | 537 | <OutputPath>../../../../bin/Physics/</OutputPath> |
@@ -561,7 +561,7 @@ | |||
561 | </Files> | 561 | </Files> |
562 | </Project> | 562 | </Project> |
563 | 563 | ||
564 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library"> | 564 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library"> |
565 | <Configuration name="Debug"> | 565 | <Configuration name="Debug"> |
566 | <Options> | 566 | <Options> |
567 | <OutputPath>../../../../bin/Physics/</OutputPath> | 567 | <OutputPath>../../../../bin/Physics/</OutputPath> |
@@ -592,7 +592,7 @@ | |||
592 | </Files> | 592 | </Files> |
593 | </Project> | 593 | </Project> |
594 | 594 | ||
595 | <Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library"> | 595 | <Project frameworkVersion="v4_0" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library"> |
596 | <Configuration name="Debug"> | 596 | <Configuration name="Debug"> |
597 | <Options> | 597 | <Options> |
598 | <OutputPath>../../bin/</OutputPath> | 598 | <OutputPath>../../bin/</OutputPath> |
@@ -627,7 +627,7 @@ | |||
627 | </Project> | 627 | </Project> |
628 | 628 | ||
629 | 629 | ||
630 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library"> | 630 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library"> |
631 | <Configuration name="Debug"> | 631 | <Configuration name="Debug"> |
632 | <Options> | 632 | <Options> |
633 | <OutputPath>../../../bin/</OutputPath> | 633 | <OutputPath>../../../bin/</OutputPath> |
@@ -668,7 +668,7 @@ | |||
668 | </Project> | 668 | </Project> |
669 | 669 | ||
670 | 670 | ||
671 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Framework" path="OpenSim/Region/Framework" type="Library"> | 671 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Framework" path="OpenSim/Region/Framework" type="Library"> |
672 | <Configuration name="Debug"> | 672 | <Configuration name="Debug"> |
673 | <Options> | 673 | <Options> |
674 | <OutputPath>../../../bin/</OutputPath> | 674 | <OutputPath>../../../bin/</OutputPath> |
@@ -721,7 +721,7 @@ | |||
721 | <!-- OGS projects --> | 721 | <!-- OGS projects --> |
722 | 722 | ||
723 | 723 | ||
724 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library"> | 724 | <Project frameworkVersion="v4_0" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library"> |
725 | <Configuration name="Debug"> | 725 | <Configuration name="Debug"> |
726 | <Options> | 726 | <Options> |
727 | <OutputPath>../../../bin/</OutputPath> | 727 | <OutputPath>../../../bin/</OutputPath> |
@@ -756,7 +756,7 @@ | |||
756 | </Files> | 756 | </Files> |
757 | </Project> | 757 | </Project> |
758 | 758 | ||
759 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library"> | 759 | <Project frameworkVersion="v4_0" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library"> |
760 | <Configuration name="Debug"> | 760 | <Configuration name="Debug"> |
761 | <Options> | 761 | <Options> |
762 | <OutputPath>../../../bin/</OutputPath> | 762 | <OutputPath>../../../bin/</OutputPath> |
@@ -783,7 +783,7 @@ | |||
783 | </Files> | 783 | </Files> |
784 | </Project> | 784 | </Project> |
785 | 785 | ||
786 | <Project frameworkVersion="v3_5" name="OpenSim.Services.UserAccountService" path="OpenSim/Services/UserAccountService" type="Library"> | 786 | <Project frameworkVersion="v4_0" name="OpenSim.Services.UserAccountService" path="OpenSim/Services/UserAccountService" type="Library"> |
787 | <Configuration name="Debug"> | 787 | <Configuration name="Debug"> |
788 | <Options> | 788 | <Options> |
789 | <OutputPath>../../../bin/</OutputPath> | 789 | <OutputPath>../../../bin/</OutputPath> |
@@ -814,7 +814,7 @@ | |||
814 | </Files> | 814 | </Files> |
815 | </Project> | 815 | </Project> |
816 | 816 | ||
817 | <Project frameworkVersion="v3_5" name="OpenSim.Services.FriendsService" path="OpenSim/Services/Friends" type="Library"> | 817 | <Project frameworkVersion="v4_0" name="OpenSim.Services.FriendsService" path="OpenSim/Services/Friends" type="Library"> |
818 | <Configuration name="Debug"> | 818 | <Configuration name="Debug"> |
819 | <Options> | 819 | <Options> |
820 | <OutputPath>../../../bin/</OutputPath> | 820 | <OutputPath>../../../bin/</OutputPath> |
@@ -845,7 +845,7 @@ | |||
845 | </Files> | 845 | </Files> |
846 | </Project> | 846 | </Project> |
847 | 847 | ||
848 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library"> | 848 | <Project frameworkVersion="v4_0" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library"> |
849 | <Configuration name="Debug"> | 849 | <Configuration name="Debug"> |
850 | <Options> | 850 | <Options> |
851 | <OutputPath>../../../bin/</OutputPath> | 851 | <OutputPath>../../../bin/</OutputPath> |
@@ -886,7 +886,7 @@ | |||
886 | </Files> | 886 | </Files> |
887 | </Project> | 887 | </Project> |
888 | 888 | ||
889 | <Project frameworkVersion="v3_5" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library"> | 889 | <Project frameworkVersion="v4_0" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library"> |
890 | <Configuration name="Debug"> | 890 | <Configuration name="Debug"> |
891 | <Options> | 891 | <Options> |
892 | <OutputPath>../../../bin/</OutputPath> | 892 | <OutputPath>../../../bin/</OutputPath> |
@@ -918,7 +918,7 @@ | |||
918 | </Files> | 918 | </Files> |
919 | </Project> | 919 | </Project> |
920 | 920 | ||
921 | <Project frameworkVersion="v3_5" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library"> | 921 | <Project frameworkVersion="v4_0" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library"> |
922 | <Configuration name="Debug"> | 922 | <Configuration name="Debug"> |
923 | <Options> | 923 | <Options> |
924 | <OutputPath>../../../bin/</OutputPath> | 924 | <OutputPath>../../../bin/</OutputPath> |
@@ -949,7 +949,7 @@ | |||
949 | </Files> | 949 | </Files> |
950 | </Project> | 950 | </Project> |
951 | 951 | ||
952 | <Project frameworkVersion="v3_5" name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library"> | 952 | <Project frameworkVersion="v4_0" name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library"> |
953 | <Configuration name="Debug"> | 953 | <Configuration name="Debug"> |
954 | <Options> | 954 | <Options> |
955 | <OutputPath>../../../bin/</OutputPath> | 955 | <OutputPath>../../../bin/</OutputPath> |
@@ -981,7 +981,7 @@ | |||
981 | </Files> | 981 | </Files> |
982 | </Project> | 982 | </Project> |
983 | 983 | ||
984 | <Project frameworkVersion="v3_5" name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library"> | 984 | <Project frameworkVersion="v4_0" name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library"> |
985 | <Configuration name="Debug"> | 985 | <Configuration name="Debug"> |
986 | <Options> | 986 | <Options> |
987 | <OutputPath>../../../bin/</OutputPath> | 987 | <OutputPath>../../../bin/</OutputPath> |
@@ -1013,7 +1013,7 @@ | |||
1013 | </Files> | 1013 | </Files> |
1014 | </Project> | 1014 | </Project> |
1015 | 1015 | ||
1016 | <Project frameworkVersion="v3_5" name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library"> | 1016 | <Project frameworkVersion="v4_0" name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library"> |
1017 | <Configuration name="Debug"> | 1017 | <Configuration name="Debug"> |
1018 | <Options> | 1018 | <Options> |
1019 | <OutputPath>../../../bin/</OutputPath> | 1019 | <OutputPath>../../../bin/</OutputPath> |
@@ -1047,7 +1047,7 @@ | |||
1047 | </Files> | 1047 | </Files> |
1048 | </Project> | 1048 | </Project> |
1049 | 1049 | ||
1050 | <Project frameworkVersion="v3_5" name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" type="Library"> | 1050 | <Project frameworkVersion="v4_0" name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" type="Library"> |
1051 | <Configuration name="Debug"> | 1051 | <Configuration name="Debug"> |
1052 | <Options> | 1052 | <Options> |
1053 | <OutputPath>../../../bin/</OutputPath> | 1053 | <OutputPath>../../../bin/</OutputPath> |
@@ -1078,7 +1078,7 @@ | |||
1078 | </Files> | 1078 | </Files> |
1079 | </Project> | 1079 | </Project> |
1080 | 1080 | ||
1081 | <Project frameworkVersion="v3_5" name="OpenSim.Services.AvatarService" path="OpenSim/Services/AvatarService" type="Library"> | 1081 | <Project frameworkVersion="v4_0" name="OpenSim.Services.AvatarService" path="OpenSim/Services/AvatarService" type="Library"> |
1082 | <Configuration name="Debug"> | 1082 | <Configuration name="Debug"> |
1083 | <Options> | 1083 | <Options> |
1084 | <OutputPath>../../../bin/</OutputPath> | 1084 | <OutputPath>../../../bin/</OutputPath> |
@@ -1109,7 +1109,7 @@ | |||
1109 | </Files> | 1109 | </Files> |
1110 | </Project> | 1110 | </Project> |
1111 | 1111 | ||
1112 | <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library"> | 1112 | <Project frameworkVersion="v4_0" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library"> |
1113 | <Configuration name="Debug"> | 1113 | <Configuration name="Debug"> |
1114 | <Options> | 1114 | <Options> |
1115 | <OutputPath>../../../bin/</OutputPath> | 1115 | <OutputPath>../../../bin/</OutputPath> |
@@ -1144,7 +1144,7 @@ | |||
1144 | </Project> | 1144 | </Project> |
1145 | 1145 | ||
1146 | 1146 | ||
1147 | <Project frameworkVersion="v3_5" name="OpenSim.Services.LLLoginService" path="OpenSim/Services/LLLoginService" type="Library"> | 1147 | <Project frameworkVersion="v4_0" name="OpenSim.Services.LLLoginService" path="OpenSim/Services/LLLoginService" type="Library"> |
1148 | <Configuration name="Debug"> | 1148 | <Configuration name="Debug"> |
1149 | <Options> | 1149 | <Options> |
1150 | <OutputPath>../../../bin/</OutputPath> | 1150 | <OutputPath>../../../bin/</OutputPath> |
@@ -1177,7 +1177,7 @@ | |||
1177 | </Files> | 1177 | </Files> |
1178 | </Project> | 1178 | </Project> |
1179 | 1179 | ||
1180 | <Project frameworkVersion="v3_5" name="OpenSim.Services.HypergridService" path="OpenSim/Services/HypergridService" type="Library"> | 1180 | <Project frameworkVersion="v4_0" name="OpenSim.Services.HypergridService" path="OpenSim/Services/HypergridService" type="Library"> |
1181 | <Configuration name="Debug"> | 1181 | <Configuration name="Debug"> |
1182 | <Options> | 1182 | <Options> |
1183 | <OutputPath>../../../bin/</OutputPath> | 1183 | <OutputPath>../../../bin/</OutputPath> |
@@ -1215,7 +1215,7 @@ | |||
1215 | </Files> | 1215 | </Files> |
1216 | </Project> | 1216 | </Project> |
1217 | 1217 | ||
1218 | <Project frameworkVersion="v3_5" name="OpenSim.Services.MapImageService" path="OpenSim/Services/MapImageService" type="Library"> | 1218 | <Project frameworkVersion="v4_0" name="OpenSim.Services.MapImageService" path="OpenSim/Services/MapImageService" type="Library"> |
1219 | <Configuration name="Debug"> | 1219 | <Configuration name="Debug"> |
1220 | <Options> | 1220 | <Options> |
1221 | <OutputPath>../../../bin/</OutputPath> | 1221 | <OutputPath>../../../bin/</OutputPath> |
@@ -1245,7 +1245,7 @@ | |||
1245 | </Files> | 1245 | </Files> |
1246 | </Project> | 1246 | </Project> |
1247 | 1247 | ||
1248 | <Project frameworkVersion="v3_5" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library"> | 1248 | <Project frameworkVersion="v4_0" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library"> |
1249 | <Configuration name="Debug"> | 1249 | <Configuration name="Debug"> |
1250 | <Options> | 1250 | <Options> |
1251 | <OutputPath>../../../bin/</OutputPath> | 1251 | <OutputPath>../../../bin/</OutputPath> |
@@ -1281,7 +1281,7 @@ | |||
1281 | </Project> | 1281 | </Project> |
1282 | 1282 | ||
1283 | 1283 | ||
1284 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library"> | 1284 | <Project frameworkVersion="v4_0" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library"> |
1285 | <Configuration name="Debug"> | 1285 | <Configuration name="Debug"> |
1286 | <Options> | 1286 | <Options> |
1287 | <OutputPath>../../../bin/</OutputPath> | 1287 | <OutputPath>../../../bin/</OutputPath> |
@@ -1321,7 +1321,7 @@ | |||
1321 | </Project> | 1321 | </Project> |
1322 | 1322 | ||
1323 | 1323 | ||
1324 | <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library"> | 1324 | <Project frameworkVersion="v4_0" name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library"> |
1325 | <Configuration name="Debug"> | 1325 | <Configuration name="Debug"> |
1326 | <Options> | 1326 | <Options> |
1327 | <OutputPath>../../../bin/</OutputPath> | 1327 | <OutputPath>../../../bin/</OutputPath> |
@@ -1362,7 +1362,7 @@ | |||
1362 | </Project> | 1362 | </Project> |
1363 | 1363 | ||
1364 | 1364 | ||
1365 | <Project frameworkVersion="v3_5" name="Robust" path="OpenSim/Server" type="Exe"> | 1365 | <Project frameworkVersion="v4_0" name="Robust" path="OpenSim/Server" type="Exe"> |
1366 | <Configuration name="Debug"> | 1366 | <Configuration name="Debug"> |
1367 | <Options> | 1367 | <Options> |
1368 | <OutputPath>../../bin/</OutputPath> | 1368 | <OutputPath>../../bin/</OutputPath> |
@@ -1398,7 +1398,7 @@ | |||
1398 | </Files> | 1398 | </Files> |
1399 | </Project> | 1399 | </Project> |
1400 | 1400 | ||
1401 | <Project frameworkVersion="v3_5" name="OpenSim.ConsoleClient" path="OpenSim/ConsoleClient" type="Exe"> | 1401 | <Project frameworkVersion="v4_0" name="OpenSim.ConsoleClient" path="OpenSim/ConsoleClient" type="Exe"> |
1402 | <Configuration name="Debug"> | 1402 | <Configuration name="Debug"> |
1403 | <Options> | 1403 | <Options> |
1404 | <OutputPath>../../bin/</OutputPath> | 1404 | <OutputPath>../../bin/</OutputPath> |
@@ -1431,7 +1431,7 @@ | |||
1431 | </Files> | 1431 | </Files> |
1432 | </Project> | 1432 | </Project> |
1433 | 1433 | ||
1434 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> | 1434 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> |
1435 | <Configuration name="Debug"> | 1435 | <Configuration name="Debug"> |
1436 | <Options> | 1436 | <Options> |
1437 | <OutputPath>../../../bin/</OutputPath> | 1437 | <OutputPath>../../../bin/</OutputPath> |
@@ -1466,7 +1466,7 @@ | |||
1466 | </Project> | 1466 | </Project> |
1467 | 1467 | ||
1468 | <!-- ClientStack Plugins --> | 1468 | <!-- ClientStack Plugins --> |
1469 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/Linden/UDP" type="Library"> | 1469 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/Linden/UDP" type="Library"> |
1470 | <Configuration name="Debug"> | 1470 | <Configuration name="Debug"> |
1471 | <Options> | 1471 | <Options> |
1472 | <OutputPath>../../../../../bin/</OutputPath> | 1472 | <OutputPath>../../../../../bin/</OutputPath> |
@@ -1512,7 +1512,7 @@ | |||
1512 | 1512 | ||
1513 | 1513 | ||
1514 | 1514 | ||
1515 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library"> | 1515 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library"> |
1516 | <Configuration name="Debug"> | 1516 | <Configuration name="Debug"> |
1517 | <Options> | 1517 | <Options> |
1518 | <OutputPath>../../../../../bin/</OutputPath> | 1518 | <OutputPath>../../../../../bin/</OutputPath> |
@@ -1556,7 +1556,7 @@ | |||
1556 | </Project> | 1556 | </Project> |
1557 | 1557 | ||
1558 | 1558 | ||
1559 | <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> | 1559 | <Project frameworkVersion="v4_0" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> |
1560 | <Configuration name="Debug"> | 1560 | <Configuration name="Debug"> |
1561 | <Options> | 1561 | <Options> |
1562 | <OutputPath>../../../bin/</OutputPath> | 1562 | <OutputPath>../../../bin/</OutputPath> |
@@ -1623,7 +1623,7 @@ | |||
1623 | </Files> | 1623 | </Files> |
1624 | </Project> | 1624 | </Project> |
1625 | 1625 | ||
1626 | <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library"> | 1626 | <Project frameworkVersion="v4_0" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library"> |
1627 | <Configuration name="Debug"> | 1627 | <Configuration name="Debug"> |
1628 | <Options> | 1628 | <Options> |
1629 | <OutputPath>../../../bin/</OutputPath> | 1629 | <OutputPath>../../../bin/</OutputPath> |
@@ -1661,7 +1661,7 @@ | |||
1661 | </Files> | 1661 | </Files> |
1662 | </Project> | 1662 | </Project> |
1663 | 1663 | ||
1664 | <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> | 1664 | <Project frameworkVersion="v4_0" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> |
1665 | <Configuration name="Debug"> | 1665 | <Configuration name="Debug"> |
1666 | <Options> | 1666 | <Options> |
1667 | <OutputPath>../../../bin/</OutputPath> | 1667 | <OutputPath>../../../bin/</OutputPath> |
@@ -1719,7 +1719,7 @@ | |||
1719 | </Project> | 1719 | </Project> |
1720 | 1720 | ||
1721 | <!-- Datastore Plugins --> | 1721 | <!-- Datastore Plugins --> |
1722 | <Project frameworkVersion="v3_5" name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library"> | 1722 | <Project frameworkVersion="v4_0" name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library"> |
1723 | <Configuration name="Debug"> | 1723 | <Configuration name="Debug"> |
1724 | <Options> | 1724 | <Options> |
1725 | <OutputPath>../../../bin/</OutputPath> | 1725 | <OutputPath>../../../bin/</OutputPath> |
@@ -1747,7 +1747,7 @@ | |||
1747 | </Files> | 1747 | </Files> |
1748 | </Project> | 1748 | </Project> |
1749 | 1749 | ||
1750 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library"> | 1750 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library"> |
1751 | <Configuration name="Debug"> | 1751 | <Configuration name="Debug"> |
1752 | <Options> | 1752 | <Options> |
1753 | <OutputPath>../../../../bin/</OutputPath> | 1753 | <OutputPath>../../../../bin/</OutputPath> |
@@ -1772,7 +1772,7 @@ | |||
1772 | </Files> | 1772 | </Files> |
1773 | </Project> | 1773 | </Project> |
1774 | 1774 | ||
1775 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library"> | 1775 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library"> |
1776 | <Configuration name="Debug"> | 1776 | <Configuration name="Debug"> |
1777 | <Options> | 1777 | <Options> |
1778 | <OutputPath>../../../../bin/Physics/</OutputPath> | 1778 | <OutputPath>../../../../bin/Physics/</OutputPath> |
@@ -1811,7 +1811,7 @@ | |||
1811 | </Project> | 1811 | </Project> |
1812 | 1812 | ||
1813 | <!-- OpenSim app --> | 1813 | <!-- OpenSim app --> |
1814 | <Project frameworkVersion="v3_5" name="OpenSim" path="OpenSim/Region/Application" type="Exe"> | 1814 | <Project frameworkVersion="v4_0" name="OpenSim" path="OpenSim/Region/Application" type="Exe"> |
1815 | <Configuration name="Debug"> | 1815 | <Configuration name="Debug"> |
1816 | <Options> | 1816 | <Options> |
1817 | <OutputPath>../../../bin/</OutputPath> | 1817 | <OutputPath>../../../bin/</OutputPath> |
@@ -1856,7 +1856,7 @@ | |||
1856 | </Files> | 1856 | </Files> |
1857 | </Project> | 1857 | </Project> |
1858 | 1858 | ||
1859 | <Project frameworkVersion="v3_5" name="OpenSim.ApplicationPlugins.LoadRegions" path="OpenSim/ApplicationPlugins/LoadRegions" type="Library"> | 1859 | <Project frameworkVersion="v4_0" name="OpenSim.ApplicationPlugins.LoadRegions" path="OpenSim/ApplicationPlugins/LoadRegions" type="Library"> |
1860 | <Configuration name="Debug"> | 1860 | <Configuration name="Debug"> |
1861 | <Options> | 1861 | <Options> |
1862 | <OutputPath>../../../bin/</OutputPath> | 1862 | <OutputPath>../../../bin/</OutputPath> |
@@ -1891,7 +1891,7 @@ | |||
1891 | </Files> | 1891 | </Files> |
1892 | </Project> | 1892 | </Project> |
1893 | 1893 | ||
1894 | <Project frameworkVersion="v3_5" name="OpenSim.ApplicationPlugins.RegionModulesController" path="OpenSim/ApplicationPlugins/RegionModulesController" type="Library"> | 1894 | <Project frameworkVersion="v4_0" name="OpenSim.ApplicationPlugins.RegionModulesController" path="OpenSim/ApplicationPlugins/RegionModulesController" type="Library"> |
1895 | <Configuration name="Debug"> | 1895 | <Configuration name="Debug"> |
1896 | <Options> | 1896 | <Options> |
1897 | <OutputPath>../../../bin/</OutputPath> | 1897 | <OutputPath>../../../bin/</OutputPath> |
@@ -1921,7 +1921,7 @@ | |||
1921 | </Files> | 1921 | </Files> |
1922 | </Project> | 1922 | </Project> |
1923 | 1923 | ||
1924 | <Project frameworkVersion="v3_5" name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library"> | 1924 | <Project frameworkVersion="v4_0" name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library"> |
1925 | <Configuration name="Debug"> | 1925 | <Configuration name="Debug"> |
1926 | <Options> | 1926 | <Options> |
1927 | <OutputPath>../../../bin/</OutputPath> | 1927 | <OutputPath>../../../bin/</OutputPath> |
@@ -1963,7 +1963,7 @@ | |||
1963 | 1963 | ||
1964 | <!-- Scene Server API Example Apps --> | 1964 | <!-- Scene Server API Example Apps --> |
1965 | 1965 | ||
1966 | <Project frameworkVersion="v3_5" name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library"> | 1966 | <Project frameworkVersion="v4_0" name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library"> |
1967 | <Configuration name="Debug"> | 1967 | <Configuration name="Debug"> |
1968 | <Options> | 1968 | <Options> |
1969 | <OutputPath>../../../bin/</OutputPath> | 1969 | <OutputPath>../../../bin/</OutputPath> |
@@ -2000,7 +2000,7 @@ | |||
2000 | </Project> | 2000 | </Project> |
2001 | 2001 | ||
2002 | <!-- Data Base Modules --> | 2002 | <!-- Data Base Modules --> |
2003 | <Project frameworkVersion="v3_5" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library"> | 2003 | <Project frameworkVersion="v4_0" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library"> |
2004 | <Configuration name="Debug"> | 2004 | <Configuration name="Debug"> |
2005 | <Options> | 2005 | <Options> |
2006 | <OutputPath>../../../bin/</OutputPath> | 2006 | <OutputPath>../../../bin/</OutputPath> |
@@ -2039,7 +2039,7 @@ | |||
2039 | </Files> | 2039 | </Files> |
2040 | </Project> | 2040 | </Project> |
2041 | 2041 | ||
2042 | <Project frameworkVersion="v3_5" name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library"> | 2042 | <Project frameworkVersion="v4_0" name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library"> |
2043 | <Configuration name="Debug"> | 2043 | <Configuration name="Debug"> |
2044 | <Options> | 2044 | <Options> |
2045 | <OutputPath>../../../bin/</OutputPath> | 2045 | <OutputPath>../../../bin/</OutputPath> |
@@ -2073,7 +2073,7 @@ | |||
2073 | </Files> | 2073 | </Files> |
2074 | </Project> | 2074 | </Project> |
2075 | 2075 | ||
2076 | <Project frameworkVersion="v3_5" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library"> | 2076 | <Project frameworkVersion="v4_0" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library"> |
2077 | <Configuration name="Debug"> | 2077 | <Configuration name="Debug"> |
2078 | <Options> | 2078 | <Options> |
2079 | <OutputPath>../../../bin/</OutputPath> | 2079 | <OutputPath>../../../bin/</OutputPath> |
@@ -2109,7 +2109,7 @@ | |||
2109 | </Files> | 2109 | </Files> |
2110 | </Project> | 2110 | </Project> |
2111 | 2111 | ||
2112 | <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library"> | 2112 | <Project frameworkVersion="v4_0" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library"> |
2113 | <Configuration name="Debug"> | 2113 | <Configuration name="Debug"> |
2114 | <Options> | 2114 | <Options> |
2115 | <OutputPath>../../../bin/</OutputPath> | 2115 | <OutputPath>../../../bin/</OutputPath> |
@@ -2151,7 +2151,7 @@ | |||
2151 | </Project> | 2151 | </Project> |
2152 | 2152 | ||
2153 | 2153 | ||
2154 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> | 2154 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> |
2155 | <Configuration name="Debug"> | 2155 | <Configuration name="Debug"> |
2156 | <Options> | 2156 | <Options> |
2157 | <OutputPath>../../../../bin/</OutputPath> | 2157 | <OutputPath>../../../../bin/</OutputPath> |
@@ -2188,7 +2188,7 @@ | |||
2188 | </Files> | 2188 | </Files> |
2189 | </Project> | 2189 | </Project> |
2190 | 2190 | ||
2191 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime" type="Library"> | 2191 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime" type="Library"> |
2192 | <Configuration name="Debug"> | 2192 | <Configuration name="Debug"> |
2193 | <Options> | 2193 | <Options> |
2194 | <OutputPath>../../../../../../bin/</OutputPath> | 2194 | <OutputPath>../../../../../../bin/</OutputPath> |
@@ -2221,7 +2221,7 @@ | |||
2221 | </Files> | 2221 | </Files> |
2222 | </Project> | 2222 | </Project> |
2223 | 2223 | ||
2224 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.YieldProlog" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/" type="Library"> | 2224 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.YieldProlog" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/" type="Library"> |
2225 | <Configuration name="Debug"> | 2225 | <Configuration name="Debug"> |
2226 | <Options> | 2226 | <Options> |
2227 | <OutputPath>../../../../../../../bin/</OutputPath> | 2227 | <OutputPath>../../../../../../../bin/</OutputPath> |
@@ -2253,7 +2253,7 @@ | |||
2253 | </Files> | 2253 | </Files> |
2254 | </Project> | 2254 | </Project> |
2255 | 2255 | ||
2256 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.Api" path="OpenSim/Region/ScriptEngine/Shared/Api/Implementation" type="Library"> | 2256 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.Api" path="OpenSim/Region/ScriptEngine/Shared/Api/Implementation" type="Library"> |
2257 | <Configuration name="Debug"> | 2257 | <Configuration name="Debug"> |
2258 | <Options> | 2258 | <Options> |
2259 | <OutputPath>../../../../../../bin/</OutputPath> | 2259 | <OutputPath>../../../../../../bin/</OutputPath> |
@@ -2293,7 +2293,7 @@ | |||
2293 | </Files> | 2293 | </Files> |
2294 | </Project> | 2294 | </Project> |
2295 | 2295 | ||
2296 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Region/ScriptEngine/Shared/CodeTools" type="Library"> | 2296 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Region/ScriptEngine/Shared/CodeTools" type="Library"> |
2297 | <Configuration name="Debug"> | 2297 | <Configuration name="Debug"> |
2298 | <Options> | 2298 | <Options> |
2299 | <OutputPath>../../../../../bin/</OutputPath> | 2299 | <OutputPath>../../../../../bin/</OutputPath> |
@@ -2324,7 +2324,7 @@ | |||
2324 | </Files> | 2324 | </Files> |
2325 | </Project> | 2325 | </Project> |
2326 | 2326 | ||
2327 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared.Instance" path="OpenSim/Region/ScriptEngine/Shared/Instance" type="Library"> | 2327 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Shared.Instance" path="OpenSim/Region/ScriptEngine/Shared/Instance" type="Library"> |
2328 | <Configuration name="Debug"> | 2328 | <Configuration name="Debug"> |
2329 | <Options> | 2329 | <Options> |
2330 | <OutputPath>../../../../../bin/</OutputPath> | 2330 | <OutputPath>../../../../../bin/</OutputPath> |
@@ -2364,7 +2364,7 @@ | |||
2364 | </Files> | 2364 | </Files> |
2365 | </Project> | 2365 | </Project> |
2366 | 2366 | ||
2367 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library"> | 2367 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library"> |
2368 | <Configuration name="Debug"> | 2368 | <Configuration name="Debug"> |
2369 | <Options> | 2369 | <Options> |
2370 | <OutputPath>../../../../../../bin/</OutputPath> | 2370 | <OutputPath>../../../../../../bin/</OutputPath> |
@@ -2398,7 +2398,7 @@ | |||
2398 | </Files> | 2398 | </Files> |
2399 | </Project> | 2399 | </Project> |
2400 | 2400 | ||
2401 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library"> | 2401 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library"> |
2402 | <Configuration name="Debug"> | 2402 | <Configuration name="Debug"> |
2403 | <Options> | 2403 | <Options> |
2404 | <OutputPath>../../../../bin/</OutputPath> | 2404 | <OutputPath>../../../../bin/</OutputPath> |
@@ -2443,7 +2443,7 @@ | |||
2443 | </Files> | 2443 | </Files> |
2444 | </Project> | 2444 | </Project> |
2445 | 2445 | ||
2446 | <Project frameworkVersion="v3_5" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library"> | 2446 | <Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library"> |
2447 | <Configuration name="Debug"> | 2447 | <Configuration name="Debug"> |
2448 | <Options> | 2448 | <Options> |
2449 | <OutputPath>../../../bin/</OutputPath> | 2449 | <OutputPath>../../../bin/</OutputPath> |
@@ -2494,7 +2494,7 @@ | |||
2494 | 2494 | ||
2495 | <!-- Addons --> | 2495 | <!-- Addons --> |
2496 | 2496 | ||
2497 | <Project frameworkVersion="v3_5" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library"> | 2497 | <Project frameworkVersion="v4_0" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library"> |
2498 | <Configuration name="Debug"> | 2498 | <Configuration name="Debug"> |
2499 | <Options> | 2499 | <Options> |
2500 | <OutputPath>../../../bin/</OutputPath> | 2500 | <OutputPath>../../../bin/</OutputPath> |
@@ -2541,7 +2541,7 @@ | |||
2541 | </Files> | 2541 | </Files> |
2542 | </Project> | 2542 | </Project> |
2543 | 2543 | ||
2544 | <Project frameworkVersion="v3_5" name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library"> | 2544 | <Project frameworkVersion="v4_0" name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library"> |
2545 | <Configuration name="Debug"> | 2545 | <Configuration name="Debug"> |
2546 | <Options> | 2546 | <Options> |
2547 | <OutputPath>../../../bin/</OutputPath> | 2547 | <OutputPath>../../../bin/</OutputPath> |
@@ -2592,7 +2592,7 @@ | |||
2592 | 2592 | ||
2593 | <!-- Tools --> | 2593 | <!-- Tools --> |
2594 | 2594 | ||
2595 | <Project frameworkVersion="v3_5" name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe"> | 2595 | <Project frameworkVersion="v4_0" name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe"> |
2596 | <Configuration name="Debug"> | 2596 | <Configuration name="Debug"> |
2597 | <Options> | 2597 | <Options> |
2598 | <OutputPath>../../../bin/</OutputPath> | 2598 | <OutputPath>../../../bin/</OutputPath> |
@@ -2619,7 +2619,7 @@ | |||
2619 | </Files> | 2619 | </Files> |
2620 | </Project> | 2620 | </Project> |
2621 | 2621 | ||
2622 | <Project frameworkVersion="v3_5" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe"> | 2622 | <Project frameworkVersion="v4_0" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe"> |
2623 | <Configuration name="Debug"> | 2623 | <Configuration name="Debug"> |
2624 | <Options> | 2624 | <Options> |
2625 | <OutputPath>../../../bin/</OutputPath> | 2625 | <OutputPath>../../../bin/</OutputPath> |
@@ -2646,7 +2646,7 @@ | |||
2646 | </Files> | 2646 | </Files> |
2647 | </Project> | 2647 | </Project> |
2648 | 2648 | ||
2649 | <Project frameworkVersion="v3_5" name="OpenSim.Tools.Configger" path="OpenSim/Tools/Configger" type="Exe"> | 2649 | <Project frameworkVersion="v4_0" name="OpenSim.Tools.Configger" path="OpenSim/Tools/Configger" type="Exe"> |
2650 | <Configuration name="Debug"> | 2650 | <Configuration name="Debug"> |
2651 | <Options> | 2651 | <Options> |
2652 | <OutputPath>../../../bin/</OutputPath> | 2652 | <OutputPath>../../../bin/</OutputPath> |
@@ -2670,7 +2670,7 @@ | |||
2670 | </Project> | 2670 | </Project> |
2671 | 2671 | ||
2672 | <!-- Test Clients --> | 2672 | <!-- Test Clients --> |
2673 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe"> | 2673 | <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe"> |
2674 | <Configuration name="Debug"> | 2674 | <Configuration name="Debug"> |
2675 | <Options> | 2675 | <Options> |
2676 | <OutputPath>../../../../bin/</OutputPath> | 2676 | <OutputPath>../../../../bin/</OutputPath> |
@@ -2697,7 +2697,7 @@ | |||
2697 | </Files> | 2697 | </Files> |
2698 | </Project> | 2698 | </Project> |
2699 | 2699 | ||
2700 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe"> | 2700 | <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe"> |
2701 | <Configuration name="Debug"> | 2701 | <Configuration name="Debug"> |
2702 | <Options> | 2702 | <Options> |
2703 | <OutputPath>../../../../bin/</OutputPath> | 2703 | <OutputPath>../../../../bin/</OutputPath> |
@@ -2724,7 +2724,7 @@ | |||
2724 | </Files> | 2724 | </Files> |
2725 | </Project> | 2725 | </Project> |
2726 | 2726 | ||
2727 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.PresenceClient" path="OpenSim/Tests/Clients/Presence" type="Exe"> | 2727 | <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.PresenceClient" path="OpenSim/Tests/Clients/Presence" type="Exe"> |
2728 | <Configuration name="Debug"> | 2728 | <Configuration name="Debug"> |
2729 | <Options> | 2729 | <Options> |
2730 | <OutputPath>../../../../bin/</OutputPath> | 2730 | <OutputPath>../../../../bin/</OutputPath> |
@@ -2751,7 +2751,7 @@ | |||
2751 | </Files> | 2751 | </Files> |
2752 | </Project> | 2752 | </Project> |
2753 | 2753 | ||
2754 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.UserAccountClient" path="OpenSim/Tests/Clients/UserAccounts" type="Exe"> | 2754 | <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.UserAccountClient" path="OpenSim/Tests/Clients/UserAccounts" type="Exe"> |
2755 | <Configuration name="Debug"> | 2755 | <Configuration name="Debug"> |
2756 | <Options> | 2756 | <Options> |
2757 | <OutputPath>../../../../bin/</OutputPath> | 2757 | <OutputPath>../../../../bin/</OutputPath> |
@@ -2778,7 +2778,7 @@ | |||
2778 | </Files> | 2778 | </Files> |
2779 | </Project> | 2779 | </Project> |
2780 | 2780 | ||
2781 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.InstantantMessage" path="OpenSim/Tests/Clients/InstantMessage" type="Exe"> | 2781 | <Project frameworkVersion="v4_0" name="OpenSim.Tests.Clients.InstantantMessage" path="OpenSim/Tests/Clients/InstantMessage" type="Exe"> |
2782 | <Configuration name="Debug"> | 2782 | <Configuration name="Debug"> |
2783 | <Options> | 2783 | <Options> |
2784 | <OutputPath>../../../../bin/</OutputPath> | 2784 | <OutputPath>../../../../bin/</OutputPath> |
@@ -2806,7 +2806,7 @@ | |||
2806 | </Project> | 2806 | </Project> |
2807 | 2807 | ||
2808 | <!-- Test assemblies --> | 2808 | <!-- Test assemblies --> |
2809 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library"> | 2809 | <Project frameworkVersion="v4_0" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library"> |
2810 | <Configuration name="Debug"> | 2810 | <Configuration name="Debug"> |
2811 | <Options> | 2811 | <Options> |
2812 | <OutputPath>../../../bin/</OutputPath> | 2812 | <OutputPath>../../../bin/</OutputPath> |
@@ -2853,7 +2853,7 @@ | |||
2853 | </Files> | 2853 | </Files> |
2854 | </Project> | 2854 | </Project> |
2855 | 2855 | ||
2856 | <Project frameworkVersion="v3_5" name="OpenSim.Tests" path="OpenSim/Tests" type="Library"> | 2856 | <Project frameworkVersion="v4_0" name="OpenSim.Tests" path="OpenSim/Tests" type="Library"> |
2857 | <Configuration name="Debug"> | 2857 | <Configuration name="Debug"> |
2858 | <Options> | 2858 | <Options> |
2859 | <OutputPath>../../bin/</OutputPath> | 2859 | <OutputPath>../../bin/</OutputPath> |
@@ -2876,7 +2876,7 @@ | |||
2876 | </Files> | 2876 | </Files> |
2877 | </Project> | 2877 | </Project> |
2878 | 2878 | ||
2879 | <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library"> | 2879 | <Project frameworkVersion="v4_0" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library"> |
2880 | <Configuration name="Debug"> | 2880 | <Configuration name="Debug"> |
2881 | <Options> | 2881 | <Options> |
2882 | <OutputPath>../../../../bin/</OutputPath> | 2882 | <OutputPath>../../../../bin/</OutputPath> |
@@ -2919,7 +2919,7 @@ | |||
2919 | </Project> | 2919 | </Project> |
2920 | 2920 | ||
2921 | 2921 | ||
2922 | <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library"> | 2922 | <Project frameworkVersion="v4_0" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library"> |
2923 | <Configuration name="Debug"> | 2923 | <Configuration name="Debug"> |
2924 | <Options> | 2924 | <Options> |
2925 | <OutputPath>../../../bin/</OutputPath> | 2925 | <OutputPath>../../../bin/</OutputPath> |
@@ -2969,7 +2969,7 @@ | |||
2969 | </Project> | 2969 | </Project> |
2970 | 2970 | ||
2971 | 2971 | ||
2972 | <Project frameworkVersion="v3_5" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library"> | 2972 | <Project frameworkVersion="v4_0" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library"> |
2973 | <Configuration name="Debug"> | 2973 | <Configuration name="Debug"> |
2974 | <Options> | 2974 | <Options> |
2975 | <OutputPath>../../../bin/</OutputPath> | 2975 | <OutputPath>../../../bin/</OutputPath> |
@@ -3011,7 +3011,7 @@ | |||
3011 | </Files> | 3011 | </Files> |
3012 | </Project> | 3012 | </Project> |
3013 | 3013 | ||
3014 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library"> | 3014 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library"> |
3015 | <Configuration name="Debug"> | 3015 | <Configuration name="Debug"> |
3016 | <Options> | 3016 | <Options> |
3017 | <OutputPath>../../../bin/</OutputPath> | 3017 | <OutputPath>../../../bin/</OutputPath> |
@@ -3042,7 +3042,7 @@ | |||
3042 | </Files> | 3042 | </Files> |
3043 | </Project> | 3043 | </Project> |
3044 | 3044 | ||
3045 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library"> | 3045 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library"> |
3046 | <Configuration name="Debug"> | 3046 | <Configuration name="Debug"> |
3047 | <Options> | 3047 | <Options> |
3048 | <OutputPath>../../../../bin/</OutputPath> | 3048 | <OutputPath>../../../../bin/</OutputPath> |
@@ -3073,7 +3073,7 @@ | |||
3073 | </Files> | 3073 | </Files> |
3074 | </Project> | 3074 | </Project> |
3075 | 3075 | ||
3076 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library"> | 3076 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library"> |
3077 | <Configuration name="Debug"> | 3077 | <Configuration name="Debug"> |
3078 | <Options> | 3078 | <Options> |
3079 | <OutputPath>../../../../bin/</OutputPath> | 3079 | <OutputPath>../../../../bin/</OutputPath> |
@@ -3103,7 +3103,7 @@ | |||
3103 | </Files> | 3103 | </Files> |
3104 | </Project> | 3104 | </Project> |
3105 | 3105 | ||
3106 | <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library"> | 3106 | <Project frameworkVersion="v4_0" name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library"> |
3107 | <Configuration name="Debug"> | 3107 | <Configuration name="Debug"> |
3108 | <Options> | 3108 | <Options> |
3109 | <OutputPath>../../../bin/</OutputPath> | 3109 | <OutputPath>../../../bin/</OutputPath> |
@@ -3182,7 +3182,7 @@ | |||
3182 | </Files> | 3182 | </Files> |
3183 | </Project> | 3183 | </Project> |
3184 | 3184 | ||
3185 | <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules.Tests" path="OpenSim/Region/OptionalModules" type="Library"> | 3185 | <Project frameworkVersion="v4_0" name="OpenSim.Region.OptionalModules.Tests" path="OpenSim/Region/OptionalModules" type="Library"> |
3186 | <Configuration name="Debug"> | 3186 | <Configuration name="Debug"> |
3187 | <Options> | 3187 | <Options> |
3188 | <OutputPath>../../../bin/</OutputPath> | 3188 | <OutputPath>../../../bin/</OutputPath> |
@@ -3243,7 +3243,7 @@ | |||
3243 | </Files> | 3243 | </Files> |
3244 | </Project> | 3244 | </Project> |
3245 | 3245 | ||
3246 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library"> | 3246 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library"> |
3247 | <Configuration name="Debug"> | 3247 | <Configuration name="Debug"> |
3248 | <Options> | 3248 | <Options> |
3249 | <OutputPath>../../../bin/</OutputPath> | 3249 | <OutputPath>../../../bin/</OutputPath> |
@@ -3303,7 +3303,7 @@ | |||
3303 | </Files> | 3303 | </Files> |
3304 | </Project> | 3304 | </Project> |
3305 | 3305 | ||
3306 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library"> | 3306 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library"> |
3307 | <Configuration name="Debug"> | 3307 | <Configuration name="Debug"> |
3308 | <Options> | 3308 | <Options> |
3309 | <OutputPath>../../../../../bin/</OutputPath> | 3309 | <OutputPath>../../../../../bin/</OutputPath> |
@@ -3340,7 +3340,7 @@ | |||
3340 | </Files> | 3340 | </Files> |
3341 | </Project> | 3341 | </Project> |
3342 | 3342 | ||
3343 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library"> | 3343 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library"> |
3344 | <Configuration name="Debug"> | 3344 | <Configuration name="Debug"> |
3345 | <Options> | 3345 | <Options> |
3346 | <OutputPath>../../../../../../bin/</OutputPath> | 3346 | <OutputPath>../../../../../../bin/</OutputPath> |
@@ -3376,7 +3376,7 @@ | |||
3376 | </Files> | 3376 | </Files> |
3377 | </Project> | 3377 | </Project> |
3378 | 3378 | ||
3379 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library"> | 3379 | <Project frameworkVersion="v4_0" name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library"> |
3380 | <Configuration name="Debug"> | 3380 | <Configuration name="Debug"> |
3381 | <Options> | 3381 | <Options> |
3382 | <OutputPath>../../../bin/</OutputPath> | 3382 | <OutputPath>../../../bin/</OutputPath> |
@@ -3435,7 +3435,7 @@ | |||
3435 | TODO: this is kind of lame, we basically build a duplicate | 3435 | TODO: this is kind of lame, we basically build a duplicate |
3436 | assembly but with tests added in, just because we can't resolve cross-bin-dir-refs. | 3436 | assembly but with tests added in, just because we can't resolve cross-bin-dir-refs. |
3437 | --> | 3437 | --> |
3438 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin/Tests" type="Library"> | 3438 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin/Tests" type="Library"> |
3439 | <Configuration name="Debug"> | 3439 | <Configuration name="Debug"> |
3440 | <Options> | 3440 | <Options> |
3441 | <OutputPath>../../../../../bin/</OutputPath> | 3441 | <OutputPath>../../../../../bin/</OutputPath> |
@@ -3466,7 +3466,7 @@ | |||
3466 | </Files> | 3466 | </Files> |
3467 | </Project> | 3467 | </Project> |
3468 | 3468 | ||
3469 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin.Tests" path="OpenSim/Region/Physics/BulletSPlugin/Tests" type="Library"> | 3469 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin.Tests" path="OpenSim/Region/Physics/BulletSPlugin/Tests" type="Library"> |
3470 | <Configuration name="Debug"> | 3470 | <Configuration name="Debug"> |
3471 | <Options> | 3471 | <Options> |
3472 | <OutputPath>../../../../../bin/</OutputPath> | 3472 | <OutputPath>../../../../../bin/</OutputPath> |
@@ -3500,7 +3500,7 @@ | |||
3500 | </Project> | 3500 | </Project> |
3501 | 3501 | ||
3502 | 3502 | ||
3503 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library"> | 3503 | <Project frameworkVersion="v4_0" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library"> |
3504 | <Configuration name="Debug"> | 3504 | <Configuration name="Debug"> |
3505 | <Options> | 3505 | <Options> |
3506 | <OutputPath>../../../bin/</OutputPath> | 3506 | <OutputPath>../../../bin/</OutputPath> |
@@ -3546,7 +3546,7 @@ | |||
3546 | </Files> | 3546 | </Files> |
3547 | </Project> | 3547 | </Project> |
3548 | 3548 | ||
3549 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library"> | 3549 | <Project frameworkVersion="v4_0" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library"> |
3550 | <Configuration name="Debug"> | 3550 | <Configuration name="Debug"> |
3551 | <Options> | 3551 | <Options> |
3552 | <OutputPath>../../../bin/</OutputPath> | 3552 | <OutputPath>../../../bin/</OutputPath> |
@@ -3587,7 +3587,7 @@ | |||
3587 | </Files> | 3587 | </Files> |
3588 | </Project> | 3588 | </Project> |
3589 | 3589 | ||
3590 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library"> | 3590 | <Project frameworkVersion="v4_0" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library"> |
3591 | <Configuration name="Debug"> | 3591 | <Configuration name="Debug"> |
3592 | <Options> | 3592 | <Options> |
3593 | <OutputPath>../../../bin/</OutputPath> | 3593 | <OutputPath>../../../bin/</OutputPath> |
diff --git a/runprebuild.bat b/runprebuild.bat index 8927e9a..0fd7bbf 100755 --- a/runprebuild.bat +++ b/runprebuild.bat | |||
@@ -1,4 +1,24 @@ | |||
1 | @echo OFF | ||
2 | |||
1 | bin\Prebuild.exe /target nant | 3 | bin\Prebuild.exe /target nant |
2 | bin\Prebuild.exe /target vs2008 | 4 | bin\Prebuild.exe /target vs2010 |
3 | echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild opensim.sln > compile.bat | 5 | |
6 | setlocal ENABLEEXTENSIONS | ||
7 | set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0" | ||
8 | set VALUE_NAME=MSBuildToolsPath | ||
9 | |||
10 | FOR /F "usebackq skip=4 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO ( | ||
11 | set ValueName=%%A | ||
12 | set ValueType=%%B | ||
13 | set ValueValue=%%C | ||
14 | ) | ||
15 | |||
16 | if defined ValueName ( | ||
17 | @echo Value Name = %ValueName% | ||
18 | @echo Value Type = %ValueType% | ||
19 | @echo Value Value = %ValueValue% | ||
20 | ) else ( | ||
21 | @echo %KEY_NAME%\%VALUE_NAME% not found. | ||
22 | ) | ||
4 | 23 | ||
24 | @echo %ValueValue%\msbuild opensim.sln > compile.bat | ||
diff --git a/runprebuild2010.bat b/runprebuild2010.bat deleted file mode 100755 index 8c832b3..0000000 --- a/runprebuild2010.bat +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | bin\Prebuild.exe /target vs2010 | ||
2 | echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenSim.sln > compile.bat | ||