aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJeff Ames2008-05-14 05:33:32 +0000
committerJeff Ames2008-05-14 05:33:32 +0000
commit6a1b787436cc59043a26a296781e7a7b5ea0c67b (patch)
tree10f55a7b0abfdc47f103d40f13f3cae530c13581 /OpenSim/Framework
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.zip
opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.gz
opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.bz2
opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.xz
More formatting cleanup.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PacketPool.cs2
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs10
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index af8efe8..4e71d5e 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Framework
159 return; // packet pool disabled 159 return; // packet pool disabled
160 160
161 /* // Commented out to remove a compiler warning. :) 161 /* // Commented out to remove a compiler warning. :)
162 lock(pool) 162 lock (pool)
163 { 163 {
164 PacketType type=packet.Type; 164 PacketType type=packet.Type;
165 165
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index f36b2fb..50f4e23 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -372,8 +372,14 @@ namespace OpenSim.Framework.Servers
372 LLSD llsdRequest = null; 372 LLSD llsdRequest = null;
373 LLSD llsdResponse = null; 373 LLSD llsdResponse = null;
374 374
375 try { llsdRequest = LLSDParser.DeserializeXml(requestBody); } 375 try
376 catch (Exception ex) { m_log.Warn("[HTTPD]: Error - " + ex.Message); } 376 {
377 llsdRequest = LLSDParser.DeserializeXml(requestBody);
378 }
379 catch (Exception ex)
380 {
381 m_log.Warn("[HTTPD]: Error - " + ex.Message);
382 }
377 383
378 if (llsdRequest != null && m_llsdHandler != null) 384 if (llsdRequest != null && m_llsdHandler != null)
379 { 385 {