diff --git a/LibreMetaverse/Settings.cs b/LibreMetaverse/Settings.cs
index b225174f..91d5b91b 100644
--- a/LibreMetaverse/Settings.cs
+++ b/LibreMetaverse/Settings.cs
@@ -217,10 +217,6 @@ namespace OpenMetaverse
/// server the full object info will automatically be requested
public bool ALWAYS_REQUEST_OBJECTS = true;
- /// Whether to establish connections to HTTP capabilities
- /// servers for simulators
- public bool ENABLE_CAPS = true;
-
/// Whether to decode sim stats
public bool ENABLE_SIMSTATS = true;
diff --git a/LibreMetaverse/Simulator.cs b/LibreMetaverse/Simulator.cs
index 87cbf36d..b0fa57b5 100644
--- a/LibreMetaverse/Simulator.cs
+++ b/LibreMetaverse/Simulator.cs
@@ -690,17 +690,14 @@ namespace OpenMetaverse
Caps = null;
}
- if (Client.Settings.ENABLE_CAPS)
+ // Connect to the CAPS system
+ if (seedcaps != null)
{
- // Connect to the new CAPS system
- if (seedcaps != null)
- {
- Caps = new Caps(this, seedcaps);
- }
- else
- {
- Logger.Log("Setting up a sim without a valid capabilities server!", Helpers.LogLevel.Error, Client);
- }
+ Caps = new Caps(this, seedcaps);
+ }
+ else
+ {
+ Logger.Log("Setting up a sim without a valid capabilities server!", Helpers.LogLevel.Error, Client);
}
}