diff options
| author | Jeff Ames | 2008-03-25 03:37:48 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-03-25 03:37:48 +0000 |
| commit | a7556af7debeaa9d760a2402083e9aa42291a3af (patch) | |
| tree | f14baa8d907871333bfae8b95c7080bb5423231f /OpenSim | |
| parent | * Adds llMoveToTarget and llStopMoveToTarget support to the ODEPlugin. (diff) | |
| download | opensim-SC-a7556af7debeaa9d760a2402083e9aa42291a3af.zip opensim-SC-a7556af7debeaa9d760a2402083e9aa42291a3af.tar.gz opensim-SC-a7556af7debeaa9d760a2402083e9aa42291a3af.tar.bz2 opensim-SC-a7556af7debeaa9d760a2402083e9aa42291a3af.tar.xz | |
Fix a few compiler warnings.
Diffstat (limited to 'OpenSim')
3 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs index d95e4b1..ba5a098 100644 --- a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs +++ b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs | |||
| @@ -595,7 +595,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement | |||
| 595 | byteArray = new byte[LAND_BLOCKS_PER_PACKET]; | 595 | byteArray = new byte[LAND_BLOCKS_PER_PACKET]; |
| 596 | } | 596 | } |
| 597 | } | 597 | } |
| 598 | catch (Exception e) | 598 | catch (Exception) |
| 599 | { | 599 | { |
| 600 | //m_log.Debug("[LAND]: Skipped Land checks because avatar is out of bounds: " + e.Message); | 600 | //m_log.Debug("[LAND]: Skipped Land checks because avatar is out of bounds: " + e.Message); |
| 601 | } | 601 | } |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs index ee18523..e136397 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs | |||
| @@ -39,8 +39,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | |||
| 39 | /// </summary> | 39 | /// </summary> |
| 40 | class Terragen : ITerrainLoader | 40 | class Terragen : ITerrainLoader |
| 41 | { | 41 | { |
| 42 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
| 43 | |||
| 44 | #region ITerrainLoader Members | 42 | #region ITerrainLoader Members |
| 45 | 43 | ||
| 46 | public ITerrainChannel LoadFile(string filename) | 44 | public ITerrainChannel LoadFile(string filename) |
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index bc777e2..abbcd7c 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |||
| @@ -522,9 +522,6 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
| 522 | { | 522 | { |
| 523 | actor.Move(timeStep); | 523 | actor.Move(timeStep); |
| 524 | } | 524 | } |
| 525 | foreach (BulletXPrim prim in _prims.Values) | ||
| 526 | { | ||
| 527 | } | ||
| 528 | } | 525 | } |
| 529 | 526 | ||
| 530 | private void ValidateHeightForAll() | 527 | private void ValidateHeightForAll() |