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

FEATURE: Flash nearby chat tab on updates

master
Arrehn 2010-12-24 13:06:23 -05:00
parent 28e8091a71
commit 9fee0ee1bb
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llimfloatercontainer.h
View File

@ -58,13 +58,13 @@ public:
static LLIMFloaterContainer* getInstance();
virtual void setMinimized(BOOL b);
void onNewMessageReceived(const LLSD& data); // public so nearbychat can call it directly. TODO: handle via callback. -AO
private:
typedef std::map<LLUUID,LLFloater*> avatarID_panel_map_t;
avatarID_panel_map_t mSessions;
void onNewMessageReceived(const LLSD& data);
};
#endif // LL_LLIMFLOATERCONTAINER_H

23
indra/newview/llnearbychat.cpp
View File

@ -203,6 +203,15 @@ void LLNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD &args)
{
return;
}
// IF tab mode active, flash our tab
if(isChatMultiTab())
{
LLSD notification;
notification["session_id"] = getKey();
LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance();
floater_container->onNewMessageReceived(notification);
}
if (gSavedPerAccountSettings.getBOOL("LogNearbyChat"))
{
@ -231,10 +240,10 @@ void LLNearbyChat::onNearbySpeakers()
LLSideTray::getInstance()->showPanel("panel_people",param);
}
void LLNearbyChat::onNearbyChatContextMenuItemClicked(const LLSD& userdata)
{
}
bool LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata)
{
std::string str = userdata.asString();
@ -274,6 +283,18 @@ void LLNearbyChat::setVisible(BOOL visible)
void LLNearbyChat::onOpen(const LLSD& key )
{
llinfos << "onOPEN called..." << llendl;
// We override this to put nearbychat in the IM floater. -AO
if(isChatMultiTab())
{
LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance();
if (floater_container)
{
floater_container->showFloater(this, LLTabContainer::START);
}
setVisible(TRUE);
LLFloater::openFloater(key);
}
LLDockableFloater::onOpen(key);
}