Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wooops, fix minor bug introduced in the conference thing.

Browse Source
This commit is contained in:
Lirusaito
2019-01-09 22:03:20 -05:00
parent 9a424ff264
commit aef77312aa
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llimpanel.cpp
View File

@@ -524,11 +524,14 @@ BOOL LLFloaterIMPanel::postBuild()
if (LLComboBox* flyout = findChild<LLComboBox>("instant_message_flyout")) if (LLComboBox* flyout = findChild<LLComboBox>("instant_message_flyout"))
{ {
flyout->setCommitCallback(boost::bind(&LLFloaterIMPanel::onFlyoutCommit, this, flyout, _2)); flyout->setCommitCallback(boost::bind(&LLFloaterIMPanel::onFlyoutCommit, this, flyout, _2));
if (is_agent_mappable(mOtherParticipantUUID)) if (mSessionType == P2P_SESSION)
flyout->add(getString("find on map"), -2); {
addDynamics(flyout); if (is_agent_mappable(mOtherParticipantUUID))
if (gObjectList.findAvatar(mOtherParticipantUUID)) flyout->add(getString("find on map"), -2);
flyout->add(getString("focus"), -3); addDynamics(flyout);
if (gObjectList.findAvatar(mOtherParticipantUUID))
flyout->add(getString("focus"), -3);
}
} }
if (LLUICtrl* ctrl = findChild<LLUICtrl>("tp_btn")) if (LLUICtrl* ctrl = findChild<LLUICtrl>("tp_btn"))
ctrl->setCommitCallback(boost::bind(static_cast<void(*)(const LLUUID&)>(LLAvatarActions::offerTeleport), mOtherParticipantUUID)); ctrl->setCommitCallback(boost::bind(static_cast<void(*)(const LLUUID&)>(LLAvatarActions::offerTeleport), mOtherParticipantUUID));