diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-04 16:19:14 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-04 16:19:14 +0200 |
| commit | 8ccb55c2ddfe325432ee8c5b3effeffc04f26d0f (patch) | |
| tree | ec721eb29a221eab3e83dee44ebea3cf9108c39f /indra/newview | |
| parent | 0782f64b642756c02ffa1ec72c2f2e5874ed26e9 (diff) | |
| parent | 0508dab52393a02e9ace36441b3b755eb3617d08 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 2ad82d3e8e..649c414569 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -63,7 +63,7 @@ static const S32 RESIZE_BAR_THICKNESS = 3; LLNearbyChat::LLNearbyChat(const LLSD& key) - : LLDockableFloater(NULL, false, key) + : LLDockableFloater(NULL, false, false, key) ,mChatHistory(NULL) { |