diff options
| author | Melanie Thielker | 2010-08-07 03:40:01 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-07 03:40:01 +0200 |
| commit | 7477d7a0369402b6c6c6d41712e578060f8926e8 (patch) | |
| tree | 6636d4a2318b552420fbdfcf9a29e31dc3cb62b2 /OpenSim/Region/OptionalModules/World/NPC | |
| parent | Make the landmark properties and search places work again (diff) | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| download | opensim-SC-7477d7a0369402b6c6c6d41712e578060f8926e8.zip opensim-SC-7477d7a0369402b6c6c6d41712e578060f8926e8.tar.gz opensim-SC-7477d7a0369402b6c6c6d41712e578060f8926e8.tar.bz2 opensim-SC-7477d7a0369402b6c6c6d41712e578060f8926e8.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 23255fb..d6f4d53 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -156,7 +156,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 156 | #pragma warning disable 67 | 156 | #pragma warning disable 67 |
| 157 | public event Action<IClientAPI> OnLogout; | 157 | public event Action<IClientAPI> OnLogout; |
| 158 | public event ObjectPermissions OnObjectPermissions; | 158 | public event ObjectPermissions OnObjectPermissions; |
| 159 | 159 | public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; | |
| 160 | public event MoneyTransferRequest OnMoneyTransferRequest; | 160 | public event MoneyTransferRequest OnMoneyTransferRequest; |
| 161 | public event ParcelBuy OnParcelBuy; | 161 | public event ParcelBuy OnParcelBuy; |
| 162 | public event Action<IClientAPI> OnConnectionClosed; | 162 | public event Action<IClientAPI> OnConnectionClosed; |