diff options
| author | leyla_linden <none@none> | 2011-01-10 12:10:36 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-10 12:10:36 -0800 |
| commit | b63a404613182edfd230abda595f064c7bcc1c10 (patch) | |
| tree | 18a4cb6abdfa52bb68ded012f9f4b53d491b0c48 /indra/newview/llfloaterworldmap.h | |
| parent | 523722652259d37841be2ad4ad283df4887ad372 (diff) | |
| parent | fdf19a526821291bd3d6a6e1f6b78dcaeac63705 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterworldmap.h')
| -rw-r--r-- | indra/newview/llfloaterworldmap.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h index 1628a421ec..783d9f4819 100644 --- a/indra/newview/llfloaterworldmap.h +++ b/indra/newview/llfloaterworldmap.h @@ -106,6 +106,11 @@ public: // teleport to the tracked item, if there is one void teleport(); void onChangeMaturity(); + + + //Slapp instigated avatar tracking + void avatarTrackFromSlapp( const LLUUID& id ); + protected: void onGoHome(); |