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

Beware the coral, it adds the reef factor

Browse Source
This commit is contained in:
Lirusaito
2019-01-07 17:39:54 -05:00
parent 0e21b53c2f
commit adba4cf1fa
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/llimpanel.cpp
View File

@@ -1016,26 +1016,29 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
return;
}
int option = value.asInteger();
if (option == 1) onClickHistory();
else if (option == 2) LLAvatarActions::offerTeleport(mOtherParticipantUUID);
else if (option == 3) LLAvatarActions::teleportRequest(mOtherParticipantUUID);
else if (option == 4) LLAvatarActions::pay(mOtherParticipantUUID);
else if (option == 5) LLAvatarActions::inviteToGroup(mOtherParticipantUUID);
else if (option == -1) copy_profile_uri(mOtherParticipantUUID);
else if (option == -2) LLAvatarActions::showOnMap(mOtherParticipantUUID);
else if (option == -3) gAgentCamera.lookAtObject(mOtherParticipantUUID);
else if (option >= 6) // Options that use dynamic items
switch (int option = value.asInteger())
{
case 1: onClickHistory(); break;
case 2: LLAvatarActions::offerTeleport(mOtherParticipantUUID); break;
case 3: LLAvatarActions::teleportRequest(mOtherParticipantUUID); break;
case 4: LLAvatarActions::pay(mOtherParticipantUUID); break;
case 5: LLAvatarActions::inviteToGroup(mOtherParticipantUUID); break;
case -1: copy_profile_uri(mOtherParticipantUUID); break;
case -2: LLAvatarActions::showOnMap(mOtherParticipantUUID); break;
case -3: gAgentCamera.lookAtObject(mOtherParticipantUUID); break;
default: // Options >= 6 use dynamic items
{
// First remove them all
removeDynamics(flyout);
// Toggle as requested, adjust the strings
if (option == 6) mDing = !mDing;
else if (option == 7) mRPMode = !mRPMode;
else if (option == 8) LLAvatarActions::isFriend(mOtherParticipantUUID) ? LLAvatarActions::removeFriendDialog(mOtherParticipantUUID) : LLAvatarActions::requestFriendshipDialog(mOtherParticipantUUID);
else if (option == 9) LLAvatarActions::toggleBlock(mOtherParticipantUUID);
switch (option)
{
case 6: mDing = !mDing; break;
case 7: mRPMode = !mRPMode; break;
case 8: LLAvatarActions::isFriend(mOtherParticipantUUID) ? LLAvatarActions::removeFriendDialog(mOtherParticipantUUID) : LLAvatarActions::requestFriendshipDialog(mOtherParticipantUUID); break;
case 9: LLAvatarActions::toggleBlock(mOtherParticipantUUID); break;
}
// Last add them back
addDynamics(flyout);
@@ -1044,6 +1047,7 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
if (flyout->remove(focus)) // If present, reorder to bottom.
flyout->add(focus, -3);
}
}
}
void show_log_browser(const std::string& name, const std::string& id)