From 67ebe80dd95ffa2c5e9b071497b472f9c99f00f8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 May 2012 04:03:16 +0100
Subject: Resolve some mono compiler warnings.

---
 .../CoreModules/World/Terrain/FileLoaders/TIFF.cs  |  2 +-
 .../World/Terrain/FileLoaders/Terragen.cs          | 28 ++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World/Terrain')

diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
index 5d2f893..b416b82 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         }
 
         //Returns true if this extension is supported for terrain save-tile
-        public bool SupportsTileSave()
+        public override bool SupportsTileSave()
         {
             return false;
         }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index 1ebf916..71c71e6 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             bool eof = false;
 
             int fileXPoints = 0;
-            int fileYPoints = 0;
+//            int fileYPoints = 0;
 
             // Terragen file
             while (eof == false)
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                 {
                     case "SIZE":
                         fileXPoints = bs.ReadInt16() + 1;
-                        fileYPoints = fileXPoints;
+//                        fileYPoints = fileXPoints;
                         bs.ReadInt16();
                         break;
                     case "XPTS":
@@ -83,7 +83,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                         bs.ReadInt16();
                         break;
                     case "YPTS":
-                        fileYPoints = bs.ReadInt16();
+//                        fileYPoints = bs.ReadInt16();
+                        bs.ReadInt16();
                         bs.ReadInt16();
                         break;
                     case "ALTW":
@@ -164,10 +165,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             bool eof = false;
             if (Encoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")
             {
-
-                int fileWidth = w;
-                int fileHeight = h;
-
+//                int fileWidth = w;
+//                int fileHeight = h;
 
                 // Terragen file
                 while (eof == false)
@@ -176,17 +175,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                     switch (tmp)
                     {
                         case "SIZE":
-                            int sztmp = bs.ReadInt16() + 1;
-                            fileWidth = sztmp;
-                            fileHeight = sztmp;
+//                            int sztmp = bs.ReadInt16() + 1;
+//                            fileWidth = sztmp;
+//                            fileHeight = sztmp;
+                            bs.ReadInt16();
+                            bs.ReadInt16();
+                            bs.ReadInt16();
                             bs.ReadInt16();
                             break;
                         case "XPTS":
-                            fileWidth = bs.ReadInt16();
+//                            fileWidth = bs.ReadInt16();
+                            bs.ReadInt16();
                             bs.ReadInt16();
                             break;
                         case "YPTS":
-                            fileHeight = bs.ReadInt16();
+//                            fileHeight = bs.ReadInt16();
+                            bs.ReadInt16();
                             bs.ReadInt16();
                             break;
                         case "ALTW":
-- 
cgit v1.1