diff options
| author | Melanie | 2010-01-09 16:35:32 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-09 16:35:32 +0000 |
| commit | 089f5403a7fe8521b8244d7486186fb36ddd36c2 (patch) | |
| tree | 6d743e8854a888883ff52b35c945201129b0f60d /OpenSim | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | A last fix for estate access by group. One should send the correct list. (diff) | |
| download | opensim-SC_OLD-089f5403a7fe8521b8244d7486186fb36ddd36c2.zip opensim-SC_OLD-089f5403a7fe8521b8244d7486186fb36ddd36c2.tar.gz opensim-SC_OLD-089f5403a7fe8521b8244d7486186fb36ddd36c2.tar.bz2 opensim-SC_OLD-089f5403a7fe8521b8244d7486186fb36ddd36c2.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index deade6b..695cced 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -278,7 +278,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 278 | { | 278 | { |
| 279 | m_scene.RegionInfo.EstateSettings.AddEstateGroup(user); | 279 | m_scene.RegionInfo.EstateSettings.AddEstateGroup(user); |
| 280 | m_scene.RegionInfo.EstateSettings.Save(); | 280 | m_scene.RegionInfo.EstateSettings.Save(); |
| 281 | remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AllowedGroups, m_scene.RegionInfo.EstateSettings.EstateAccess, m_scene.RegionInfo.EstateSettings.EstateID); | 281 | remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AllowedGroups, m_scene.RegionInfo.EstateSettings.EstateGroups, m_scene.RegionInfo.EstateSettings.EstateID); |
| 282 | } | 282 | } |
| 283 | else | 283 | else |
| 284 | { | 284 | { |
| @@ -292,7 +292,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 292 | m_scene.RegionInfo.EstateSettings.RemoveEstateGroup(user); | 292 | m_scene.RegionInfo.EstateSettings.RemoveEstateGroup(user); |
| 293 | m_scene.RegionInfo.EstateSettings.Save(); | 293 | m_scene.RegionInfo.EstateSettings.Save(); |
| 294 | 294 | ||
| 295 | remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AllowedGroups, m_scene.RegionInfo.EstateSettings.EstateAccess, m_scene.RegionInfo.EstateSettings.EstateID); | 295 | remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AllowedGroups, m_scene.RegionInfo.EstateSettings.EstateGroups, m_scene.RegionInfo.EstateSettings.EstateID); |
| 296 | } | 296 | } |
| 297 | else | 297 | else |
| 298 | { | 298 | { |