Skip to content
Snippets Groups Projects
Commit 9f0890fc authored by leyla_linden's avatar leyla_linden
Browse files

EXP-1293 Nearby chat toasts no longer appear.

EXP-1316 Minimized Snapshot floater has a snapshot preview image attached below.
EXP-1318 Clicking on nearby chat toasts should bring up Nearby Chat history
parent c1a9ca33
No related branches found
No related tags found
No related merge requests found
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "llfloaterreg.h" #include "llfloaterreg.h"
#include "lllocalcliprect.h" #include "lllocalcliprect.h"
#include "lltrans.h" #include "lltrans.h"
#include "llnearbychatbar.h"
#include "llviewercontrol.h" #include "llviewercontrol.h"
#include "llagentdata.h" #include "llagentdata.h"
...@@ -315,12 +316,12 @@ BOOL LLNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask) ...@@ -315,12 +316,12 @@ BOOL LLNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask)
return TRUE; return TRUE;
else else
{ {
LLFloaterReg::showInstance("nearby_chat",LLSD()); LLNearbyChatBar::getInstance()->showHistory();
return FALSE; return FALSE;
} }
} }
LLFloaterReg::showInstance("nearby_chat",LLSD()); LLNearbyChatBar::getInstance()->showHistory();
return LLPanel::handleMouseUp(x,y,mask); return LLPanel::handleMouseUp(x,y,mask);
} }
......
...@@ -2217,7 +2217,7 @@ void LLFloaterSnapshot::draw() ...@@ -2217,7 +2217,7 @@ void LLFloaterSnapshot::draw()
LLFloater::draw(); LLFloater::draw();
if (previewp) if (previewp && !isMinimized())
{ {
if(previewp->getThumbnailImage()) if(previewp->getThumbnailImage())
{ {
......
...@@ -135,6 +135,16 @@ LLNearbyChatBar* LLNearbyChatBar::getInstance() ...@@ -135,6 +135,16 @@ LLNearbyChatBar* LLNearbyChatBar::getInstance()
return LLFloaterReg::getTypedInstance<LLNearbyChatBar>("chat_bar"); return LLFloaterReg::getTypedInstance<LLNearbyChatBar>("chat_bar");
} }
void LLNearbyChatBar::showHistory()
{
if (!getChildView("nearby_chat")->getVisible())
{
onToggleNearbyChatPanel();
}
openFloater();
}
void LLNearbyChatBar::draw() void LLNearbyChatBar::draw()
{ {
displaySpeakingIndicator(); displaySpeakingIndicator();
......
...@@ -59,6 +59,8 @@ class LLNearbyChatBar : public LLFloater ...@@ -59,6 +59,8 @@ class LLNearbyChatBar : public LLFloater
static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate); static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate);
static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate); static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
void showHistory();
protected: protected:
static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str); static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str);
static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata); static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata);
......
...@@ -581,7 +581,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, // WARNING - not ...@@ -581,7 +581,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, // WARNING - not
sChatWatcher->post(notification); sChatWatcher->post(notification);
if( nearby_chat->getVisible() if( chat_bar->getVisible() && nearby_chat->getVisible()
|| ( chat_msg.mSourceType == CHAT_SOURCE_AGENT || ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
&& gSavedSettings.getBOOL("UseChatBubbles") ) && gSavedSettings.getBOOL("UseChatBubbles") )
|| !mChannel->getShowToasts() ) // to prevent toasts in Busy mode || !mChannel->getShowToasts() ) // to prevent toasts in Busy mode
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment