diff options
| author | Dan Lake | 2012-02-01 16:25:35 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-02-01 16:25:35 -0800 |
| commit | c10193c72b1f029a958f04d2f5d7ee384e693aaa (patch) | |
| tree | 052ec7e973c15b158310511197affad14eb9c64f /OpenSim/Data/MySQL/MySQLEstateData.cs | |
| parent | Trigger event when prims are scheduled for an update. This gives modules earl... (diff) | |
| parent | Small optimization to last commit (diff) | |
| download | opensim-SC-c10193c72b1f029a958f04d2f5d7ee384e693aaa.zip opensim-SC-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.gz opensim-SC-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.bz2 opensim-SC-c10193c72b1f029a958f04d2f5d7ee384e693aaa.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"); |