diff options
| author | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
| commit | 5ff1687542240fe9b00d4c217b764770fc369c06 (patch) | |
| tree | bc5a1dbc882c19120ca00efb9914d70059cd79cb /linden/indra/newview/llcallingcard.h | |
| parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
| parent | Removed grid stuff from World Map (for now). (diff) | |
| download | meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.zip meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.gz meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.bz2 meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.xz | |
Merge branch 'gridmanager' into next
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llcallingcard.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llcallingcard.h b/linden/indra/newview/llcallingcard.h index cbcb237..21eea2b 100644 --- a/linden/indra/newview/llcallingcard.h +++ b/linden/indra/newview/llcallingcard.h | |||
| @@ -85,7 +85,7 @@ class LLAvatarTracker | |||
| 85 | { | 85 | { |
| 86 | public: | 86 | public: |
| 87 | static LLAvatarTracker& instance() { return sInstance; } | 87 | static LLAvatarTracker& instance() { return sInstance; } |
| 88 | 88 | void reset(); | |
| 89 | void track(const LLUUID& avatar_id, const std::string& name); | 89 | void track(const LLUUID& avatar_id, const std::string& name); |
| 90 | void untrack(const LLUUID& avatar_id); | 90 | void untrack(const LLUUID& avatar_id); |
| 91 | bool isTrackedAgentValid() { return mTrackedAgentValid; } | 91 | bool isTrackedAgentValid() { return mTrackedAgentValid; } |