diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/newview/llagent.h | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index c6d11b5ae5..438239e717 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -170,7 +170,7 @@ public: void setObjectTracking(BOOL track) { mTrackFocusObject = track; } // void setLookingAtAvatar(BOOL looking); - void heardChat(const LLChat& chat); + void heardChat(const LLUUID& id); void lookAtLastChat(); LLUUID getLastChatter() { return mLastChatterID; } F32 getTypingTime() { return mTypingTimer.getElapsedTimeF32(); } |