aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
diff options
context:
space:
mode:
authorMelanie2010-10-29 20:40:48 +0100
committerMelanie2010-10-29 20:40:48 +0100
commit9331898c320d7d6046c6d1ad467cdee0e32c8b71 (patch)
tree917ff7facdeb38d96f5f69576a134cbad4776eae /OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentMerge branch 'dev-appearance' (diff)
downloadopensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.zip
opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.gz
opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.bz2
opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs')
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index db427b4..09f615f 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 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy; 82 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
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;