aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolbar.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/lltoolbar.cpp
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/lltoolbar.cpp')
-rw-r--r--linden/indra/newview/lltoolbar.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index 4120c2d..9edc469 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -389,7 +389,7 @@ void LLToolBar::updateCommunicateList()
389 communicate_button->addSeparator(ADD_TOP); 389 communicate_button->addSeparator(ADD_TOP);
390 communicate_button->add(LLFloaterMute::getInstance()->getShortTitle(), LLSD("mute list"), ADD_TOP); 390 communicate_button->add(LLFloaterMute::getInstance()->getShortTitle(), LLSD("mute list"), ADD_TOP);
391 391
392 std::set<LLViewHandle>::const_iterator floater_handle_it; 392 std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it;
393 393
394 if (gIMMgr->getIMFloaterHandles().size() > 0) 394 if (gIMMgr->getIMFloaterHandles().size() > 0)
395 { 395 {
@@ -398,7 +398,7 @@ void LLToolBar::updateCommunicateList()
398 398
399 for(floater_handle_it = gIMMgr->getIMFloaterHandles().begin(); floater_handle_it != gIMMgr->getIMFloaterHandles().end(); ++floater_handle_it) 399 for(floater_handle_it = gIMMgr->getIMFloaterHandles().begin(); floater_handle_it != gIMMgr->getIMFloaterHandles().end(); ++floater_handle_it)
400 { 400 {
401 LLFloaterIMPanel* im_floaterp = (LLFloaterIMPanel*)LLFloater::getFloaterByHandle(*floater_handle_it); 401 LLFloaterIMPanel* im_floaterp = (LLFloaterIMPanel*)floater_handle_it->get();
402 if (im_floaterp) 402 if (im_floaterp)
403 { 403 {
404 LLString floater_title = im_floaterp->getNumUnreadMessages() > 0 ? "*" : ""; 404 LLString floater_title = im_floaterp->getNumUnreadMessages() > 0 ? "*" : "";
@@ -443,10 +443,10 @@ void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, void* user_data)
443 LLFloaterChatterBox::getInstance()->addFloater(LLFloaterChat::getInstance(), FALSE); 443 LLFloaterChatterBox::getInstance()->addFloater(LLFloaterChat::getInstance(), FALSE);
444 LLUUID session_to_show; 444 LLUUID session_to_show;
445 445
446 std::set<LLViewHandle>::const_iterator floater_handle_it; 446 std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it;
447 for(floater_handle_it = gIMMgr->getIMFloaterHandles().begin(); floater_handle_it != gIMMgr->getIMFloaterHandles().end(); ++floater_handle_it) 447 for(floater_handle_it = gIMMgr->getIMFloaterHandles().begin(); floater_handle_it != gIMMgr->getIMFloaterHandles().end(); ++floater_handle_it)
448 { 448 {
449 LLFloater* im_floaterp = LLFloater::getFloaterByHandle(*floater_handle_it); 449 LLFloater* im_floaterp = floater_handle_it->get();
450 if (im_floaterp) 450 if (im_floaterp)
451 { 451 {
452 if (im_floaterp->isFrontmost()) 452 if (im_floaterp->isFrontmost())