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/OptionalModules/World/NPC | |
| 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_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.zip opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.gz opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.bz2 opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 2e0450c..fae12b6 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -611,7 +611,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 611 | { | 611 | { |
| 612 | } | 612 | } |
| 613 | 613 | ||
| 614 | public virtual void SendTeleportLocationStart() | 614 | public virtual void SendTeleportStart(uint flags) |
| 615 | { | ||
| 616 | } | ||
| 617 | |||
| 618 | public virtual void SendTeleportProgress(uint flags, string message) | ||
| 615 | { | 619 | { |
| 616 | } | 620 | } |
| 617 | 621 | ||