diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 18:24:07 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 18:24:07 -0800 |
| commit | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (patch) | |
| tree | 9c0df85bb3a8b5c4e58655179e1b29ee31594cfc /indra/newview/llnearbychat.h | |
| parent | 5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (diff) | |
| parent | db4e46e93d06c03520cb7c781b8e41b6d374414d (diff) | |
automated merge from trunk
Diffstat (limited to 'indra/newview/llnearbychat.h')
| -rw-r--r-- | indra/newview/llnearbychat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 938b77df7a..5fb8ade19e 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -47,7 +47,7 @@ public: ~LLNearbyChat(); BOOL postBuild (); - void addMessage (const LLChat& message,bool archive = true); + void addMessage (const LLChat& message,bool archive = true, const LLSD &args = LLSD()); void onNearbyChatContextMenuItemClicked(const LLSD& userdata); bool onNearbyChatCheckContextMenuItem(const LLSD& userdata); |