diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
| commit | 3d70cca7029cc536725088c8ff5d58ad0222eb64 (patch) | |
| tree | 3bdc286929e7a2b913232f0a21137655b399bad5 /indra/newview/llimconversation.cpp | |
| parent | 1d590cd5fdecabbbf6e96be37a2673de347e2224 (diff) | |
| parent | 5aa5a77af66425dd90599b0b0cad5b8f58d7669a (diff) | |
Pull merge from richard/viewer-chui.
Diffstat (limited to 'indra/newview/llimconversation.cpp')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index d1fa6e2103..a321b3545a 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -242,10 +242,6 @@ BOOL LLIMConversation::postBuild() if (isChatMultiTab()) { - if (mIsNearbyChat) - { - setCanClose(FALSE); - } result = LLFloater::postBuild(); } else |