livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merging in latest changes

meow-7.2.2
Gilbert Gonzales 2012-10-26 11:41:39 -07:00
parent 83562e059f 2b27e33bc8
commit 895e9036bb
2 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llfolderviewitem.cpp
View File

@ -1473,6 +1473,8 @@ void LLFolderViewFolder::destroyView()
// doesn't delete it.
void LLFolderViewFolder::extractItem( LLFolderViewItem* item )
{
if (item->isSelected())
getRoot()->clearSelection();
items_t::iterator it = std::find(mItems.begin(), mItems.end(), item);
if(it == mItems.end())
{

112
indra/newview/llimfloatercontainer.cpp
View File

@ -825,62 +825,64 @@ void LLIMFloaterContainer::doToParticipants(const std::string& command, uuid_vec
if(selectedIDS.size() > 0)
{
const LLUUID& userID = selectedIDS.front();
if ("view_profile" == command)
if(gAgent.getID() != userID)
{
LLAvatarActions::showProfile(userID);
}
else if("im" == command)
{
LLAvatarActions::startIM(userID);
}
else if("offer_teleport" == command)
{
LLAvatarActions::offerTeleport(selectedIDS);
}
else if("voice_call" == command)
{
LLAvatarActions::startCall(userID);
}
else if("chat_history" == command)
{
LLAvatarActions::viewChatHistory(userID);
}
else if("add_friend" == command)
{
LLAvatarActions::requestFriendshipDialog(userID);
}
else if("remove_friend" == command)
{
LLAvatarActions::removeFriendDialog(userID);
}
else if("invite_to_group" == command)
{
LLAvatarActions::inviteToGroup(userID);
}
else if("map" == command)
{
LLAvatarActions::showOnMap(userID);
}
else if("share" == command)
{
LLAvatarActions::share(userID);
}
else if("pay" == command)
{
LLAvatarActions::pay(userID);
}
else if("block_unblock" == command)
{
LLAvatarActions::toggleBlock(userID);
}
else if("selected" == command || "mute_all" == command || "unmute_all" == command)
{
moderateVoice(command, userID);
}
else if ("toggle_allow_text_chat" == command)
{
toggleAllowTextChat(userID);
if ("view_profile" == command)
{
LLAvatarActions::showProfile(userID);
}
else if("im" == command)
{
LLAvatarActions::startIM(userID);
}
else if("offer_teleport" == command)
{
LLAvatarActions::offerTeleport(selectedIDS);
}
else if("voice_call" == command)
{
LLAvatarActions::startCall(userID);
}
else if("chat_history" == command)
{
LLAvatarActions::viewChatHistory(userID);
}
else if("add_friend" == command)
{
LLAvatarActions::requestFriendshipDialog(userID);
}
else if("remove_friend" == command)
{
LLAvatarActions::removeFriendDialog(userID);
}
else if("invite_to_group" == command)
{
LLAvatarActions::inviteToGroup(userID);
}
else if("map" == command)
{
LLAvatarActions::showOnMap(userID);
}
else if("share" == command)
{
LLAvatarActions::share(userID);
}
else if("pay" == command)
{
LLAvatarActions::pay(userID);
}
else if("block_unblock" == command)
{
LLAvatarActions::toggleBlock(userID);
}
else if("selected" == command || "mute_all" == command || "unmute_all" == command)
{
moderateVoice(command, userID);
}
else if ("toggle_allow_text_chat" == command)
{
toggleAllowTextChat(userID);
}
}
}
}