diff options
| author | Melanie | 2010-01-09 14:17:44 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-09 14:17:44 +0000 |
| commit | 063f106cbbc2a805dc210fe16c30741ab24876cb (patch) | |
| tree | 5c338b086d342c21ee7ce26663bd92195d91a139 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-063f106cbbc2a805dc210fe16c30741ab24876cb.zip opensim-SC_OLD-063f106cbbc2a805dc210fe16c30741ab24876cb.tar.gz opensim-SC_OLD-063f106cbbc2a805dc210fe16c30741ab24876cb.tar.bz2 opensim-SC_OLD-063f106cbbc2a805dc210fe16c30741ab24876cb.tar.xz | |
Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users
will be honored now, while allowed groups will not. This requires additional
groups module integration work
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 55bbed9..6785c08 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1220,7 +1220,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1220 | 1220 | ||
| 1221 | } | 1221 | } |
| 1222 | 1222 | ||
| 1223 | public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) | 1223 | public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID) |
| 1224 | { | 1224 | { |
| 1225 | 1225 | ||
| 1226 | } | 1226 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index fa47d16..4a4c515 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -897,7 +897,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 897 | { | 897 | { |
| 898 | } | 898 | } |
| 899 | 899 | ||
| 900 | public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) | 900 | public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID) |
| 901 | { | 901 | { |
| 902 | } | 902 | } |
| 903 | 903 | ||