aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712009-04-16 18:35:23 +0000
committerlbsa712009-04-16 18:35:23 +0000
commit1d12274850c8b51b995361b78010fdaf55ca5f2f (patch)
treeae7765d8aa4874f888dfeb9a87abc6c767a8f960
parent* Started arduous config refactoring task with babystep introduction of commo... (diff)
downloadopensim-SC_OLD-1d12274850c8b51b995361b78010fdaf55ca5f2f.zip
opensim-SC_OLD-1d12274850c8b51b995361b78010fdaf55ca5f2f.tar.gz
opensim-SC_OLD-1d12274850c8b51b995361b78010fdaf55ca5f2f.tar.bz2
opensim-SC_OLD-1d12274850c8b51b995361b78010fdaf55ca5f2f.tar.xz
* bizarrely, two reports that that last commit broke script engine startup (!) on linux - reverting until we can investigate further.
-rw-r--r--OpenSim/Framework/AssetConfig.cs2
-rw-r--r--OpenSim/Framework/ConfigBase.cs10
-rw-r--r--OpenSim/Framework/GridConfig.cs2
-rw-r--r--OpenSim/Framework/InventoryConfig.cs2
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs2
-rw-r--r--OpenSim/Framework/UserConfig.cs2
6 files changed, 5 insertions, 15 deletions
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 804a270..233c3d0 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
33 /// <summary> 33 /// <summary>
34 /// AssetConfig -- For Asset Server Configuration 34 /// AssetConfig -- For Asset Server Configuration
35 /// </summary> 35 /// </summary>
36 public class AssetConfig:ConfigBase 36 public class AssetConfig
37 { 37 {
38 public const uint DefaultHttpPort = 8003; 38 public const uint DefaultHttpPort = 8003;
39 39
diff --git a/OpenSim/Framework/ConfigBase.cs b/OpenSim/Framework/ConfigBase.cs
deleted file mode 100644
index 5479f2f..0000000
--- a/OpenSim/Framework/ConfigBase.cs
+++ /dev/null
@@ -1,10 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Framework
6{
7 public abstract class ConfigBase
8 {
9 }
10}
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 640eeaa..52bc3d6 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -29,7 +29,7 @@ using System;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 public class GridConfig:ConfigBase 32 public class GridConfig
33 { 33 {
34 public static uint DefaultHttpPort = 8001; 34 public static uint DefaultHttpPort = 8001;
35 35
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 8141290..90e4482 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
32 /// <summary> 32 /// <summary>
33 /// Defines and handles inventory grid server configuration 33 /// Defines and handles inventory grid server configuration
34 /// </summary> 34 /// </summary>
35 public class InventoryConfig:ConfigBase 35 public class InventoryConfig
36 { 36 {
37 public static uint DefaultHttpPort = 8004; 37 public static uint DefaultHttpPort = 8004;
38 38
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 1af9b13..d2f07b9 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
32 /// <summary> 32 /// <summary>
33 /// Message Server Config - Configuration of the Message Server 33 /// Message Server Config - Configuration of the Message Server
34 /// </summary> 34 /// </summary>
35 public class MessageServerConfig:ConfigBase 35 public class MessageServerConfig
36 { 36 {
37 public static uint DefaultHttpPort = 8006; 37 public static uint DefaultHttpPort = 8006;
38 public static bool DefaultHttpSSL = false; 38 public static bool DefaultHttpSSL = false;
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 49668af..ea2cba0 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
33 /// <summary> 33 /// <summary>
34 /// UserConfig -- For User Server Configuration 34 /// UserConfig -- For User Server Configuration
35 /// </summary> 35 /// </summary>
36 public class UserConfig:ConfigBase 36 public class UserConfig
37 { 37 {
38 public static uint DefaultHttpPort = 8002; 38 public static uint DefaultHttpPort = 8002;
39 public static bool DefaultHttpSSL = false; 39 public static bool DefaultHttpSSL = false;