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

Pull merge

meow-7.2.2
Merov Linden 2013-04-08 18:59:58 -07:00
parent d533a33f42 48d98b4930
commit 21d7c1d0ba
15 changed files with 317 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
indra/newview/llfloaterimcontainer.cpp
View File

@ -586,6 +586,28 @@ void LLFloaterIMContainer::returnFloaterToHost()
floater->onTearOffClicked();
}
void LLFloaterIMContainer::setMinimized(BOOL b)
{
bool was_minimized = isMinimized();
LLMultiFloater::setMinimized(b);
//Switching from minimized to un-minimized
if(was_minimized && !b)
{
LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(mSelectedSession);
if(session_floater && !session_floater->isTornOff())
{
//When in DND mode, remove stored IM notifications
//Nearby chat (Null) IMs are not stored while in DND mode, so can ignore removal
if(gAgent.isDoNotDisturb() && mSelectedSession.notNull())
{
LLDoNotDisturbNotificationStorage::getInstance()->removeNotification(LLDoNotDisturbNotificationStorage::toastName, mSelectedSession);
}
}
}
}
void LLFloaterIMContainer::setVisible(BOOL visible)
{ LLFloaterIMNearbyChat* nearby_chat;
if (visible)
@ -598,10 +620,21 @@ void LLFloaterIMContainer::setVisible(BOOL visible)
// *TODO: find a way to move this to XML as a default panel or something like that
LLSD name("nearby_chat");
LLFloaterReg::toggleInstanceOrBringToFront(name);
setSelectedSession(LLUUID(NULL));
selectConversationPair(LLUUID(NULL), false, false);
}
openNearbyChat();
selectConversationPair(getSelectedSession(), false, false);
flashConversationItemWidget(mSelectedSession,false);
LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(mSelectedSession);
if(session_floater && !session_floater->isMinimized())
{
//When in DND mode, remove stored IM notifications
//Nearby chat (Null) IMs are not stored while in DND mode, so can ignore removal
if(gAgent.isDoNotDisturb() && mSelectedSession.notNull())
{
LLDoNotDisturbNotificationStorage::getInstance()->removeNotification(LLDoNotDisturbNotificationStorage::toastName, mSelectedSession);
}
}
}
nearby_chat = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat");
@ -1179,7 +1212,8 @@ bool LLFloaterIMContainer::enableContextMenuItem(const LLSD& userdata)
//Enable Chat history item for ad-hoc and group conversations
if ("can_chat_history" == item && uuids.size() > 0)
{
return LLLogChat::isTranscriptExist(uuids.front());
bool is_group = (getCurSelectedViewModelItem()->getType() == LLConversationItem::CONV_SESSION_GROUP);
return LLLogChat::isTranscriptExist(uuids.front(),is_group);
}
// If nothing is selected(and selected item is not group chat), everything needs to be disabled
@ -1390,13 +1424,6 @@ BOOL LLFloaterIMContainer::selectConversationPair(const LLUUID& session_id, bool
widget->getParentFolder()->setSelection(widget, FALSE, FALSE);
mConversationsRoot->scrollToShowSelection();
}
//When in DND mode, remove stored IM notifications
//Nearby chat (Null) IMs are not stored while in DND mode, so can ignore removal
if(gAgent.isDoNotDisturb() && session_id.notNull())
{
LLDoNotDisturbNotificationStorage::getInstance()->removeNotification(LLDoNotDisturbNotificationStorage::toastName, session_id);
}
}
/* floater processing */
@ -1421,14 +1448,19 @@ BOOL LLFloaterIMContainer::selectConversationPair(const LLUUID& session_id, bool
{
showStub(true);
}
//When in DND mode, remove stored IM notifications
//Nearby chat (Null) IMs are not stored while in DND mode, so can ignore removal
if(gAgent.isDoNotDisturb() && session_id.notNull())
{
LLDoNotDisturbNotificationStorage::getInstance()->removeNotification(LLDoNotDisturbNotificationStorage::toastName, session_id);
}
}
// Set the focus on the selected floater
if (!session_floater->hasFocus())
if (!session_floater->hasFocus() && !session_floater->isMinimized())
{
BOOL is_minimized = session_floater->isMinimized();
session_floater->setFocus(focus_floater);
session_floater->setMinimized(is_minimized);
}
}
flashConversationItemWidget(session_id,false);
@ -1986,8 +2018,11 @@ void LLFloaterIMContainer::closeFloater(bool app_quitting/* = false*/)
{
// Always unminimize before trying to close.
// Most of the time the user will never see this state.
setMinimized(FALSE);
if(isMinimized())
{
LLMultiFloater::setMinimized(FALSE);
}
LLFloater::closeFloater(app_quitting);
}

1
indra/newview/llfloaterimcontainer.h
View File

@ -59,6 +59,7 @@ public:
/*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void draw();
/*virtual*/ void setMinimized(BOOL b);
/*virtual*/ void setVisible(BOOL visible);
/*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD());
/*virtual*/ void updateResizeLimits();

2
indra/newview/llfloaterimnearbychat.cpp
View File

@ -328,7 +328,7 @@ void LLFloaterIMNearbyChat::onChatFontChange(LLFontGL* fontp)
void LLFloaterIMNearbyChat::show()
{
openFloater(getKey());
}
}
bool LLFloaterIMNearbyChat::isChatVisible() const
{

30
indra/newview/llfloaterimsession.cpp
View File

@ -39,6 +39,7 @@
#include "llchannelmanager.h"
#include "llchiclet.h"
#include "llchicletbar.h"
#include "lldonotdisturbnotificationstorage.h"
#include "llfloaterreg.h"
#include "llfloateravatarpicker.h"
#include "llfloaterimcontainer.h" // to replace separate IM Floaters with multifloater container
@ -645,6 +646,23 @@ void LLFloaterIMSession::setDocked(bool docked, bool pop_on_undock)
}
}
void LLFloaterIMSession::setMinimized(BOOL b)
{
bool wasMinimized = isMinimized();
LLFloaterIMSessionTab::setMinimized(b);
//Switching from minimized state to un-minimized state
if(wasMinimized && !b)
{
//When in DND mode, remove stored IM notifications
//Nearby chat (Null) IMs are not stored while in DND mode, so can ignore removal
if(gAgent.isDoNotDisturb())
{
LLDoNotDisturbNotificationStorage::getInstance()->removeNotification(LLDoNotDisturbNotificationStorage::toastName, mSessionID);
}
}
}
void LLFloaterIMSession::setVisible(BOOL visible)
{
LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*>
@ -713,6 +731,18 @@ BOOL LLFloaterIMSession::getVisible()
return visible;
}
void LLFloaterIMSession::setFocus(BOOL focus)
{
LLFloaterIMSessionTab::setFocus(focus);
//When in DND mode, remove stored IM notifications
//Nearby chat (Null) IMs are not stored while in DND mode, so can ignore removal
if(focus && gAgent.isDoNotDisturb())
{
LLDoNotDisturbNotificationStorage::getInstance()->removeNotification(LLDoNotDisturbNotificationStorage::toastName, mSessionID);
}
}
//static
bool LLFloaterIMSession::toggle(const LLUUID& session_id)
{

2
indra/newview/llfloaterimsession.h
View File

@ -65,8 +65,10 @@ public:
// LLView overrides
/*virtual*/ BOOL postBuild();
/*virtual*/ void setMinimized(BOOL b);
/*virtual*/ void setVisible(BOOL visible);
/*virtual*/ BOOL getVisible();
/*virtual*/ void setFocus(BOOL focus);
// Check typing timeout timer.
/*virtual*/ void draw();

125
indra/newview/llgroupactions.cpp
View File

@ -116,6 +116,80 @@ public:
};
LLGroupHandler gGroupHandler;
// This object represents a pending request for specified group member information
// which is needed to check whether avatar can leave group
class LLFetchGroupMemberData : public LLGroupMgrObserver
{
public:
LLFetchGroupMemberData(const LLUUID& group_id) :
mGroupId(group_id),
mRequestProcessed(false),
LLGroupMgrObserver(group_id)
{
llinfos << "Sending new group member request for group_id: "<< group_id << llendl;
LLGroupMgr* mgr = LLGroupMgr::getInstance();
// register ourselves as an observer
mgr->addObserver(this);
// send a request
mgr->sendGroupPropertiesRequest(group_id);
mgr->sendCapGroupMembersRequest(group_id);
}
~LLFetchGroupMemberData()
{
if (!mRequestProcessed)
{
// Request is pending
llwarns << "Destroying pending group member request for group_id: "
<< mGroupId << llendl;
}
// Remove ourselves as an observer
LLGroupMgr::getInstance()->removeObserver(this);
}
void changed(LLGroupChange gc)
{
if (gc == GC_MEMBER_DATA && !mRequestProcessed)
{
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupId);
if (!gdatap)
{
llwarns << "LLGroupMgr::getInstance()->getGroupData() was NULL" << llendl;
}
else if (!gdatap->isMemberDataComplete())
{
llwarns << "LLGroupMgr::getInstance()->getGroupData()->isMemberDataComplete() was FALSE" << llendl;
}
else
{
processGroupData();
mRequestProcessed = true;
}
}
}
LLUUID getGroupId() { return mGroupId; }
virtual void processGroupData() = 0;
protected:
LLUUID mGroupId;
private:
bool mRequestProcessed;
};
class LLFetchLeaveGroupData: public LLFetchGroupMemberData
{
public:
LLFetchLeaveGroupData(const LLUUID& group_id)
: LLFetchGroupMemberData(group_id)
{}
void processGroupData()
{
LLGroupActions::processLeaveGroupDataResponse(mGroupId);
}
};
LLFetchLeaveGroupData* gFetchLeaveGroupData = NULL;
// static
void LLGroupActions::search()
{
@ -208,23 +282,52 @@ bool LLGroupActions::onJoinGroup(const LLSD& notification, const LLSD& response)
void LLGroupActions::leave(const LLUUID& group_id)
{
if (group_id.isNull())
{
return;
}
S32 count = gAgent.mGroups.count();
S32 i;
for (i = 0; i < count; ++i)
LLGroupData group_data;
if (gAgent.getGroupData(group_id, group_data))
{
if(gAgent.mGroups.get(i).mID == group_id)
break;
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id);
if (!gdatap || !gdatap->isMemberDataComplete())
{
if (gFetchLeaveGroupData != NULL)
{
delete gFetchLeaveGroupData;
gFetchLeaveGroupData = NULL;
}
gFetchLeaveGroupData = new LLFetchLeaveGroupData(group_id);
}
else
{
processLeaveGroupDataResponse(group_id);
}
}
if (i < count)
}
//static
void LLGroupActions::processLeaveGroupDataResponse(const LLUUID group_id)
{
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id);
LLUUID agent_id = gAgent.getID();
LLGroupMgrGroupData::member_list_t::iterator mit = gdatap->mMembers.find(agent_id);
//get the member data for the group
if ( mit != gdatap->mMembers.end() )
{
LLSD args;
args["GROUP"] = gAgent.mGroups.get(i).mName;
LLSD payload;
payload["group_id"] = group_id;
LLNotificationsUtil::add("GroupLeaveConfirmMember", args, payload, onLeaveGroup);
LLGroupMemberData* member_data = (*mit).second;
if ( member_data && member_data->isOwner() && gdatap->mMemberCount == 1)
{
LLNotificationsUtil::add("OwnerCannotLeaveGroup");
return;
}
}
LLSD args;
args["GROUP"] = gdatap->mName;
LLSD payload;
payload["group_id"] = group_id;
LLNotificationsUtil::add("GroupLeaveConfirmMember", args, payload, onLeaveGroup);
}
// static

8
indra/newview/llgroupactions.h
View File

@ -114,6 +114,14 @@ public:
private:
static bool onJoinGroup(const LLSD& notification, const LLSD& response);
static bool onLeaveGroup(const LLSD& notification, const LLSD& response);
/**
* This function is called by LLFetchLeaveGroupData upon receiving a response to a group
* members data request.
*/
static void processLeaveGroupDataResponse(const LLUUID group_id);
friend class LLFetchLeaveGroupData;
};
#endif // LL_LLGROUPACTIONS_H

13
indra/newview/llimview.cpp
View File

@ -182,18 +182,19 @@ void on_new_message(const LLSD& msg)
{
conversations_floater_status = CLOSED;
}
else if (!session_floater || !LLFloater::isVisible(session_floater)
|| session_floater->isMinimized() || !session_floater->hasFocus())
else if (!im_box->hasFocus() &&
!(session_floater && LLFloater::isVisible(session_floater)
&& !session_floater->isMinimized() && session_floater->hasFocus()))
{
conversations_floater_status = NOT_ON_TOP;
}
else if ((session_floater->hasFocus()) && (im_box->getSelectedSession() == session_id))
else if (im_box->getSelectedSession() != session_id)
{
conversations_floater_status = ON_TOP_AND_ITEM_IS_SELECTED;
conversations_floater_status = ON_TOP;
}
else
{
conversations_floater_status = ON_TOP;
conversations_floater_status = ON_TOP_AND_ITEM_IS_SELECTED;
}
// determine user prefs for this session
@ -226,7 +227,7 @@ void on_new_message(const LLSD& msg)
// 0. nothing - exit
if (("none" == user_preferences ||
ON_TOP_AND_ITEM_IS_SELECTED == conversations_floater_status)
&& session_floater->isMessagePaneExpanded())
&& session_floater->isMessagePaneExpanded())
{
return;
}

28
indra/newview/lllogchat.cpp
View File

@ -631,7 +631,7 @@ void LLLogChat::deleteTranscripts()
}
// static
bool LLLogChat::isTranscriptExist(const LLUUID& avatar_id)
bool LLLogChat::isTranscriptExist(const LLUUID& avatar_id, bool is_group)
{
std::vector<std::string> list_of_transcriptions;
LLLogChat::getListOfTranscriptFiles(list_of_transcriptions);
@ -641,15 +641,31 @@ bool LLLogChat::isTranscriptExist(const LLUUID& avatar_id)
LLAvatarName avatar_name;
LLAvatarNameCache::get(avatar_id, &avatar_name);
std::string avatar_user_name = avatar_name.getAccountName();
std::replace(avatar_user_name.begin(), avatar_user_name.end(), '.', '_');
BOOST_FOREACH(std::string& transcript_file_name, list_of_transcriptions)
if(!is_group)
{
if (std::string::npos != transcript_file_name.find(avatar_user_name))
std::replace(avatar_user_name.begin(), avatar_user_name.end(), '.', '_');
BOOST_FOREACH(std::string& transcript_file_name, list_of_transcriptions)
{
return true;
if (std::string::npos != transcript_file_name.find(avatar_user_name))
{
return true;
}
}
}
else
{
std::string file_name;
gCacheName->getGroupName(avatar_id, file_name);
file_name = makeLogFileName(file_name);
BOOST_FOREACH(std::string& transcript_file_name, list_of_transcriptions)
{
if (transcript_file_name == file_name)
{
return true;
}
}
}
}
return false;

2
indra/newview/lllogchat.h
View File

@ -67,7 +67,7 @@ public:
std::vector<std::string>& listOfFilesToMove);
static void deleteTranscripts();
static bool isTranscriptExist(const LLUUID& avatar_id);
static bool isTranscriptExist(const LLUUID& avatar_id, bool is_group=false);
private:
static std::string cleanFileName(std::string filename);

26
indra/newview/lltoastimpanel.cpp
View File

@ -28,6 +28,7 @@
#include "lltoastimpanel.h"
#include "llagent.h"
#include "llavatarnamecache.h"
#include "llfloaterreg.h"
#include "llgroupactions.h"
#include "llgroupiconctrl.h"
@ -61,6 +62,15 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif
style_params.font.name(font_name);
style_params.font.size(font_size);
LLIMModel::LLIMSession* im_session = LLIMModel::getInstance()->findIMSession(p.session_id);
mIsGroupMsg = (im_session->mSessionType == LLIMModel::LLIMSession::GROUP_SESSION);
if(mIsGroupMsg)
{
mAvatarName->setValue(im_session->mName);
LLAvatarName avatar_name;
LLAvatarNameCache::get(p.avatar_id, &avatar_name);
p.message = "[From " + avatar_name.getDisplayName() + "]\n" + p.message;
}
//Handle IRC styled /me messages.
std::string prefix = p.message.substr(0, 4);
@ -81,12 +91,17 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif
mMessage->setText(p.message, style_params);
}
mAvatarName->setValue(p.from);
if(!mIsGroupMsg)
{
mAvatarName->setValue(p.from);
}
mTime->setValue(p.time);
mSessionID = p.session_id;
mAvatarID = p.avatar_id;
mNotification = p.notification;
initIcon();
S32 maxLinesCount;
@ -147,7 +162,14 @@ void LLToastIMPanel::spawnNameToolTip()
LLToolTip::Params params;
params.background_visible(false);
params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_avatar", LLSD().with("avatar_id", mAvatarID), FALSE));
if(!mIsGroupMsg)
{
params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_avatar", LLSD().with("avatar_id", mAvatarID), FALSE));
}
else
{
params.click_callback(boost::bind(&LLFloaterReg::showInstance, "inspect_group", LLSD().with("group_id", mSessionID), FALSE));
}
params.delay_time(0.0f); // spawn instantly on hover
params.image(LLUI::getUIImage("Info_Small"));
params.message("");

2
indra/newview/lltoastimpanel.h
View File

@ -73,6 +73,8 @@ private:
LLTextBox* mAvatarName;
LLTextBox* mTime;
LLTextBox* mMessage;
bool mIsGroupMsg;
};
#endif // LLTOASTIMPANEL_H_

2
indra/newview/llviewerwindow.cpp
View File

@ -1798,9 +1798,7 @@ void LLViewerWindow::initBase()
// Constrain floaters to inside the menu and status bar regions.
gFloaterView = main_view->getChild<LLFloaterView>("Floater View");
gFloaterView->setFloaterSnapView(main_view->getChild<LLView>("floater_snap_region")->getHandle());
gSnapshotFloaterView = main_view->getChild<LLSnapshotFloaterView>("Snapshot Floater View");
// Console
llassert( !gConsole );

66
indra/newview/skins/default/xui/en/floater_im_session.xml
View File

@ -70,23 +70,27 @@
top="0"
left="0"
right="-1"
bottom="-1">
bottom="-3">
<layout_stack
animate="false"
default_tab_group="2"
follows="all"
right="-5"
bottom="-1"
top="0"
left="3"
border_size="0"
layout="topleft"
orientation="vertical"
name="main_stack"
tab_group="1"
top="0"
left="5">
tab_group="1">
<layout_panel
auto_resize="false"
user_resize="false"
name="toolbar_panel"
height="35">
height="35"
right="-1"
left="1">
<menu_button
menu_filename="menu_im_session_showmodes.xml"
follows="top|left"
@ -164,7 +168,7 @@
image_unselected="Toolbar_Middle_Off"
layout="topleft"
top="5"
right="-70"
right="-67"
name="close_btn"
tool_tip="End this conversation"
width="31" />
@ -196,7 +200,10 @@
</layout_panel>
<layout_panel
name="body_panel"
height="235">
top="1"
bottom="-1"
auto_resize="true"
user_resize="false">
<layout_stack
default_tab_group="2"
follows="all"
@ -213,12 +220,14 @@
min_dim="0"
width="150"
user_resize="true"
auto_resize="false" />
auto_resize="false"
bottom="-1" />
<layout_panel
default_tab_group="3"
tab_group="2"
name="right_part_holder"
min_width="221">
min_width="221"
bottom="-1">
<layout_stack
animate="true"
default_tab_group="2"
@ -262,21 +271,29 @@
</layout_stack>
</layout_panel>
<layout_panel
height="35"
top_delta="0"
top="0"
height="26"
bottom="-1"
auto_resize="false"
user_resize="false"
name="chat_layout_panel">
<layout_stack
animate="false"
default_tab_group="2"
follows="all"
right="-1"
orientation="horizontal"
name="input_panels"
top="0"
bottom="-1"
left="0">
bottom="-2"
left="0"
right="-1">
<layout_panel
name="input_editor_layout_panel">
name="input_editor_layout_panel"
auto_resize="true"
user_resize="false"
top="0"
bottom="-1">
<chat_editor
layout="topleft"
expand_lines_count="5"
@ -289,27 +306,32 @@
max_length="1023"
spellcheck="true"
tab_group="3"
bottom="-8"
left="5"
right="-5"
top="1"
bottom="-2"
left="4"
right="-4"
wrap="true" />
</layout_panel>
<layout_panel
auto_resize="false"
user_resize="false"
name="input_button_layout_panel"
width="32">
width="30"
top="0"
bottom="-1">
<button
layout="topleft"
left="1"
top="4"
right="-1"
top="1"
height="22"
follows="left|right|top"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Conv_expand_one_line"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
name="minz_btn"
tool_tip="Shows/hides message panel"
width="28" />
tool_tip="Shows/hides message panel" />
</layout_panel>
</layout_stack>
</layout_panel>

11
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -3648,6 +3648,17 @@ Leave Group?
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="OwnerCannotLeaveGroup"
type="alertmodal">
Unable to leave group. You cannot leave the group because you are the last owner of the group. Please assign another member to the owner role first.
<tag>group</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alert.tga"
name="ConfirmKick"