diff options
| author | Melanie | 2010-01-09 14:21:50 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-09 14:21:50 +0000 |
| commit | a764eb5dc740c4b7056acad5058d2da0c9c9c740 (patch) | |
| tree | a1014fb5828a32f3355d0cb37a3ba7fce264dc05 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users (diff) | |
| download | opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.zip opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.gz opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.bz2 opensim-SC-a764eb5dc740c4b7056acad5058d2da0c9c9c740.tar.xz | |
Merge branch 'master' into careminster
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 671cfef..f966376 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 1639b7e..23398f7 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 | ||