Mantis #1936

Thank you, gsky, for a patch that corrects the threading model
to use the multithreaded apartment in the grid servers and
region server.

6 files changed, 0 insertions, 6 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 9e69257..4a4f8bf 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -53,7 +53,6 @@ namespace OpenSim.Grid.AssetServer
 
         private IAssetProviderPlugin m_assetProvider;
 
-        [STAThread]
         public static void Main(string[] args)
         {
             XmlConfigurator.Configure();
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 8094906..0032922 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -32,7 +32,6 @@ namespace OpenSim.Grid.GridServer
 {
     public class Program
     {
-        [STAThread]
         public static void Main(string[] args)
         {
             XmlConfigurator.Configure();
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index f62bdf5..7e6a29b 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -46,7 +46,6 @@ namespace OpenSim.Grid.InventoryServer
 
         public const string LogName = "INVENTORY";
 
-        [STAThread]
         public static void Main(string[] args)
         {
             XmlConfigurator.Configure();
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 781b49b..de20d01 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -50,7 +50,6 @@ namespace OpenSim.Grid.MessagingServer
 
         // private LLUUID m_lastCreatedUser = LLUUID.Random();
 
-        [STAThread]
         public static void Main(string[] args)
         {
             XmlConfigurator.Configure();
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 6d9cedb..516efe4 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -60,7 +60,6 @@ namespace OpenSim.Grid.UserServer
 
         private LLUUID m_lastCreatedUser = LLUUID.Random();
 
-        [STAThread]
         public static void Main(string[] args)
         {
             XmlConfigurator.Configure();
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 32dff0f..4df6415 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -39,7 +39,6 @@ namespace OpenSim
         public static string iniFilePath = "";
 
         //could move our main function into OpenSimMain and kill this class
-        [STAThread]
         public static void Main(string[] args)
         {
             // First line