Resolve some mono compiler warnings.

author: Justin Clark-Casey (justincc) 2012-05-25 04:03:16 +0100
committer: Justin Clark-Casey (justincc) 2012-05-25 04:03:16 +0100
commit: 67ebe80dd95ffa2c5e9b071497b472f9c99f00f8 (patch)
tree: b4615b8efb28ea1b038323c19859ccd31e0e6435 /OpenSim/Region/CoreModules/World/Terrain
parent: on agent cross, remove from physics scene after its been placed in transit, n... (diff)
download: opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.zip
opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.tar.gz
opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.tar.bz2
opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.tar.xz
2 files changed, 17 insertions, 13 deletions
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 fileWidth = w;
+//                int fileHeight = h;
-                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;
+//                            int sztmp = bs.ReadInt16() + 1;
-                            fileWidth = sztmp;
+//                            fileWidth = sztmp;
-                            fileHeight = 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":
author	Justin Clark-Casey (justincc)	2012-05-25 04:03:16 +0100
committer	Justin Clark-Casey (justincc)	2012-05-25 04:03:16 +0100
commit	67ebe80dd95ffa2c5e9b071497b472f9c99f00f8 (patch)
tree	b4615b8efb28ea1b038323c19859ccd31e0e6435 /OpenSim/Region/CoreModules/World/Terrain
parent	on agent cross, remove from physics scene after its been placed in transit, n... (diff)
download	opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.zip opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.tar.gz opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.tar.bz2 opensim-SC_OLD-67ebe80dd95ffa2c5e9b071497b472f9c99f00f8.tar.xz

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
59	}	59	}
60		60
61	//Returns true if this extension is supported for terrain save-tile	61	//Returns true if this extension is supported for terrain save-tile
62	public bool SupportsTileSave()	62	public override bool SupportsTileSave()
63	{	63	{
64	return false;	64	return false;
65	}	65	}


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
65	bool eof = false;	65	bool eof = false;
66		66
67	int fileXPoints = 0;	67	int fileXPoints = 0;
68	int fileYPoints = 0;	68	// int fileYPoints = 0;
69		69
70	// Terragen file	70	// Terragen file
71	while (eof == false)	71	while (eof == false)
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
75	{	75	{
76	case "SIZE":	76	case "SIZE":
77	fileXPoints = bs.ReadInt16() + 1;	77	fileXPoints = bs.ReadInt16() + 1;
78	fileYPoints = fileXPoints;	78	// fileYPoints = fileXPoints;
79	bs.ReadInt16();	79	bs.ReadInt16();
80	break;	80	break;
81	case "XPTS":	81	case "XPTS":
@@ -83,7 +83,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
83	bs.ReadInt16();	83	bs.ReadInt16();
84	break;	84	break;
85	case "YPTS":	85	case "YPTS":
86	fileYPoints = bs.ReadInt16();	86	// fileYPoints = bs.ReadInt16();
		87	bs.ReadInt16();
87	bs.ReadInt16();	88	bs.ReadInt16();
88	break;	89	break;
89	case "ALTW":	90	case "ALTW":
@@ -164,10 +165,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
164	bool eof = false;	165	bool eof = false;
165	if (Encoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")	166	if (Encoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN ")
166	{	167	{
167		168	// int fileWidth = w;
168	int fileWidth = w;	169	// int fileHeight = h;
169	int fileHeight = h;
170
171		170
172	// Terragen file	171	// Terragen file
173	while (eof == false)	172	while (eof == false)
@@ -176,17 +175,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
176	switch (tmp)	175	switch (tmp)
177	{	176	{
178	case "SIZE":	177	case "SIZE":
179	int sztmp = bs.ReadInt16() + 1;	178	// int sztmp = bs.ReadInt16() + 1;
180	fileWidth = sztmp;	179	// fileWidth = sztmp;
181	fileHeight = sztmp;	180	// fileHeight = sztmp;
		181	bs.ReadInt16();
		182	bs.ReadInt16();
		183	bs.ReadInt16();
182	bs.ReadInt16();	184	bs.ReadInt16();
183	break;	185	break;
184	case "XPTS":	186	case "XPTS":
185	fileWidth = bs.ReadInt16();	187	// fileWidth = bs.ReadInt16();
		188	bs.ReadInt16();
186	bs.ReadInt16();	189	bs.ReadInt16();
187	break;	190	break;
188	case "YPTS":	191	case "YPTS":
189	fileHeight = bs.ReadInt16();	192	// fileHeight = bs.ReadInt16();
		193	bs.ReadInt16();
190	bs.ReadInt16();	194	bs.ReadInt16();
191	break;	195	break;
192	case "ALTW":	196	case "ALTW":