diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-14 20:00:41 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-14 20:00:41 +0300 |
| commit | 51a39b5ac6465238178363f3ec3143dae4f73919 (patch) | |
| tree | e4b7502b0a4b8ccb7c498e0c22f4c295e8315697 /indra/newview/llimfloater.cpp | |
| parent | 569146f27c7350ca2245f1fa7bc4cb9c16a428ea (diff) | |
CHUI-199 WIP Modified the nearby chat for using floater_im_session.xml; merging LLNearbyChatBar with LLNearbyChat;
clean up code; supressed a double creation of LLNearbyChat
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 7c6de01c96..30a9c29ec6 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -489,7 +489,10 @@ BOOL LLIMFloater::tick() { // This check is needed until LLFloaterReg::removeInstance() is synchronized with deleting the floater // via LLMortician::updateClass(), to avoid calling dead instances. See LLFloater::destroy(). - if (isDead()) return false; + if (isDead()) + { + return false; + } BOOL parents_retcode = LLIMConversation::tick(); |