From 6f41747bc4d8afcb2b19ac02295575031bcf9021 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 21 Oct 2009 04:58:23 +0000 Subject: Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587 * Dev: EXT-748 EXT-1447 * IM Cleanup --- indra/newview/llnearbychathandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llnearbychathandler.cpp') diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 59b19b6dcb..4aefbd1a33 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -225,7 +225,7 @@ void LLNearbyChatScreenChannel::showToastsBottom() LLRect toast_rect; S32 bottom = getRect().mBottom; - S32 margin = gSavedSettings.getS32("ToastMargin"); + S32 margin = gSavedSettings.getS32("ToastGap"); for(std::vector::iterator it = m_active_toasts.begin(); it != m_active_toasts.end(); ++it) { -- cgit v1.2.3