diff options
| author | Melanie | 2012-01-22 16:35:14 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-22 16:35:14 +0000 |
| commit | 02572ab1d3ae23205e0a2192c9b30aa22b566143 (patch) | |
| tree | fe483f85a77cb00a21dd4be65a71941329f22482 /OpenSim/Data/MySQL/MySQLEstateData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change the key name I missed in last commit (diff) | |
| download | opensim-SC-02572ab1d3ae23205e0a2192c9b30aa22b566143.zip opensim-SC-02572ab1d3ae23205e0a2192c9b30aa22b566143.tar.gz opensim-SC-02572ab1d3ae23205e0a2192c9b30aa22b566143.tar.bz2 opensim-SC-02572ab1d3ae23205e0a2192c9b30aa22b566143.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionSettings.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLEstateData.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index 3d647ca..3dd46cb 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs | |||
| @@ -210,7 +210,6 @@ namespace OpenSim.Data.MySQL | |||
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | LoadBanList(es); | 212 | LoadBanList(es); |
| 213 | |||
| 214 | es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers"); | 213 | es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers"); |
| 215 | es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users"); | 214 | es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users"); |
| 216 | es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups"); | 215 | es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups"); |