diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 10:17:56 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 10:17:56 -0800 |
| commit | b3b608b2a8e0678a86c86f3506d6424d4834be20 (patch) | |
| tree | f6c09386bd404e432f703d3f2c5d93727251a324 /indra/newview/llimfloater.cpp | |
| parent | 230f28080cfcb6785c248340aaa42cfb29703b23 (diff) | |
| parent | 8a0341f42e2ba3a91a3ad5bc355966b07ac6801f (diff) | |
Merge from product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 0f32d0b313..aa5a5822eb 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -120,11 +120,7 @@ void LLIMFloater::newIMCallback(const LLSD& data){ LLUUID session_id = data["session_id"].asUUID(); LLIMFloater* floater = LLFloaterReg::findTypedInstance<LLIMFloater>("impanel", session_id); - if (floater == NULL) - { - llwarns << "new_im_callback for non-existent session_id " << session_id << llendl; - return; - } + if (floater == NULL) return; // update if visible, otherwise will be updated when opened if (floater->getVisible()) |