aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-13 23:17:27 +0000
committerJustin Clark-Casey (justincc)2013-03-13 23:17:27 +0000
commit39a0928052bcaf4b81af326e129cbfd6329f9292 (patch)
treee8230ef3daa7a9404189263c968efb18804fc866
parentAdd prototype dynamic objects map for scene object parts (diff)
downloadopensim-SC_OLD-39a0928052bcaf4b81af326e129cbfd6329f9292.zip
opensim-SC_OLD-39a0928052bcaf4b81af326e129cbfd6329f9292.tar.gz
opensim-SC_OLD-39a0928052bcaf4b81af326e129cbfd6329f9292.tar.bz2
opensim-SC_OLD-39a0928052bcaf4b81af326e129cbfd6329f9292.tar.xz
minor: Remove some mono compiler warnings in OpenSim.Framework.dll
-rw-r--r--OpenSim/Framework/PluginManager.cs4
-rw-r--r--OpenSim/Framework/Util.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
index 00263f5..0117096 100644
--- a/OpenSim/Framework/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -218,7 +218,7 @@ namespace OpenSim.Framework
218 Console.WriteLine ("Looking for updates..."); 218 Console.WriteLine ("Looking for updates...");
219 Repositories.UpdateAllRepositories (ps); 219 Repositories.UpdateAllRepositories (ps);
220 Console.WriteLine ("Available add-in updates:"); 220 Console.WriteLine ("Available add-in updates:");
221 bool found = false; 221
222 AddinRepositoryEntry[] entries = Repositories.GetAvailableUpdates(); 222 AddinRepositoryEntry[] entries = Repositories.GetAvailableUpdates();
223 223
224 foreach (AddinRepositoryEntry entry in entries) 224 foreach (AddinRepositoryEntry entry in entries)
@@ -541,7 +541,7 @@ namespace OpenSim.Framework
541 { 541 {
542 list.AddRange(PluginRegistry.GetAddins()); 542 list.AddRange(PluginRegistry.GetAddins());
543 } 543 }
544 catch(Exception e) 544 catch (Exception)
545 { 545 {
546 Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[]; 546 Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[];
547 return x; 547 return x;
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 0fa54b2..94a172c 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -303,12 +303,12 @@ namespace OpenSim.Framework
303 // Clamp the maximum magnitude of a vector 303 // Clamp the maximum magnitude of a vector
304 public static Vector3 ClampV(Vector3 x, float max) 304 public static Vector3 ClampV(Vector3 x, float max)
305 { 305 {
306 Vector3 ret = x;
307 float lenSq = x.LengthSquared(); 306 float lenSq = x.LengthSquared();
308 if (lenSq > (max * max)) 307 if (lenSq > (max * max))
309 { 308 {
310 x = x / x.Length() * max; 309 x = x / x.Length() * max;
311 } 310 }
311
312 return x; 312 return x;
313 } 313 }
314 314