aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2008-03-04 10:12:39 +0000
committerJeff Ames2008-03-04 10:12:39 +0000
commitd2806090aef48cff16d1ba2ae88ab0775f6a0489 (patch)
tree6e3115f4896a9edc4b7c68e18ebf15e44a527aba /OpenSim
parentFixed a region split synchronization bug (diff)
downloadopensim-SC-d2806090aef48cff16d1ba2ae88ab0775f6a0489.zip
opensim-SC-d2806090aef48cff16d1ba2ae88ab0775f6a0489.tar.gz
opensim-SC-d2806090aef48cff16d1ba2ae88ab0775f6a0489.tar.bz2
opensim-SC-d2806090aef48cff16d1ba2ae88ab0775f6a0489.tar.xz
Cleaned up a couple compiler warnings.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/ClientManager.cs1
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs5
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index a55e27c..9c6ac54 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -193,7 +193,6 @@ namespace OpenSim.Framework
193 packet.Header.Reliable = false; 193 packet.Header.Reliable = false;
194 LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task); 194 LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task);
195 } 195 }
196
197 } 196 }
198 } 197 }
199 198
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 2e6a892..568f3f2 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -522,7 +522,7 @@ namespace OpenSim.Grid.GridServer
522 //RegionProfileData TheSim = null; 522 //RegionProfileData TheSim = null;
523 string uuid = String.Empty;; 523 string uuid = String.Empty;;
524 Hashtable requestData = (Hashtable) request.Params[0]; 524 Hashtable requestData = (Hashtable) request.Params[0];
525 string myword; 525
526 if (requestData.ContainsKey("UUID")) { 526 if (requestData.ContainsKey("UUID")) {
527 //TheSim = getRegion(new LLUUID((string) requestData["UUID"])); 527 //TheSim = getRegion(new LLUUID((string) requestData["UUID"]));
528 uuid = requestData["UUID"].ToString(); 528 uuid = requestData["UUID"].ToString();
@@ -559,7 +559,8 @@ namespace OpenSim.Grid.GridServer
559 break; 559 break;
560 } 560 }
561 } 561 }
562 catch (Exception e) { 562 catch (Exception)
563 {
563 m_log.Error("storage Unable to delete region " + uuid + " via MySQL"); 564 m_log.Error("storage Unable to delete region " + uuid + " via MySQL");
564 //MainLog.Instance.Warn("storage", e.ToString()); 565 //MainLog.Instance.Warn("storage", e.ToString());
565 } 566 }