diff options
author | meta7 | 2010-08-18 02:53:27 -0700 |
---|---|---|
committer | meta7 | 2010-08-18 02:53:27 -0700 |
commit | ca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch) | |
tree | 2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Region/Examples | |
parent | Fix a nullref exception in the prioritizer (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2 opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index cdc56a2..944ad94 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -520,7 +520,11 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
520 | { | 520 | { |
521 | } | 521 | } |
522 | 522 | ||
523 | public virtual void SendTeleportLocationStart() | 523 | public virtual void SendTeleportStart(uint flags) |
524 | { | ||
525 | } | ||
526 | |||
527 | public virtual void SendTeleportProgress(uint flags, string message) | ||
524 | { | 528 | { |
525 | } | 529 | } |
526 | 530 | ||