diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 12:21:53 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 12:21:53 -0800 |
| commit | b964f3bccaf744ec719e7dff132a77801a419f2b (patch) | |
| tree | f5f09ad1904cbf87878d5f6e9f34acbdb64975e2 /indra/newview/llimfloater.cpp | |
| parent | ce397569bf40b5fe6e80eb0e302bf47b709f3e54 (diff) | |
| parent | b3b608b2a8e0678a86c86f3506d6424d4834be20 (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()) |