summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2017-06-12 16:28:53 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2017-06-12 16:28:53 +0300
commit52a964376b6aabd1abadfb7329004c2e58b7b97a (patch)
tree3a248b4db583bd5b63b9ae4d95ff75b9f22a63c6
parent3d8dc8cd6dd4ea59ff226f91b114a3298f8f096f (diff)
MAINT-7478 Build fix, boost function doesn't like 'reuse' of cb_do_nothing
-rw-r--r--indra/newview/llfloaterimsessiontab.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index e8dbd2598e..3aee08482b 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -46,7 +46,7 @@
const F32 REFRESH_INTERVAL = 1.0f;
-void cb_do_nothing()
+void cb_group_do_nothing()
{
}
@@ -86,7 +86,7 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id)
mEnableCallbackRegistrar.add("Avatar.CheckItem", boost::bind(&LLFloaterIMSessionTab::checkContextMenuItem, this, _2));
mEnableCallbackRegistrar.add("Avatar.EnableItem", boost::bind(&LLFloaterIMSessionTab::enableContextMenuItem, this, _2));
mCommitCallbackRegistrar.add("Avatar.DoToSelected", boost::bind(&LLFloaterIMSessionTab::doToSelected, this, _2));
- mCommitCallbackRegistrar.add("Group.DoToSelected", boost::bind(&cb_do_nothing));
+ mCommitCallbackRegistrar.add("Group.DoToSelected", boost::bind(&cb_group_do_nothing));
}
LLFloaterIMSessionTab::~LLFloaterIMSessionTab()