diff options
| author | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
| commit | d219317074ae8ff1665118988cecb8168ae0085e (patch) | |
| tree | 89a6b01925b24f83272ec36f0b6a9c378f235d59 /OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Configuration of persistent baked textures and save/send delays. (diff) | |
| download | opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.zip opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.gz opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.bz2 opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs')
| -rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 268612e..f128aa2 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
| @@ -82,7 +82,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 82 | 82 | ||
| 83 | public event DeRezObject OnDeRezObject; | 83 | public event DeRezObject OnDeRezObject; |
| 84 | public event Action<IClientAPI> OnRegionHandShakeReply; | 84 | public event Action<IClientAPI> OnRegionHandShakeReply; |
| 85 | public event GenericCall2 OnRequestWearables; | 85 | public event GenericCall1 OnRequestWearables; |
| 86 | public event GenericCall1 OnCompleteMovementToRegion; | 86 | public event GenericCall1 OnCompleteMovementToRegion; |
| 87 | public event UpdateAgent OnPreAgentUpdate; | 87 | public event UpdateAgent OnPreAgentUpdate; |
| 88 | public event UpdateAgent OnAgentUpdate; | 88 | public event UpdateAgent OnAgentUpdate; |