From 1d12274850c8b51b995361b78010fdaf55ca5f2f Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 16 Apr 2009 18:35:23 +0000
Subject: * bizarrely, two reports that that last commit broke script engine
startup (!) on linux - reverting until we can investigate further.
---
OpenSim/Framework/AssetConfig.cs | 2 +-
OpenSim/Framework/ConfigBase.cs | 10 ----------
OpenSim/Framework/GridConfig.cs | 2 +-
OpenSim/Framework/InventoryConfig.cs | 2 +-
OpenSim/Framework/MessageServerConfig.cs | 2 +-
OpenSim/Framework/UserConfig.cs | 2 +-
6 files changed, 5 insertions(+), 15 deletions(-)
delete mode 100644 OpenSim/Framework/ConfigBase.cs
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
///
/// AssetConfig -- For Asset Server Configuration
///
- public class AssetConfig:ConfigBase
+ public class AssetConfig
{
public const uint DefaultHttpPort = 8003;
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 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework
-{
- public abstract class ConfigBase
- {
- }
-}
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;
namespace OpenSim.Framework
{
- public class GridConfig:ConfigBase
+ public class GridConfig
{
public static uint DefaultHttpPort = 8001;
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
///
/// Defines and handles inventory grid server configuration
///
- public class InventoryConfig:ConfigBase
+ public class InventoryConfig
{
public static uint DefaultHttpPort = 8004;
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
///
/// Message Server Config - Configuration of the Message Server
///
- public class MessageServerConfig:ConfigBase
+ public class MessageServerConfig
{
public static uint DefaultHttpPort = 8006;
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
///
/// UserConfig -- For User Server Configuration
///
- public class UserConfig:ConfigBase
+ public class UserConfig
{
public static uint DefaultHttpPort = 8002;
public static bool DefaultHttpSSL = false;
--
cgit v1.1