diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-30 14:29:56 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-30 14:29:56 +0200 |
| commit | 982ed974efe9483d040789845c1059e2a93d073d (patch) | |
| tree | 23689959f1ed002c55b39852b68c4e38073c2eb6 /indra/newview/llnearbychathandler.cpp | |
| parent | 0a6f3fadcf97d1055a5cf78ee9917469b22ea094 (diff) | |
| parent | 7dd9fb280663dfd0842b69e8c5f706fd96b8cf75 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 1668a6d999..957513e154 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -162,6 +162,8 @@ bool LLNearbyChatScreenChannel::createPoolToast() LLToast::Params p; p.panel = panel; + p.lifetime_secs = gSavedSettings.getS32("NearbyToastLifeTime"); + p.fading_time_secs = gSavedSettings.getS32("NearbyToastFadingTime"); LLToast* toast = new LLToast(p); |