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

Removed some old CHUI merge check tags

Ansariel 2015-06-15 11:20:24 +02:00
parent 13af3d6ce9
commit 55cf9f4351
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llviewerkeyboard.cpp
View File

@ -622,16 +622,14 @@ void start_chat( EKeystate s )
void start_gesture( EKeystate s )
{
// Ansariel: If avatar is pointing at something, don't start
// gesture. This works around the bug with Shared
// Media prims.
// <FS:Ansariel> If avatar is pointing at something, don't start gesture.
// This works around the bug with Shared Media prims.
if (gAgentCamera.mPointAtObject)
{
return;
}
// Ansariel: FIRE-4167: Don't start gesture if a floater with
// web content has focus
// <FS:Ansariel> FIRE-4167: Don't start gesture if a floater with web content has focus
LLFloater* focused_floater = gFloaterView->getFocusedFloater();
if (focused_floater && dynamic_cast<LLFloaterWebContent*>(focused_floater))
{
@ -642,20 +640,20 @@ void start_gesture( EKeystate s )
if (KEYSTATE_UP == s &&
! (focus_ctrlp && focus_ctrlp->acceptsTextInput()))
{
// <FS:Ansariel> Changed for new chatbar
// ((LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->getCurrentChat().empty()) <FS:TM> CHUI Merge new
// <FS:Ansariel> [FS Communication UI]
//if ((LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->getCurrentChat().empty())
//{
// // No existing chat in chat editor, insert '/'
// LLFloaterIMNearbyChat::startChat("/"); <FS:TM> CHUI Merge new
// LLFloaterIMNearbyChat::startChat("/");
//}
//else
//{
// // Don't overwrite existing text in chat editor
// LLFloaterIMNearbyChat::startChat(NULL); <FS:TM> CHUI Merge new
// LLFloaterIMNearbyChat::startChat(NULL);
//}
FSNearbyChat::instance().showDefaultChatBar(TRUE,"/"); // <FS:TM> CHUI Merge Check this
// </FS:Ansariel>
FSNearbyChat::instance().showDefaultChatBar(TRUE, "/");
// </FS:Ansariel> [FS Communication UI]
}
}