aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-13 19:22:32 +0000
committerMelanie Thielker2008-08-13 19:22:32 +0000
commit0a18d544c5467488a0d3a57c549cdaebab4c5d35 (patch)
treec826c34b32f9e24a5b88b8d54c56ba98a083a32f
parentMantis#1942. Thank you kindly, Tyre for a patch that: (diff)
downloadopensim-SC_OLD-0a18d544c5467488a0d3a57c549cdaebab4c5d35.zip
opensim-SC_OLD-0a18d544c5467488a0d3a57c549cdaebab4c5d35.tar.gz
opensim-SC_OLD-0a18d544c5467488a0d3a57c549cdaebab4c5d35.tar.bz2
opensim-SC_OLD-0a18d544c5467488a0d3a57c549cdaebab4c5d35.tar.xz
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.
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs1
-rw-r--r--OpenSim/Grid/GridServer/Program.cs1
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs1
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs1
-rw-r--r--OpenSim/Grid/UserServer/Main.cs1
-rw-r--r--OpenSim/Region/Application/Application.cs1
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
53 53
54 private IAssetProviderPlugin m_assetProvider; 54 private IAssetProviderPlugin m_assetProvider;
55 55
56 [STAThread]
57 public static void Main(string[] args) 56 public static void Main(string[] args)
58 { 57 {
59 XmlConfigurator.Configure(); 58 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
32{ 32{
33 public class Program 33 public class Program
34 { 34 {
35 [STAThread]
36 public static void Main(string[] args) 35 public static void Main(string[] args)
37 { 36 {
38 XmlConfigurator.Configure(); 37 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
46 46
47 public const string LogName = "INVENTORY"; 47 public const string LogName = "INVENTORY";
48 48
49 [STAThread]
50 public static void Main(string[] args) 49 public static void Main(string[] args)
51 { 50 {
52 XmlConfigurator.Configure(); 51 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
50 50
51 // private LLUUID m_lastCreatedUser = LLUUID.Random(); 51 // private LLUUID m_lastCreatedUser = LLUUID.Random();
52 52
53 [STAThread]
54 public static void Main(string[] args) 53 public static void Main(string[] args)
55 { 54 {
56 XmlConfigurator.Configure(); 55 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
60 60
61 private LLUUID m_lastCreatedUser = LLUUID.Random(); 61 private LLUUID m_lastCreatedUser = LLUUID.Random();
62 62
63 [STAThread]
64 public static void Main(string[] args) 63 public static void Main(string[] args)
65 { 64 {
66 XmlConfigurator.Configure(); 65 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
39 public static string iniFilePath = ""; 39 public static string iniFilePath = "";
40 40
41 //could move our main function into OpenSimMain and kill this class 41 //could move our main function into OpenSimMain and kill this class
42 [STAThread]
43 public static void Main(string[] args) 42 public static void Main(string[] args)
44 { 43 {
45 // First line 44 // First line