diff options
author | Justin Clarke Casey | 2008-11-03 18:49:25 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-03 18:49:25 +0000 |
commit | 6ea24799dd4811dce0e61c2a70afb89095fdae31 (patch) | |
tree | 443b6e3c5f84fef5195a8035f20b816280faf11b /OpenSim/Region | |
parent | * minor: eliminate unused config field (diff) | |
download | opensim-SC_OLD-6ea24799dd4811dce0e61c2a70afb89095fdae31.zip opensim-SC_OLD-6ea24799dd4811dce0e61c2a70afb89095fdae31.tar.gz opensim-SC_OLD-6ea24799dd4811dce0e61c2a70afb89095fdae31.tar.bz2 opensim-SC_OLD-6ea24799dd4811dce0e61c2a70afb89095fdae31.tar.xz |
* minor: don't need to null check config source in clientstack settings since this is always non null
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs | 1 |
2 files changed, 0 insertions, 2 deletions
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 | |||
149 | AssetCache assetCache, AgentCircuitManager circuitManager) | 149 | AssetCache assetCache, AgentCircuitManager circuitManager) |
150 | { | 150 | { |
151 | // XXX Temporary until we start unpacking the config source | 151 | // XXX Temporary until we start unpacking the config source |
152 | // TODO: Don't forget to account for the null possibility | ||
153 | ClientStackUserSettings userSettings = new ClientStackUserSettings(); | 152 | ClientStackUserSettings userSettings = new ClientStackUserSettings(); |
154 | 153 | ||
155 | proxyPortOffset = proxyPortOffsetParm; | 154 | 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 | |||
84 | _log.InfoFormat("[Concierge] module disabled by OpenSim.ini configuration"); | 84 | _log.InfoFormat("[Concierge] module disabled by OpenSim.ini configuration"); |
85 | return; | 85 | return; |
86 | } | 86 | } |
87 | |||
88 | } | 87 | } |
89 | catch (Exception) | 88 | catch (Exception) |
90 | { | 89 | { |