diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
| commit | 61e3c95dbf8282dbce5455a7adc466d9c2108a13 (patch) | |
| tree | 1d7f029348b6a5c5c66413d00898190fc338e8c2 /indra/newview/llfloaterworldmap.h | |
| parent | 38ab28511473fb6882bab0d5a1ce3f372c48a171 (diff) | |
| parent | 09c01c4e925833873a83665fe0642637b65e547e (diff) | |
Automated merge up from viewer-development
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(); |