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

implemented EXT-3594 IM Chiclet should be created for voice calls also 

--HG--
branch : product-engine
master
Igor Borovkov 2009-12-21 15:18:48 +02:00
parent 05898105c8
commit eb4f026181
4 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/llbottomtray.cpp
View File

@ -81,9 +81,6 @@ LLBottomTray::LLBottomTray(const LLSD&)
LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("CameraPresets.ChangeView", boost::bind(&LLFloaterCamera::onClickCameraPresets, _2));
//managing chiclets for voice calls
LLIMModel::getInstance()->addNewMsgCallback(boost::bind(&LLBottomTray::onNewIM, this, _1));
//this is to fix a crash that occurs because LLBottomTray is a singleton
//and thus is deleted at the end of the viewers lifetime, but to be cleanly
//destroyed LLBottomTray requires some subsystems that are long gone
@ -153,9 +150,6 @@ void LLBottomTray::sessionAdded(const LLUUID& session_id, const std::string& nam
if (getChicletPanel()->findChiclet<LLChiclet>(session_id)) return;
// For im sessions started as voice call chiclet gets created on the first incoming message
if (gIMMgr->isVoiceCall(session_id)) return;
LLIMChiclet* chiclet = createIMChiclet(session_id);
if(chiclet)
{
@ -197,27 +191,6 @@ void LLBottomTray::sessionIDUpdated(const LLUUID& old_session_id, const LLUUID&
}
}
void LLBottomTray::onNewIM(const LLSD& data)
{
LLUUID from_id = data["from_id"];
if (from_id.isNull() || gAgentID == from_id) return;
LLUUID session_id = data["session_id"];
if (session_id.isNull()) return;
if (!gIMMgr->isVoiceCall(session_id)) return;
if (getChicletPanel()->findChiclet<LLChiclet>(session_id)) return;
//first real message, time to create chiclet
LLIMChiclet* chiclet = createIMChiclet(session_id);
if(chiclet)
{
chiclet->setIMSessionName(LLIMModel::getInstance()->getName(session_id));
chiclet->setOtherParticipantId(LLIMModel::getInstance()->getOtherParticipantID(session_id));
}
}
S32 LLBottomTray::getTotalUnreadIMCount()
{
return getChicletPanel()->getTotalUnreadIMCount();

2
indra/newview/llbottomtray.h
View File

@ -75,8 +75,6 @@ public:
virtual void sessionRemoved(const LLUUID& session_id);
void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id);
void onNewIM(const LLSD& data);
S32 getTotalUnreadIMCount();
virtual void reshape(S32 width, S32 height, BOOL called_from_parent);

20
indra/newview/llsyswellwindow.cpp
View File

@ -744,9 +744,6 @@ void LLIMWellWindow::sessionAdded(const LLUUID& session_id,
{
if (mMessageList->getItemByValue(session_id)) return;
// For im sessions started as voice call chiclet gets created on the first incoming message
if (gIMMgr->isVoiceCall(session_id)) return;
if (!gIMMgr->hasSession(session_id)) return;
addIMRow(session_id, 0, name, other_participant_id);
@ -905,23 +902,6 @@ bool LLIMWellWindow::hasIMRow(const LLUUID& session_id)
return mMessageList->getItemByValue(session_id);
}
void LLIMWellWindow::onNewIM(const LLSD& data)
{
LLUUID from_id = data["from_id"];
if (from_id.isNull() || gAgentID == from_id) return;
LLUUID session_id = data["session_id"];
if (session_id.isNull()) return;
if (!gIMMgr->isVoiceCall(session_id)) return;
if (hasIMRow(session_id)) return;
//first real message, time to create chiclet
addIMRow(session_id);
}
void LLIMWellWindow::closeAll()
{
// Generate an ignorable alert dialog if there is an active voice IM sesion

2
indra/newview/llsyswellwindow.h
View File

@ -191,8 +191,6 @@ public:
/*virtual*/ void sessionRemoved(const LLUUID& session_id);
/*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id);
void onNewIM(const LLSD& data);
void addObjectRow(const LLUUID& object_id, bool new_message = false);
void removeObjectRow(const LLUUID& object_id);