diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-07 10:39:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-07 10:39:05 -0500 |
| commit | e1e38c4cee980f815091cd94c8a529ffe3e24918 (patch) | |
| tree | 35b16f61bd120f83bb74a77d4417dce1108e0542 /indra/newview/llfloaterworldmap.h | |
| parent | c02d6a319f378d5dcc34c51b20f556f175d2a40a (diff) | |
| parent | 09c01c4e925833873a83665fe0642637b65e547e (diff) | |
merge changes for storm-34
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(); |