OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oops closed too soon

httptests
UbitUmarov 2017-05-06 22:12:45 +01:00
parent c57215687f
commit de55ad9545
1 changed files with 87 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@ -878,12 +878,13 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("?regionID", regionUUID.ToString());
IDataReader result = ExecuteReader(cmd);
if (!result.Read())
using(IDataReader result = ExecuteReader(cmd))
{
if(!result.Read())
{
//No result, so store our default windlight profile and return it
nWP.regionID = regionUUID;
// StoreRegionWindlightSettings(nWP);
// StoreRegionWindlightSettings(nWP);
return nWP;
}
else
@ -906,7 +907,7 @@ namespace OpenSim.Data.MySQL
nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
UUID.TryParse(result["normal_map_texture"].ToString(), out nWP.normalMapTexture);
UUID.TryParse(result["normal_map_texture"].ToString(),out nWP.normalMapTexture);
nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
@ -954,6 +955,7 @@ namespace OpenSim.Data.MySQL
nWP.valid = true;
}
}
}
dbcon.Close();
}
@ -1141,16 +1143,19 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString());
IDataReader result = ExecuteReader(cmd);
if (!result.Read())
using(IDataReader result = ExecuteReader(cmd))
{
if(!result.Read())
{
dbcon.Close();
return String.Empty;
}
else
{
string ret = Convert.ToString(result["llsd_settings"]);
dbcon.Close();
return Convert.ToString(result["llsd_settings"]);
return ret;
}
}
}
}