ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug where estate not found would result in a dummy estate record with erroneous information.

Browse Source 
Also, added conversion of EstateSettings from/to key-value pairs in preparation for robust net work connectors.
This commit is contained in:
Diva Canto
2014-05-31 11:40:54 -07:00
parent d6f9f690e5
commit eaf595c008
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Data/MySQL/MySQLEstateData.cs
View File

@@ -145,7 +145,11 @@ namespace OpenSim.Data.MySQL
cmd.CommandText = sql;
cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
return DoLoad(cmd, regionID, create);
EstateSettings e = DoLoad(cmd, regionID, create);
if (!create && e.EstateID == 0) // Not found
return null;
return e;
}
}
@@ -427,7 +431,10 @@ namespace OpenSim.Data.MySQL
cmd.CommandText = sql;
cmd.Parameters.AddWithValue("?EstateID", estateID);
return DoLoad(cmd, UUID.Zero, false);
EstateSettings e = DoLoad(cmd, UUID.Zero, false);
if (e.EstateID != estateID)
return null;
return e;
}
}