diff options
Diffstat (limited to 'indra/newview/llchiclet.h')
| -rw-r--r-- | indra/newview/llchiclet.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h index ef47b54333..458bc73bc4 100644 --- a/indra/newview/llchiclet.h +++ b/indra/newview/llchiclet.h @@ -752,6 +752,8 @@ protected: S32 getScrollingOffset() { return mScrollingOffset; } + bool isAnyIMFloaterDoked(); + protected: chiclet_list_t mChicletList; @@ -818,7 +820,10 @@ T* LLChicletPanel::createChiclet(const LLUUID& session_id /*= LLUUID::null*/, S3 return NULL; } - scrollToChiclet(chiclet); + if (!isAnyIMFloaterDoked()) + { + scrollToChiclet(chiclet); + } chiclet->setSessionId(session_id); |