diff --git a/CSJ2K/CSJ2K.csproj b/CSJ2K/CSJ2K.csproj
index 9aeb3825..d82766d9 100644
--- a/CSJ2K/CSJ2K.csproj
+++ b/CSJ2K/CSJ2K.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj
index 52d44e63..d47cc2d0 100644
--- a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj
+++ b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj
@@ -1,4 +1,4 @@
-
+
Local
@@ -45,7 +45,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -65,7 +65,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj
index e8bf7619..06736ca2 100644
--- a/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj
+++ b/LibreMetaverse.Rendering.Meshmerizer/LibreMetaverse.Rendering.Meshmerizer.csproj
@@ -1,4 +1,4 @@
-
+
Local
@@ -45,7 +45,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -66,7 +66,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj
index b75a9eec..b8e0cdf1 100644
--- a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj
+++ b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj
@@ -1,4 +1,4 @@
-
+
Local
@@ -45,7 +45,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -66,7 +66,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/LibreMetaverse.StructuredData/JSON/JsonException.cs b/LibreMetaverse.StructuredData/JSON/JsonException.cs
index d99593b2..38f695b5 100644
--- a/LibreMetaverse.StructuredData/JSON/JsonException.cs
+++ b/LibreMetaverse.StructuredData/JSON/JsonException.cs
@@ -14,6 +14,7 @@ using System;
namespace LitJson
{
+ [Serializable]
public class JsonException : ApplicationException
{
public JsonException () : base ()
diff --git a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj
index ddd1ece2..125f217e 100644
--- a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj
+++ b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj
@@ -1,4 +1,4 @@
-
+
Local
@@ -45,7 +45,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -65,7 +65,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/LibreMetaverse.StructuredData/StructuredData.cs b/LibreMetaverse.StructuredData/StructuredData.cs
index 94b0d9f8..e9e1ac63 100644
--- a/LibreMetaverse.StructuredData/StructuredData.cs
+++ b/LibreMetaverse.StructuredData/StructuredData.cs
@@ -72,6 +72,7 @@ namespace OpenMetaverse.StructuredData
///
///
///
+ [Serializable]
public class OSDException : Exception
{
public OSDException(string message) : base(message) { }
diff --git a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj
index eef4f5f0..356c1ccb 100644
--- a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj
+++ b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj
@@ -1,4 +1,4 @@
-
+
Local
14.0.25123
@@ -44,7 +44,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -65,7 +65,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj
index 8b90f3c4..149bf8cc 100644
--- a/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj
+++ b/LibreMetaverse.Utilities/LibreMetaverse.Utilities.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/LibreMetaverse.sln b/LibreMetaverse.sln
index 1a2047b6..e33b91c7 100644
--- a/LibreMetaverse.sln
+++ b/LibreMetaverse.sln
@@ -1,58 +1,58 @@
Microsoft Visual Studio Solution File, Format Version 14.00
# Visual Studio 2015
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvatarPreview", "..\libremetaverse\Programs\AvatarPreview\AvatarPreview.csproj", "{93CEA633-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvatarPreview", ".\Programs\AvatarPreview\AvatarPreview.csproj", "{93CEA633-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baker", "..\libremetaverse\Programs\Baker\Baker.csproj", "{95F42663-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baker", ".\Programs\Baker\Baker.csproj", "{95F42663-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSJ2K", "..\libremetaverse\CSJ2K\CSJ2K.csproj", "{C276743B-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSJ2K", ".\CSJ2K\CSJ2K.csproj", "{C276743B-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard", "..\libremetaverse\Programs\examples\Dashboard\Dashboard.csproj", "{592827AA-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard", ".\Programs\examples\Dashboard\Dashboard.csproj", "{592827AA-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridAccountant", "..\libremetaverse\Programs\examples\GridAccountant\GridAccountant.csproj", "{6DE58F9A-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridAccountant", ".\Programs\examples\GridAccountant\GridAccountant.csproj", "{6DE58F9A-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridImageUpload", "..\libremetaverse\Programs\GridImageUpload\GridImageUpload.csproj", "{06BD6C42-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridImageUpload", ".\Programs\GridImageUpload\GridImageUpload.csproj", "{06BD6C42-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridProxy", "..\libremetaverse\Programs\GridProxy\GridProxy.csproj", "{79B51DAA-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridProxy", ".\Programs\GridProxy\GridProxy.csproj", "{79B51DAA-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridProxyApp", "..\libremetaverse\Programs\GridProxy\GridProxyApp.csproj", "{CF6ECF45-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridProxyApp", ".\Programs\GridProxy\GridProxyApp.csproj", "{CF6ECF45-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "groupmanager", "..\libremetaverse\Programs\examples\groupmanager\groupmanager.csproj", "{97A800BC-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "groupmanager", ".\Programs\examples\groupmanager\groupmanager.csproj", "{97A800BC-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heightmap", "..\libremetaverse\Programs\examples\Heightmap\Heightmap.csproj", "{16044D2B-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heightmap", ".\Programs\examples\Heightmap\Heightmap.csproj", "{16044D2B-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "importprimscript", "..\libremetaverse\Programs\importprimscript\importprimscript.csproj", "{95C06600-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "importprimscript", ".\Programs\importprimscript\importprimscript.csproj", "{95C06600-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRCGateway", "..\libremetaverse\Programs\examples\IRCGateway\IRCGateway.csproj", "{89049BBC-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRCGateway", ".\Programs\examples\IRCGateway\IRCGateway.csproj", "{89049BBC-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse", "..\libremetaverse\LibreMetaverse\LibreMetaverse.csproj", "{27C70F3A-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse", ".\LibreMetaverse\LibreMetaverse.csproj", "{27C70F3A-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.GUI", "..\libremetaverse\LibreMetaverse.GUI\LibreMetaverse.GUI.csproj", "{09C292AF-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.GUI", ".\LibreMetaverse.GUI\LibreMetaverse.GUI.csproj", "{09C292AF-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Rendering.Meshmerizer", "..\libremetaverse\LibreMetaverse.Rendering.Meshmerizer\LibreMetaverse.Rendering.Meshmerizer.csproj", "{95479B1D-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Rendering.Meshmerizer", ".\LibreMetaverse.Rendering.Meshmerizer\LibreMetaverse.Rendering.Meshmerizer.csproj", "{95479B1D-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Rendering.Simple", "..\libremetaverse\LibreMetaverse.Rendering.Simple\LibreMetaverse.Rendering.Simple.csproj", "{29E206AC-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Rendering.Simple", ".\LibreMetaverse.Rendering.Simple\LibreMetaverse.Rendering.Simple.csproj", "{29E206AC-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.StructuredData", "..\libremetaverse\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj", "{89D7A3E5-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.StructuredData", ".\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj", "{89D7A3E5-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Tests", "..\libremetaverse\LibreMetaverse.Tests\LibreMetaverse.Tests.csproj", "{0CCC2C3D-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Tests", ".\LibreMetaverse.Tests\LibreMetaverse.Tests.csproj", "{0CCC2C3D-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Utilities", "..\libremetaverse\LibreMetaverse.Utilities\LibreMetaverse.Utilities.csproj", "{1266CE08-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverse.Utilities", ".\LibreMetaverse.Utilities\LibreMetaverse.Utilities.csproj", "{1266CE08-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverseTypes", "..\libremetaverse\LibreMetaverseTypes\LibreMetaverseTypes.csproj", "{B37B02AD-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreMetaverseTypes", ".\LibreMetaverseTypes\LibreMetaverseTypes.csproj", "{B37B02AD-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mapgenerator", "..\libremetaverse\Programs\mapgenerator\mapgenerator.csproj", "{2867B4B3-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mapgenerator", ".\Programs\mapgenerator\mapgenerator.csproj", "{2867B4B3-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PacketDump", "..\libremetaverse\Programs\examples\PacketDump\PacketDump.csproj", "{58443010-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PacketDump", ".\Programs\examples\PacketDump\PacketDump.csproj", "{58443010-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrimWorkshop", "..\libremetaverse\Programs\PrimWorkshop\PrimWorkshop.csproj", "{AC949F03-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrimWorkshop", ".\Programs\PrimWorkshop\PrimWorkshop.csproj", "{AC949F03-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "..\libremetaverse\Programs\examples\TestClient\TestClient.csproj", "{9F71FDB3-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", ".\Programs\examples\TestClient\TestClient.csproj", "{9F71FDB3-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualParamGenerator", "..\libremetaverse\Programs\VisualParamGenerator\VisualParamGenerator.csproj", "{CF93CDA8-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualParamGenerator", ".\Programs\VisualParamGenerator\VisualParamGenerator.csproj", "{CF93CDA8-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoiceTest", "..\libremetaverse\Programs\VoiceTest\VoiceTest.csproj", "{EE4EA934-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoiceTest", ".\Programs\VoiceTest\VoiceTest.csproj", "{EE4EA934-0000-0000-0000-000000000000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinGridProxy", "..\libremetaverse\Programs\WinGridProxy\WinGridProxy.csproj", "{455B06F4-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinGridProxy", ".\Programs\WinGridProxy\WinGridProxy.csproj", "{455B06F4-0000-0000-0000-000000000000}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/LibreMetaverse/Capabilities/CapsBase.cs b/LibreMetaverse/Capabilities/CapsBase.cs
index bdb049f3..5413691a 100644
--- a/LibreMetaverse/Capabilities/CapsBase.cs
+++ b/LibreMetaverse/Capabilities/CapsBase.cs
@@ -55,9 +55,7 @@ namespace OpenMetaverse.Http
static CapsBase()
{
- ServicePointManager.CertificatePolicy = new TrustAllCertificatePolicy();
- // Even though this will compile on Mono 2.4, it throws a runtime exception
- //ServicePointManager.ServerCertificateValidationCallback = TrustAllCertificatePolicy.TrustAllCertificateHandler;
+ ServicePointManager.ServerCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true;
}
private class RequestState
diff --git a/LibreMetaverse/DirectoryManager.cs b/LibreMetaverse/DirectoryManager.cs
index f963dc28..01798d9a 100644
--- a/LibreMetaverse/DirectoryManager.cs
+++ b/LibreMetaverse/DirectoryManager.cs
@@ -1122,7 +1122,7 @@ namespace OpenMetaverse
#region Blocking Functions
- [Obsolete("Use the async StartPeoplSearch method instead")]
+ [Obsolete("Use the async StartPeopleSearch method instead")]
public bool PeopleSearch(DirFindFlags findFlags, string searchText, int queryStart,
int timeoutMS, out List results)
{
diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj
index dee126c4..94e0d728 100644
--- a/LibreMetaverse/LibreMetaverse.csproj
+++ b/LibreMetaverse/LibreMetaverse.csproj
@@ -1,4 +1,4 @@
-
+
Local
14.0.25123
@@ -44,7 +44,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -64,7 +64,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/LibreMetaverse/Login.cs b/LibreMetaverse/Login.cs
index 48f65f2e..e2dc3d07 100644
--- a/LibreMetaverse/Login.cs
+++ b/LibreMetaverse/Login.cs
@@ -1091,9 +1091,7 @@ namespace OpenMetaverse
#endregion
// TODO: Allow a user callback to be defined for handling the cert
- ServicePointManager.CertificatePolicy = new TrustAllCertificatePolicy();
- // Even though this will compile on Mono 2.4, it throws a runtime exception
- //ServicePointManager.ServerCertificateValidationCallback = TrustAllCertificatePolicy.TrustAllCertificateHandler;
+ ServicePointManager.ServerCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true;
if (Client.Settings.USE_LLSD_LOGIN)
{
diff --git a/LibreMetaverseTypes/LibreMetaverseTypes.csproj b/LibreMetaverseTypes/LibreMetaverseTypes.csproj
index 4d8a59c3..b880fbd0 100644
--- a/LibreMetaverseTypes/LibreMetaverseTypes.csproj
+++ b/LibreMetaverseTypes/LibreMetaverseTypes.csproj
@@ -1,4 +1,4 @@
-
+
Local
@@ -45,7 +45,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -65,7 +65,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/AvatarPreview/AvatarPreview.csproj b/Programs/AvatarPreview/AvatarPreview.csproj
index 70e12c06..0cca7aad 100644
--- a/Programs/AvatarPreview/AvatarPreview.csproj
+++ b/Programs/AvatarPreview/AvatarPreview.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/Baker/Baker.csproj b/Programs/Baker/Baker.csproj
index cbd2306a..43e03bf0 100644
--- a/Programs/Baker/Baker.csproj
+++ b/Programs/Baker/Baker.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/GridImageUpload/GridImageUpload.csproj b/Programs/GridImageUpload/GridImageUpload.csproj
index 6f24607a..b699d50c 100644
--- a/Programs/GridImageUpload/GridImageUpload.csproj
+++ b/Programs/GridImageUpload/GridImageUpload.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/GridProxy/GridProxy.cs b/Programs/GridProxy/GridProxy.cs
index 21c7804d..8a2195ef 100644
--- a/Programs/GridProxy/GridProxy.cs
+++ b/Programs/GridProxy/GridProxy.cs
@@ -203,10 +203,8 @@ namespace GridProxy
{
this.proxyConfig = proxyConfig;
- ServicePointManager.CertificatePolicy = new TrustAllCertificatePolicy();
+ ServicePointManager.ServerCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true;
ServicePointManager.Expect100Continue = false;
- // Even though this will compile on Mono 2.4, it throws a runtime exception
- //ServicePointManager.ServerCertificateValidationCallback = TrustAllCertificatePolicy.TrustAllCertificateHandler;
InitializeLoginProxy();
InitializeSimProxy();
diff --git a/Programs/GridProxy/GridProxy.csproj b/Programs/GridProxy/GridProxy.csproj
index e1a9c85e..9bc332de 100644
--- a/Programs/GridProxy/GridProxy.csproj
+++ b/Programs/GridProxy/GridProxy.csproj
@@ -1,4 +1,4 @@
-
+
Local
14.0.25123
@@ -44,7 +44,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -65,7 +65,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/GridProxy/GridProxyApp.csproj b/Programs/GridProxy/GridProxyApp.csproj
index 4a3fa924..1a54b544 100644
--- a/Programs/GridProxy/GridProxyApp.csproj
+++ b/Programs/GridProxy/GridProxyApp.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/GridProxy/Plugins/Analyst.cs b/Programs/GridProxy/Plugins/Analyst.cs
index 7cb23600..90c4ccca 100644
--- a/Programs/GridProxy/Plugins/Analyst.cs
+++ b/Programs/GridProxy/Plugins/Analyst.cs
@@ -69,7 +69,7 @@ public class Analyst : ProxyPlugin
public override void Init()
{
- openmvAssembly = Assembly.Load("OpenMetaverse");
+ openmvAssembly = Assembly.Load("LibreMetaverse");
if (openmvAssembly == null) throw new Exception("Assembly load exception");
// build the table of /command delegates
diff --git a/Programs/PrimWorkshop/PrimWorkshop.csproj b/Programs/PrimWorkshop/PrimWorkshop.csproj
index 9fe1761a..cd2793d3 100644
--- a/Programs/PrimWorkshop/PrimWorkshop.csproj
+++ b/Programs/PrimWorkshop/PrimWorkshop.csproj
@@ -1,4 +1,4 @@
-
+
Local
14.0.25123
@@ -44,7 +44,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -65,7 +65,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/VisualParamGenerator/VisualParamGenerator.csproj b/Programs/VisualParamGenerator/VisualParamGenerator.csproj
index 8c294f15..fbc7e314 100644
--- a/Programs/VisualParamGenerator/VisualParamGenerator.csproj
+++ b/Programs/VisualParamGenerator/VisualParamGenerator.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/VoiceTest/VoiceTest.cs b/Programs/VoiceTest/VoiceTest.cs
index 93fda74b..041cf0ba 100644
--- a/Programs/VoiceTest/VoiceTest.cs
+++ b/Programs/VoiceTest/VoiceTest.cs
@@ -32,6 +32,7 @@ using OpenMetaverse.Utilities;
namespace VoiceTest
{
+ [Serializable]
public class VoiceException: Exception
{
public bool LoggedIn = false;
diff --git a/Programs/VoiceTest/VoiceTest.csproj b/Programs/VoiceTest/VoiceTest.csproj
index bcb2a913..61640918 100644
--- a/Programs/VoiceTest/VoiceTest.csproj
+++ b/Programs/VoiceTest/VoiceTest.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/WinGridProxy/FormWinGridProxy.cs b/Programs/WinGridProxy/FormWinGridProxy.cs
index 39b117aa..f7a944e3 100644
--- a/Programs/WinGridProxy/FormWinGridProxy.cs
+++ b/Programs/WinGridProxy/FormWinGridProxy.cs
@@ -117,7 +117,7 @@ namespace WinGridProxy
QueuedSessions = new List();
// populate the listen box with the known IP Addresses of this host
- IPHostEntry iphostentry = Dns.GetHostByName(Dns.GetHostName());
+ IPHostEntry iphostentry = Dns.GetHostEntry(Dns.GetHostName());
foreach (IPAddress address in iphostentry.AddressList)
comboBoxListenAddress.Items.Add(address.ToString());
diff --git a/Programs/WinGridProxy/ProxyManager.cs b/Programs/WinGridProxy/ProxyManager.cs
index dbddbb9c..92683051 100644
--- a/Programs/WinGridProxy/ProxyManager.cs
+++ b/Programs/WinGridProxy/ProxyManager.cs
@@ -70,7 +70,7 @@ namespace WinGridProxy
public ProxyManager(string port, string listenIP, string loginUri)
{
- openmvAssembly = Assembly.Load("OpenMetaverse");
+ openmvAssembly = Assembly.Load("LibreMetaverse");
if (openmvAssembly == null) throw new Exception("Assembly load exception");
_Port = string.Format("--proxy-login-port={0}", port);
diff --git a/Programs/WinGridProxy/WinGridProxy.csproj b/Programs/WinGridProxy/WinGridProxy.csproj
index 64ea2f46..626100b4 100644
--- a/Programs/WinGridProxy/WinGridProxy.csproj
+++ b/Programs/WinGridProxy/WinGridProxy.csproj
@@ -1,4 +1,4 @@
-
+
Local
14.0.25123
@@ -44,7 +44,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -65,7 +65,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/examples/Dashboard/Dashboard.csproj b/Programs/examples/Dashboard/Dashboard.csproj
index 4df02c50..a2c26ec9 100644
--- a/Programs/examples/Dashboard/Dashboard.csproj
+++ b/Programs/examples/Dashboard/Dashboard.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/examples/GridAccountant/GridAccountant.csproj b/Programs/examples/GridAccountant/GridAccountant.csproj
index 2caf23d5..056dd742 100644
--- a/Programs/examples/GridAccountant/GridAccountant.csproj
+++ b/Programs/examples/GridAccountant/GridAccountant.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/examples/Heightmap/Heightmap.csproj b/Programs/examples/Heightmap/Heightmap.csproj
index f89b4166..7f42efef 100644
--- a/Programs/examples/Heightmap/Heightmap.csproj
+++ b/Programs/examples/Heightmap/Heightmap.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/examples/IRCGateway/IRCGateway.csproj b/Programs/examples/IRCGateway/IRCGateway.csproj
index 3a9c61b6..cdbb721c 100644
--- a/Programs/examples/IRCGateway/IRCGateway.csproj
+++ b/Programs/examples/IRCGateway/IRCGateway.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/examples/PacketDump/PacketDump.csproj b/Programs/examples/PacketDump/PacketDump.csproj
index 2e749fab..ca1428e5 100644
--- a/Programs/examples/PacketDump/PacketDump.csproj
+++ b/Programs/examples/PacketDump/PacketDump.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/examples/TestClient/Program.cs b/Programs/examples/TestClient/Program.cs
index d15133e9..bd35aaf9 100644
--- a/Programs/examples/TestClient/Program.cs
+++ b/Programs/examples/TestClient/Program.cs
@@ -5,6 +5,7 @@ using CommandLine.Utility;
namespace OpenMetaverse.TestClient
{
+ [Serializable]
public class CommandLineArgumentsException : Exception
{
}
diff --git a/Programs/examples/TestClient/TestClient.csproj b/Programs/examples/TestClient/TestClient.csproj
index e369e43c..eb903339 100644
--- a/Programs/examples/TestClient/TestClient.csproj
+++ b/Programs/examples/TestClient/TestClient.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/examples/groupmanager/groupmanager.csproj b/Programs/examples/groupmanager/groupmanager.csproj
index b52b43ec..0f44a605 100644
--- a/Programs/examples/groupmanager/groupmanager.csproj
+++ b/Programs/examples/groupmanager/groupmanager.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/importprimscript/importprimscript.csproj b/Programs/importprimscript/importprimscript.csproj
index 761a0c0b..f0f6f424 100644
--- a/Programs/importprimscript/importprimscript.csproj
+++ b/Programs/importprimscript/importprimscript.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
diff --git a/Programs/mapgenerator/mapgenerator.csproj b/Programs/mapgenerator/mapgenerator.csproj
index 78e8566e..e395c73f 100644
--- a/Programs/mapgenerator/mapgenerator.csproj
+++ b/Programs/mapgenerator/mapgenerator.csproj
@@ -39,7 +39,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU
@@ -59,7 +59,7 @@
False
4
False
- 1591,1574,0419,0618
+ 1591,1574,0419
AnyCPU