aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-03-21 17:06:31 +0000
committerCharles Krinke2008-03-21 17:06:31 +0000
commit1e452dacf4186dedc004a46fe3855c94aeb7341f (patch)
tree76dcdaf32a80b575f3d2df0b5e52e68708aa9b44
parentComment out "m_randomizeWater" and "ms" until we use them later. (diff)
downloadopensim-SC_OLD-1e452dacf4186dedc004a46fe3855c94aeb7341f.zip
opensim-SC_OLD-1e452dacf4186dedc004a46fe3855c94aeb7341f.tar.gz
opensim-SC_OLD-1e452dacf4186dedc004a46fe3855c94aeb7341f.tar.bz2
opensim-SC_OLD-1e452dacf4186dedc004a46fe3855c94aeb7341f.tar.xz
Comment out an unused 'str' and add a WriteLine to use
an "Exception e" with e.ToString() to eliminate 2 warnings.
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/VectorRenderModule.cs5
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 56f294c..f375a89 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -292,7 +292,7 @@ namespace OpenSim.Grid.GridServer
292 catch (FormatException e) 292 catch (FormatException e)
293 { 293 {
294 m_log.Info("[GRID]: Invalid login parameters, ignoring."); 294 m_log.Info("[GRID]: Invalid login parameters, ignoring.");
295 return ErrorResponse("Wrong format in login parameters. Please verify parameters."); 295 return ErrorResponse("Wrong format in login parameters. Please verify parameters." + e.ToString() );
296 } 296 }
297 297
298 existingSim = getRegion(sim.regionHandle); 298 existingSim = getRegion(sim.regionHandle);
diff --git a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
index c0a00c9..9c91b25 100644
--- a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
+++ b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
@@ -89,6 +89,8 @@ namespace OpenSim.Region.Environment.Modules
89 size = Convert.ToInt32(extraParams); 89 size = Convert.ToInt32(extraParams);
90 } catch (Exception e) { 90 } catch (Exception e) {
91 91
92//Ckrinke: Add a WriteLine to remove the warning about 'e' defined but not used
93 Console.WriteLine("Problem with Draw. Please verify parameters." + e.ToString());
92 } 94 }
93 95
94 if ((size < 128) || (size > 1024)) 96 if ((size < 128) || (size > 1024))
@@ -306,7 +308,8 @@ namespace OpenSim.Region.Environment.Modules
306 private Bitmap ImageHttpRequest(string url) 308 private Bitmap ImageHttpRequest(string url)
307 { 309 {
308 WebRequest request = HttpWebRequest.Create(url); 310 WebRequest request = HttpWebRequest.Create(url);
309 Stream str = null; 311//Ckrinke: Comment out for now as 'str' is unused. Bring it back into play later when it is used.
312//Ckrinke Stream str = null;
310 HttpWebResponse response = (HttpWebResponse)(request).GetResponse(); 313 HttpWebResponse response = (HttpWebResponse)(request).GetResponse();
311 if (response.StatusCode == HttpStatusCode.OK) 314 if (response.StatusCode == HttpStatusCode.OK)
312 { 315 {