aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs1
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 {