diff options
| author | John Hurliman | 2010-03-10 14:06:12 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-03-10 14:06:12 -0800 |
| commit | b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a (patch) | |
| tree | c20d8f5be598d70caff0589629427f6450573cf4 /OpenSim/Region/OptionalModules | |
| parent | * Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debu... (diff) | |
| parent | Reintroduce a check that was dropped from permissions (diff) | |
| download | opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.zip opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.gz opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.bz2 opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index f2253f2..1885946 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -680,6 +680,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 680 | public event Action<IClientAPI> OnRegionHandShakeReply; | 680 | public event Action<IClientAPI> OnRegionHandShakeReply; |
| 681 | public event GenericCall2 OnRequestWearables; | 681 | public event GenericCall2 OnRequestWearables; |
| 682 | public event GenericCall1 OnCompleteMovementToRegion; | 682 | public event GenericCall1 OnCompleteMovementToRegion; |
| 683 | public event UpdateAgent OnPreAgentUpdate; | ||
| 683 | public event UpdateAgent OnAgentUpdate; | 684 | public event UpdateAgent OnAgentUpdate; |
| 684 | public event AgentRequestSit OnAgentRequestSit; | 685 | public event AgentRequestSit OnAgentRequestSit; |
| 685 | public event AgentSit OnAgentSit; | 686 | public event AgentSit OnAgentSit; |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 65445d9..77958eb 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -190,6 +190,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 190 | public event Action<IClientAPI> OnRegionHandShakeReply; | 190 | public event Action<IClientAPI> OnRegionHandShakeReply; |
| 191 | public event GenericCall2 OnRequestWearables; | 191 | public event GenericCall2 OnRequestWearables; |
| 192 | public event GenericCall1 OnCompleteMovementToRegion; | 192 | public event GenericCall1 OnCompleteMovementToRegion; |
| 193 | public event UpdateAgent OnPreAgentUpdate; | ||
| 193 | public event UpdateAgent OnAgentUpdate; | 194 | public event UpdateAgent OnAgentUpdate; |
| 194 | public event AgentRequestSit OnAgentRequestSit; | 195 | public event AgentRequestSit OnAgentRequestSit; |
| 195 | public event AgentSit OnAgentSit; | 196 | public event AgentSit OnAgentSit; |