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

More compile fixes and hooking up of FS communication UI

master
Ansariel 2013-06-28 23:34:21 +02:00
parent af38052cb3
commit a8cbee6e81
6 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/fsconsoleutils.cpp
View File

@ -61,7 +61,7 @@ bool FSConsoleUtils::ProcessChatMessage(const LLChat& chat_msg, const LLSD &args
// Don't write to console if avatar chat and user wants
// bubble chat or if the user is busy.
if ( (chat_msg.mSourceType == CHAT_SOURCE_AGENT && useChatBubbles)
|| gAgent.getBusy() )
|| gAgent.isDoNotDisturb() )
{
return true;
}
@ -108,8 +108,11 @@ bool FSConsoleUtils::ProcessChatMessage(const LLChat& chat_msg, const LLSD &args
}
else
{
if (chat_msg.mSourceType == CHAT_SOURCE_SYSTEM &&
args["type"].asInteger() == LLNotificationsUI::NT_MONEYCHAT)
// [CHUI Merge]
//if (chat_msg.mSourceType == CHAT_SOURCE_SYSTEM &&
// args["type"].asInteger() == LLNotificationsUI::NT_MONEYCHAT)
if (chat_msg.mSourceType == CHAT_SOURCE_SYSTEM)
// [CHUI Merge]
{
consoleChat = args["console_message"].asString();
}

13
indra/newview/llimview.cpp
View File

@ -51,11 +51,9 @@
#include "llcallingcard.h"
#include "llchat.h"
// <FS:Ansariel> [FS communication UI]
//#include "llimfloater.h" <FS:TM> CHUI Merge removed by LL
//#include "llfloaterimsession.h" <FS:TM> CHUI Merge new
//#include "llfloaterimcontainer.h" <FS:TM> CHUI Merge new
#include "fsfloaterimcontainer.h" //<FS:TM> CHUI Merge fs new
//#include "fsfloaterim.h"
#include "fsfloaterim.h"
// </FS:Ansariel> [FS communication UI]
#include "llgroupiconctrl.h"
#include "llmd5.h"
@ -3692,6 +3690,7 @@ void LLIMMgr::processIMTypingCore(const LLIMInfo* im_info, BOOL typing)
SYSTEM_FROM,
//</FS:TS> FIRE-8601
LLTrans::getString("IM_announce_incoming", args),
false,
im_info->mName,
IM_NOTHING_SPECIAL,
im_info->mParentEstateID,
@ -3705,7 +3704,7 @@ void LLIMMgr::processIMTypingCore(const LLIMInfo* im_info, BOOL typing)
// later because a session has already been created by showing the
// incoming IM announcement.
// The logic is copied from process_improved_im() in llviewermessage.cpp
BOOL is_busy = gAgent.getBusy();
BOOL is_busy = gAgent.isDoNotDisturb();
BOOL is_autorespond = gAgent.getAutorespond();
BOOL is_autorespond_nonfriends = gAgent.getAutorespondNonFriends();
BOOL is_autorespond_muted = gSavedPerAccountSettings.getBOOL("FSSendMutedAvatarResponse");
@ -3741,7 +3740,7 @@ void LLIMMgr::processIMTypingCore(const LLIMInfo* im_info, BOOL typing)
my_name,
response,
IM_ONLINE,
IM_BUSY_AUTO_RESPONSE,
IM_DO_NOT_DISTURB_AUTO_RESPONSE,
session_id);
gAgent.sendReliableMessage();
// <FS:LO> Fire-5389 - "Autoresponse Sent" message added to Firestorm as was in Phoenix
@ -3750,6 +3749,7 @@ void LLIMMgr::processIMTypingCore(const LLIMInfo* im_info, BOOL typing)
im_info->mFromID,
LLStringUtil::null, // Pass null value so no name gets prepended
LLTrans::getString("IM_autoresponse_sent"),
false,
im_info->mName,
IM_NOTHING_SPECIAL,
im_info->mParentEstateID,
@ -3764,8 +3764,7 @@ void LLIMMgr::processIMTypingCore(const LLIMInfo* im_info, BOOL typing)
// </Ansariel>
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMSession* im_floater = LLFloaterIMSession::findInstance(session_id); <FS:TM> CHUI Merge new
//LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); <FS:TM> CHUI Merge old
//LLFloaterIMSession* im_floater = LLFloaterIMSession::findInstance(session_id);
FSFloaterIM* im_floater = FSFloaterIM::findInstance(session_id);
// </FS:Ansariel> [FS communication UI]

5
indra/newview/llnotificationhandlerutil.cpp
View File

@ -40,7 +40,10 @@
#include "fsfloaterim.h"
// </FS:Ansariel> [FS communication UI]
#include "llimview.h"
#include "llfloaterimnearbychat.h"
// <FS:Ansariel> [FS communication UI]
//#include "llfloaterimnearbychat.h"
#include "fsfloaternearbychat.h"
// </FS:Ansariel> [FS communication UI]
#include "llnotificationhandler.h"
#include "llnotifications.h"
// [SL:KB] - Patch: Chat-Logs | Checked: 2010-11-18 (Catznip-2.4.0c) | Added: Catznip-2.4.0c

2
indra/newview/llviewermenu.cpp
View File

@ -6590,7 +6590,7 @@ class LLWorldGetBusy : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
bool new_value = gAgent.getBusy();
bool new_value = gAgent.isDoNotDisturb();
return new_value;
}
};

2
indra/newview/llviewermessage.cpp
View File

@ -2962,7 +2962,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
my_name,
response,
IM_ONLINE,
IM_BUSY_AUTO_RESPONSE,
IM_DO_NOT_DISTURB_AUTO_RESPONSE,
session_id);
gAgent.sendReliableMessage();
}

18
indra/newview/rlvcommon.cpp
View File

@ -127,14 +127,16 @@ void RlvSettings::initClass()
#endif // RLV_EXTENSION_STARTLOCATION
// Checked: 2013-04-17 (RLVa-1.4.8)
bool RlvSettings::onChangedAvatarOffset(const LLSD& sdValue)
{
if ( (isAgentAvatarValid()) && (!gAgentAvatarp->isUsingServerBakes()) )
{
gAgentAvatarp->computeBodySize();
}
return true;
}
// [CHUI Merge]
//bool RlvSettings::onChangedAvatarOffset(const LLSD& sdValue)
//{
// if ( (isAgentAvatarValid()) && (!gAgentAvatarp->isUsingServerBakes()) )
// {
// gAgentAvatarp->computeBodySize();
// }
// return true;
//}
// [CHUI Merge]
// Checked: 2011-08-16 (RLVa-1.4.0b) | Added: RLVa-1.4.0b
bool RlvSettings::onChangedMenuLevel()