aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-12-15 16:42:42 +0000
committerJustin Clark-Casey (justincc)2009-12-15 16:42:42 +0000
commit6bd087a8f96c5f6ec3720d14778c4d2abb8ec95b (patch)
treeca645666d6b66e68424f9365225c6a91037c8f0e
parentMake sure that we catch and display any exceptions that get right to the top ... (diff)
downloadopensim-SC_OLD-6bd087a8f96c5f6ec3720d14778c4d2abb8ec95b.zip
opensim-SC_OLD-6bd087a8f96c5f6ec3720d14778c4d2abb8ec95b.tar.gz
opensim-SC_OLD-6bd087a8f96c5f6ec3720d14778c4d2abb8ec95b.tar.bz2
opensim-SC_OLD-6bd087a8f96c5f6ec3720d14778c4d2abb8ec95b.tar.xz
minor: remove some mono compiler warnings
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
-rw-r--r--OpenSim/Tests/Clients/Grid/GridClient.cs6
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2710cff..289ba47 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Framework.Scenes
124 private Vector3? m_forceToApply; 124 private Vector3? m_forceToApply;
125 private uint m_requestedSitTargetID; 125 private uint m_requestedSitTargetID;
126 private UUID m_requestedSitTargetUUID; 126 private UUID m_requestedSitTargetUUID;
127 private Vector3 m_requestedSitOffset; 127
128 private SendCourseLocationsMethod m_sendCourseLocationsMethod; 128 private SendCourseLocationsMethod m_sendCourseLocationsMethod;
129 129
130 private bool m_startAnimationSet; 130 private bool m_startAnimationSet;
@@ -1777,7 +1777,7 @@ namespace OpenSim.Region.Framework.Scenes
1777 m_nextSitAnimation = part.SitAnimation; 1777 m_nextSitAnimation = part.SitAnimation;
1778 } 1778 }
1779 m_requestedSitTargetID = part.LocalId; 1779 m_requestedSitTargetID = part.LocalId;
1780 m_requestedSitOffset = offset; 1780 //m_requestedSitOffset = offset;
1781 m_requestedSitTargetUUID = targetID; 1781 m_requestedSitTargetUUID = targetID;
1782 1782
1783 m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); 1783 m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
@@ -2010,7 +2010,7 @@ namespace OpenSim.Region.Framework.Scenes
2010 if (part != null) 2010 if (part != null)
2011 { 2011 {
2012 m_requestedSitTargetID = part.LocalId; 2012 m_requestedSitTargetID = part.LocalId;
2013 m_requestedSitOffset = offset; 2013 //m_requestedSitOffset = offset;
2014 m_requestedSitTargetUUID = targetID; 2014 m_requestedSitTargetUUID = targetID;
2015 2015
2016 m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); 2016 m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs
index 8798c5e..972c0aa 100644
--- a/OpenSim/Tests/Clients/Grid/GridClient.cs
+++ b/OpenSim/Tests/Clients/Grid/GridClient.cs
@@ -44,9 +44,9 @@ namespace OpenSim.Tests.Clients.GridClient
44{ 44{
45 public class GridClient 45 public class GridClient
46 { 46 {
47 private static readonly ILog m_log = 47// private static readonly ILog m_log =
48 LogManager.GetLogger( 48// LogManager.GetLogger(
49 MethodBase.GetCurrentMethod().DeclaringType); 49// MethodBase.GetCurrentMethod().DeclaringType);
50 50
51 public static void Main(string[] args) 51 public static void Main(string[] args)
52 { 52 {