From 6ea24799dd4811dce0e61c2a70afb89095fdae31 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 3 Nov 2008 18:49:25 +0000 Subject: * minor: don't need to null check config source in clientstack settings since this is always non null --- OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 1 - OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs | 1 - 2 files changed, 2 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index cbe6eff..960989d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -149,7 +149,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP AssetCache assetCache, AgentCircuitManager circuitManager) { // XXX Temporary until we start unpacking the config source - // TODO: Don't forget to account for the null possibility ClientStackUserSettings userSettings = new ClientStackUserSettings(); proxyPortOffset = proxyPortOffsetParm; diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs index 0acb611..56bb357 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs @@ -84,7 +84,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge _log.InfoFormat("[Concierge] module disabled by OpenSim.ini configuration"); return; } - } catch (Exception) { -- cgit v1.1