diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-02 12:57:39 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-02 12:57:39 +0200 |
| commit | 49118ec3bccc47e618600e023adfaf5166c22632 (patch) | |
| tree | 859d010a07a2270d506ecc293344c46b912bb081 /indra | |
| parent | 88a97c64835a399931f2c584392bd39e366f05ec (diff) | |
| parent | 8f59fb177320f15f2ddf7a3aa4cb6b2808509b04 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index b21df87093..f61a928813 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -265,7 +265,7 @@ void LLIMFloater::draw() } } - LLFloater::draw(); + LLTransientDockableFloater::draw(); } |