aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-03-03 09:56:30 +0000
committerAdam Frisby2008-03-03 09:56:30 +0000
commit358a4963d334a420ce91062bfd5f0d41d9ea57e5 (patch)
tree83cd19d75ec55f14b649932a9933373cd0fd54fc
parent* Removed a bunch of compiler warnings. (diff)
downloadopensim-SC_OLD-358a4963d334a420ce91062bfd5f0d41d9ea57e5.zip
opensim-SC_OLD-358a4963d334a420ce91062bfd5f0d41d9ea57e5.tar.gz
opensim-SC_OLD-358a4963d334a420ce91062bfd5f0d41d9ea57e5.tar.bz2
opensim-SC_OLD-358a4963d334a420ce91062bfd5f0d41d9ea57e5.tar.xz
* More compiler warning nukage.
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLManager.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index 0433d1e..a9fb3c2 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Data.MSSQL
268 { 268 {
269 regionprofile.owner_uuid = new LLUUID((string)reader["owner_uuid"]); 269 regionprofile.owner_uuid = new LLUUID((string)reader["owner_uuid"]);
270 } 270 }
271 catch(Exception ex) 271 catch(Exception)
272 {} 272 {}
273 // World Map Addition 273 // World Map Addition
274 string tempRegionMap = reader["regionMapTexture"].ToString(); 274 string tempRegionMap = reader["regionMapTexture"].ToString();
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 153ac75..f9d24e5 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -372,8 +372,6 @@ namespace OpenSim.Grid.UserServer
372 { 372 {
373 XmlRpcResponse response = new XmlRpcResponse(); 373 XmlRpcResponse response = new XmlRpcResponse();
374 Hashtable requestData = (Hashtable)request.Params[0]; 374 Hashtable requestData = (Hashtable)request.Params[0];
375
376 UserProfileData userProfile;
377 375
378 if (requestData.Contains("avatar_uuid")) 376 if (requestData.Contains("avatar_uuid"))
379 { 377 {