diff options
| author | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
| commit | 8c12f22140d2885bb79aa4e201345ae6fd45fec6 (patch) | |
| tree | e6d3fd25eafdee7f790f54d092e8494be4715149 /OpenSim/Region/Examples | |
| parent | Add textures no longer shipped with newer viewers to OpenSim's standard asset... (diff) | |
| parent | Prevent a bad cast in llCreateLink(). (diff) | |
| download | opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.zip opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.gz opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.bz2 opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 f6e6163..268612e 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 | ||