diff options
| author | Justin Clark-Casey (justincc) | 2012-01-24 20:36:16 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-24 20:36:16 +0000 |
| commit | a704d444f2f1a4887598cd9eb2f59c0b4c595f2b (patch) | |
| tree | 066a47464322b9e73687f60d8308e34efbb45568 /OpenSim/Data/MySQL/MySQLEstateData.cs | |
| parent | Restrict accessible of ODECharacter Shell and Body. Add method doc and some ... (diff) | |
| parent | Teleport routing, part 1 (diff) | |
| download | opensim-SC_OLD-a704d444f2f1a4887598cd9eb2f59c0b4c595f2b.zip opensim-SC_OLD-a704d444f2f1a4887598cd9eb2f59c0b4c595f2b.tar.gz opensim-SC_OLD-a704d444f2f1a4887598cd9eb2f59c0b4c595f2b.tar.bz2 opensim-SC_OLD-a704d444f2f1a4887598cd9eb2f59c0b4c595f2b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLEstateData.cs')
| -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"); |