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

CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode.

master
William Todd Stinson 2012-11-08 12:35:15 -08:00
parent fa85e16d63
commit c4eaaa3d6a
24 changed files with 138 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcharacter/llanimationstates.cpp
View File

@ -46,7 +46,7 @@ LLUUID const ANIM_AGENT_BLOW_KISS ("db84829b-462c-ee83-1e27-9bbee66b
LLUUID const ANIM_AGENT_BORED ("b906c4ba-703b-1940-32a3-0c7f7d791510");
LLUUID const ANIM_AGENT_BOW ("82e99230-c906-1403-4d9c-3889dd98daba");
LLUUID const ANIM_AGENT_BRUSH ("349a3801-54f9-bf2c-3bd0-1ac89772af01");
LLUUID const ANIM_AGENT_BUSY ("efcf670c-2d18-8128-973a-034ebc806b67");
LLUUID const ANIM_AGENT_DO_NOT_DISTURB ("efcf670c-2d18-8128-973a-034ebc806b67");
LLUUID const ANIM_AGENT_CLAP ("9b0c1c4e-8ac7-7969-1494-28c874c4f668");
LLUUID const ANIM_AGENT_COURTBOW ("9ba1c942-08be-e43a-fb29-16ad440efc50");
LLUUID const ANIM_AGENT_CROUCH ("201f3fdf-cb1f-dbec-201f-7333e328ae7c");
@ -211,7 +211,7 @@ LLAnimationLibrary::LLAnimationLibrary() :
mAnimMap[ANIM_AGENT_BORED]= mAnimStringTable.addString("express_bored");
mAnimMap[ANIM_AGENT_BOW]= mAnimStringTable.addString("bow");
mAnimMap[ANIM_AGENT_BRUSH]= mAnimStringTable.addString("brush");
mAnimMap[ANIM_AGENT_BUSY]= mAnimStringTable.addString("busy");
mAnimMap[ANIM_AGENT_DO_NOT_DISTURB]= mAnimStringTable.addString("busy");
mAnimMap[ANIM_AGENT_CLAP]= mAnimStringTable.addString("clap");
mAnimMap[ANIM_AGENT_COURTBOW]= mAnimStringTable.addString("courtbow");
mAnimMap[ANIM_AGENT_CROUCH]= mAnimStringTable.addString("crouch");

2
indra/llcharacter/llanimationstates.h
View File

@ -56,7 +56,7 @@ extern const LLUUID ANIM_AGENT_BLOW_KISS;
extern const LLUUID ANIM_AGENT_BORED;
extern const LLUUID ANIM_AGENT_BOW;
extern const LLUUID ANIM_AGENT_BRUSH;
extern const LLUUID ANIM_AGENT_BUSY;
extern const LLUUID ANIM_AGENT_DO_NOT_DISTURB;
extern const LLUUID ANIM_AGENT_CLAP;
extern const LLUUID ANIM_AGENT_COURTBOW;
extern const LLUUID ANIM_AGENT_CROUCH;

4
indra/llmessage/llinstantmessage.h
View File

@ -115,8 +115,8 @@ enum EInstantMessage
// viewer, since you can't IM an object yet.
IM_FROM_TASK = 19,
// sent an IM to a busy user, this is the auto response
IM_BUSY_AUTO_RESPONSE = 20,
// sent an IM to a do not disturb user, this is the auto response
IM_DO_NOT_DISTURB_AUTO_RESPONSE = 20,
// Shows the message in the console and chat history
IM_CONSOLE_AND_CHAT_HISTORY = 21,

8
indra/newview/app_settings/settings_per_account.xml
View File

@ -1,9 +1,9 @@
<llsd>
<map>
<key>BusyResponseChanged</key>
<key>DoNotDisturbResponseChanged</key>
<map>
<key>Comment</key>
<string>Does user's busy mode message differ from default?</string>
<string>Does user's do not disturb mode message differ from default?</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -11,10 +11,10 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>BusyModeResponse</key>
<key>DoNotDisturbModeResponse</key>
<map>
<key>Comment</key>
<string>Auto response to instant messages while in busy mode.</string>
<string>Auto response to instant messages while in do not disturb mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

38
indra/newview/llagent.cpp
View File

@ -376,7 +376,7 @@ LLAgent::LLAgent() :
mShowAvatar(TRUE),
mFrameAgent(),
mIsBusy(FALSE),
mIsDoNotDisturb(false),
mControlFlags(0x00000000),
mbFlagsDirty(FALSE),
@ -1397,39 +1397,27 @@ BOOL LLAgent::getAFK() const
}
//-----------------------------------------------------------------------------
// setBusy()
// setDoNotDisturb()
//-----------------------------------------------------------------------------
void LLAgent::setBusy()
void LLAgent::setDoNotDisturb(bool pIsDotNotDisturb)
{
sendAnimationRequest(ANIM_AGENT_BUSY, ANIM_REQUEST_START);
mIsBusy = TRUE;
if (gBusyMenu)
mIsDoNotDisturb = pIsDotNotDisturb;
EAnimRequest animRequest = (pIsDotNotDisturb ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
sendAnimationRequest(ANIM_AGENT_DO_NOT_DISTURB, animRequest);
if (gDoNotDisturbMenu)
{
gBusyMenu->setLabel(LLTrans::getString("AvatarSetNotBusy"));
gDoNotDisturbMenu->setLabel(LLTrans::getString((pIsDotNotDisturb ? "AvatarSetAvailable" : "AvatarSetDoNotDisturb")));
}
LLNotificationsUI::LLChannelManager::getInstance()->muteAllChannels(true);
LLNotificationsUI::LLChannelManager::getInstance()->muteAllChannels(pIsDotNotDisturb);
}
//-----------------------------------------------------------------------------
// clearBusy()
// isDoNotDisturb()
//-----------------------------------------------------------------------------
void LLAgent::clearBusy()
bool LLAgent::isDoNotDisturb() const
{
mIsBusy = FALSE;
sendAnimationRequest(ANIM_AGENT_BUSY, ANIM_REQUEST_STOP);
if (gBusyMenu)
{
gBusyMenu->setLabel(LLTrans::getString("AvatarSetBusy"));
}
LLNotificationsUI::LLChannelManager::getInstance()->muteAllChannels(false);
}
//-----------------------------------------------------------------------------
// getBusy()
//-----------------------------------------------------------------------------
BOOL LLAgent::getBusy() const
{
return mIsBusy;
return mIsDoNotDisturb;
}

9
indra/newview/llagent.h
View File

@ -378,14 +378,13 @@ public:
void sitDown();
//--------------------------------------------------------------------
// Busy
// Do Not Disturb
//--------------------------------------------------------------------
public:
void setBusy();
void clearBusy();
BOOL getBusy() const;
void setDoNotDisturb(bool pIsDoNotDisturb);
bool isDoNotDisturb() const;
private:
BOOL mIsBusy;
bool mIsDoNotDisturb;
//--------------------------------------------------------------------
// Grab

6
indra/newview/llappearancemgr.cpp
View File

@ -1602,8 +1602,6 @@ void LLAppearanceMgr::updateAgentWearables(LLWearableHoldingPattern* holder, boo
{
gAgentWearables.setWearableOutfit(items, wearables, !append);
}
// dec_busy_count();
}
static void remove_non_link_items(LLInventoryModel::item_array_t &items)
@ -2004,7 +2002,6 @@ void LLAppearanceMgr::wearInventoryCategoryOnAvatar( LLInventoryCategory* catego
void LLAppearanceMgr::wearOutfitByName(const std::string& name)
{
LL_INFOS("Avatar") << self_av_string() << "Wearing category " << name << LL_ENDL;
//inc_busy_count();
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t item_array;
@ -2044,8 +2041,6 @@ void LLAppearanceMgr::wearOutfitByName(const std::string& name)
llwarns << "Couldn't find outfit " <<name<< " in wearOutfitByName()"
<< llendl;
}
//dec_busy_count();
}
bool areMatchingWearables(const LLViewerInventoryItem *a, const LLViewerInventoryItem *b)
@ -2967,7 +2962,6 @@ public:
{
llwarns << "Nothing fetched in category " << mComplete.front()
<< llendl;
//dec_busy_count();
gInventory.removeObserver(this);
// lets notify observers that loading is finished.

8
indra/newview/llavataractions.cpp
View File

@ -386,12 +386,12 @@ void LLAvatarActions::showOnMap(const LLUUID& id)
// static
void LLAvatarActions::pay(const LLUUID& id)
{
LLNotification::Params params("BusyModePay");
LLNotification::Params params("DoNotDisturbModePay");
params.functor.function(boost::bind(&LLAvatarActions::handlePay, _1, _2, id));
if (gAgent.getBusy())
if (gAgent.isDoNotDisturb())
{
// warn users of being in busy mode during a transaction
// warn users of being in do not disturb mode during a transaction
LLNotifications::instance().add(params);
}
else
@ -982,7 +982,7 @@ bool LLAvatarActions::handlePay(const LLSD& notification, const LLSD& response,
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0)
{
gAgent.clearBusy();
gAgent.setDoNotDisturb(false);
}
LLFloaterPayUtil::payDirectly(&give_money, avatar_id, /*is_group=*/false);

46
indra/newview/llfloaterpreference.cpp
View File

@ -443,23 +443,23 @@ BOOL LLFloaterPreference::postBuild()
getChild<LLComboBox>("language_combobox")->setCommitCallback(boost::bind(&LLFloaterPreference::onLanguageChange, this));
// if floater is opened before login set default localized busy message
// if floater is opened before login set default localized do not disturb message
if (LLStartUp::getStartupState() < STATE_STARTED)
{
gSavedPerAccountSettings.setString("BusyModeResponse", LLTrans::getString("BusyModeResponseDefault"));
gSavedPerAccountSettings.setString("DoNotDisturbModeResponse", LLTrans::getString("DoNotDisturbModeResponseDefault"));
}
return TRUE;
}
void LLFloaterPreference::onBusyResponseChanged()
void LLFloaterPreference::onDoNotDisturbResponseChanged()
{
// set "BusyResponseChanged" TRUE if user edited message differs from default, FALSE otherwise
bool busy_flag =
LLTrans::getString("BusyModeResponseDefault")
!= getChild<LLUICtrl>("busy_response")->getValue().asString();
// set "DoNotDisturbResponseChanged" TRUE if user edited message differs from default, FALSE otherwise
bool response_changed_flag =
LLTrans::getString("DoNotDisturbModeResponseDefault")
!= getChild<LLUICtrl>("do_not_disturb_response")->getValue().asString();
gSavedPerAccountSettings.setBOOL("BusyResponseChanged", busy_flag );
gSavedPerAccountSettings.setBOOL("DoNotDisturbResponseChanged", response_changed_flag );
}
LLFloaterPreference::~LLFloaterPreference()
@ -542,12 +542,8 @@ void LLFloaterPreference::apply()
LLViewerMedia::setProxyConfig(proxy_enable, proxy_address, proxy_port);
}
// LLWString busy_response = utf8str_to_wstring(getChild<LLUICtrl>("busy_response")->getValue().asString());
// LLWStringUtil::replaceTabsWithSpaces(busy_response, 4);
if (mGotPersonalInfo)
{
// gSavedSettings.setString("BusyModeResponse2", std::string(wstring_to_utf8str(busy_response)));
bool new_im_via_email = getChild<LLUICtrl>("send_im_to_email")->getValue().asBoolean();
bool new_hide_online = getChild<LLUICtrl>("online_visibility")->getValue().asBoolean();
@ -633,21 +629,21 @@ void LLFloaterPreference::cancel()
void LLFloaterPreference::onOpen(const LLSD& key)
{
// this variable and if that follows it are used to properly handle busy mode response message
// this variable and if that follows it are used to properly handle do not disturb mode response message
static bool initialized = FALSE;
// if user is logged in and we haven't initialized busy_response yet, do it
// if user is logged in and we haven't initialized do not disturb mode response yet, do it
if (!initialized && LLStartUp::getStartupState() == STATE_STARTED)
{
// Special approach is used for busy response localization, because "BusyModeResponse" is
// Special approach is used for do not disturb response localization, because "DoNotDisturbModeResponse" is
// in non-localizable xml, and also because it may be changed by user and in this case it shouldn't be localized.
// To keep track of whether busy response is default or changed by user additional setting BusyResponseChanged
// To keep track of whether do not disturb response is default or changed by user additional setting DoNotDisturbResponseChanged
// was added into per account settings.
// initialization should happen once,so setting variable to TRUE
initialized = TRUE;
// this connection is needed to properly set "BusyResponseChanged" setting when user makes changes in
// busy response message.
gSavedPerAccountSettings.getControl("BusyModeResponse")->getSignal()->connect(boost::bind(&LLFloaterPreference::onBusyResponseChanged, this));
// this connection is needed to properly set "DoNotDisturbResponseChanged" setting when user makes changes in
// do not disturb response message.
gSavedPerAccountSettings.getControl("DoNotDisturbModeResponse")->getSignal()->connect(boost::bind(&LLFloaterPreference::onDoNotDisturbResponseChanged, this));
}
gAgent.sendAgentUserInfoRequest();
@ -709,12 +705,12 @@ void LLFloaterPreference::onVertexShaderEnable()
}
//static
void LLFloaterPreference::initBusyResponse()
void LLFloaterPreference::initDoNotDisturbResponse()
{
if (!gSavedPerAccountSettings.getBOOL("BusyResponseChanged"))
if (!gSavedPerAccountSettings.getBOOL("DoNotDisturbResponseChanged"))
{
//LLTrans::getString("BusyModeResponseDefault") is used here for localization (EXT-5885)
gSavedPerAccountSettings.setString("BusyModeResponse", LLTrans::getString("BusyModeResponseDefault"));
//LLTrans::getString("DoNotDisturbModeResponseDefault") is used here for localization (EXT-5885)
gSavedPerAccountSettings.setString("DoNotDisturbModeResponse", LLTrans::getString("DoNotDisturbModeResponseDefault"));
}
}
@ -1431,14 +1427,11 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
getChild<LLUICtrl>("send_im_to_email")->setValue(im_via_email);
getChildView("log_instant_messages")->setEnabled(TRUE);
// getChildView("log_chat")->setEnabled(TRUE);
// getChildView("busy_response")->setEnabled(TRUE);
// getChildView("log_instant_messages_timestamp")->setEnabled(TRUE);
// getChildView("log_chat_timestamp")->setEnabled(TRUE);
getChildView("log_chat_IM")->setEnabled(TRUE);
getChildView("log_date_timestamp")->setEnabled(TRUE);
// getChild<LLUICtrl>("busy_response")->setValue(gSavedSettings.getString("BusyModeResponse2"));
getChildView("favorites_on_login_check")->setEnabled(TRUE);
getChildView("log_nearby_chat")->setEnabled(TRUE);
getChildView("log_instant_messages")->setEnabled(TRUE);
@ -1662,7 +1655,6 @@ BOOL LLPanelPreference::postBuild()
if (hasChild("online_visibility") && hasChild("send_im_to_email"))
{
getChild<LLUICtrl>("email_address")->setValue(getString("log_in_to_change") );
// getChild<LLUICtrl>("busy_response")->setValue(getString("log_in_to_change"));
}
//////////////////////PanelPrivacy ///////////////////

8
indra/newview/llfloaterpreference.h
View File

@ -75,8 +75,8 @@ public:
// refresh all the graphics preferences menus
static void refreshEnabledGraphics();
// translate user's busy response message according to current locale if message is default, otherwise do nothing
static void initBusyResponse();
// translate user's do not disturb response message according to current locale if message is default, otherwise do nothing
static void initDoNotDisturbResponse();
void processProperties( void* pData, EAvatarProcessorType type );
void processProfileProperties(const LLAvatarData* pAvatarData );
@ -93,9 +93,9 @@ protected:
void onLanguageChange();
void onNameTagOpacityChange(const LLSD& newvalue);
// set value of "BusyResponseChanged" in account settings depending on whether busy response
// set value of "DoNotDisturbResponseChanged" in account settings depending on whether do not disturb response
// string differs from default after user changes.
void onBusyResponseChanged();
void onDoNotDisturbResponseChanged();
// if the custom settings box is clicked
void onChangeCustom();
void updateMeterText(LLUICtrl* ctrl);

8
indra/newview/llimview.cpp
View File

@ -113,8 +113,8 @@ static void on_avatar_name_cache_toast(const LLUUID& agent_id,
}
void toast_callback(const LLSD& msg){
// do not show toast in busy mode or it goes from agent
if (gAgent.getBusy() || gAgent.getID() == msg["from_id"])
// do not show toast in do not disturb mode or it goes from agent
if (gAgent.isDoNotDisturb() || gAgent.getID() == msg["from_id"])
{
return;
}
@ -3292,13 +3292,13 @@ public:
time_t timestamp =
(time_t) message_params["timestamp"].asInteger();
BOOL is_busy = gAgent.getBusy();
BOOL is_do_not_disturb = gAgent.isDoNotDisturb();
BOOL is_muted = LLMuteList::getInstance()->isMuted(
from_id,
name,
LLMute::flagTextChat);
if (is_busy || is_muted)
if (is_do_not_disturb || is_muted)
{
return;
}

21
indra/newview/llinventorybridge.cpp
View File

@ -92,21 +92,6 @@ struct LLMoveInv
using namespace LLOldEvents;
// Helpers
// bug in busy count inc/dec right now, logic is complex... do we really need it?
void inc_busy_count()
{
// gViewerWindow->getWindow()->incBusyCount();
// check balance of these calls if this code is changed to ever actually
// *do* something!
}
void dec_busy_count()
{
// gViewerWindow->getWindow()->decBusyCount();
// check balance of these calls if this code is changed to ever actually
// *do* something!
}
// Function declarations
void remove_inventory_category_from_avatar(LLInventoryCategory* category);
void remove_inventory_category_from_avatar_step2( BOOL proceed, LLUUID category_id);
@ -167,7 +152,6 @@ public:
{
if (clear_observer)
{
dec_busy_count();
gInventory.removeObserver(this);
delete this;
}
@ -2668,7 +2652,6 @@ void LLRightClickInventoryFetchDescendentsObserver::execute(bool clear_observer)
llwarns << "LLRightClickInventoryFetchDescendentsObserver::done with empty mCompleteFolders" << llendl;
if (clear_observer)
{
dec_busy_count();
gInventory.removeObserver(this);
delete this;
}
@ -2682,7 +2665,6 @@ void LLRightClickInventoryFetchDescendentsObserver::execute(bool clear_observer)
// could notify observers and throw us into an infinite loop.
if (clear_observer)
{
dec_busy_count();
gInventory.removeObserver(this);
delete this;
}
@ -2744,7 +2726,6 @@ void LLRightClickInventoryFetchDescendentsObserver::execute(bool clear_observer)
{
// it's all on its way - add an observer, and the inventory
// will call done for us when everything is here.
inc_busy_count();
gInventory.addObserver(outfit);
}
*/
@ -2763,7 +2744,6 @@ void LLRightClickInventoryFetchDescendentsObserver::execute(bool clear_observer)
{
// it's all on its way - add an observer, and the inventory
// will call done for us when everything is here.
inc_busy_count();
gInventory.addObserver(categories);
}
}
@ -3475,7 +3455,6 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
else
{
// it's all on its way - add an observer, and the inventory will call done for us when everything is here.
inc_busy_count();
gInventory.addObserver(fetch);
}
}

2
indra/newview/llnearbychathandler.cpp
View File

@ -560,7 +560,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg,
|| ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
&& gSavedSettings.getBOOL("UseChatBubbles") )
|| mChannel.isDead()
|| !mChannel.get()->getShowToasts() ) // to prevent toasts in Busy mode
|| !mChannel.get()->getShowToasts() ) // to prevent toasts in Do Not Disturb mode
return;//no need in toast if chat is visible or if bubble chat is enabled
// arrange a channel on a screen

24
indra/newview/llviewermenu.cpp
View File

@ -179,7 +179,7 @@ LLContextMenu* gDetachScreenPieMenu = NULL;
LLContextMenu* gDetachBodyPartPieMenus[8];
LLMenuItemCallGL* gAFKMenu = NULL;
LLMenuItemCallGL* gBusyMenu = NULL;
LLMenuItemCallGL* gDoNotDisturbMenu = NULL;
//
// Local prototypes
@ -471,7 +471,7 @@ void init_menus()
gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost);
gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE);
gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE);
gDoNotDisturbMenu = gMenuBarView->getChild<LLMenuItemCallGL>("set_do_not_disturb", TRUE);
gAttachSubMenu = gMenuBarView->findChildMenuByName("Attach Object", TRUE);
gDetachSubMenu = gMenuBarView->findChildMenuByName("Detach Object", TRUE);
@ -5564,18 +5564,18 @@ class LLWorldSetAway : public view_listener_t
}
};
class LLWorldSetBusy : public view_listener_t
class LLWorldSetDoNotDisturb : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
if (gAgent.getBusy())
if (gAgent.isDoNotDisturb())
{
gAgent.clearBusy();
gAgent.setDoNotDisturb(false);
}
else
{
gAgent.setBusy();
LLNotificationsUtil::add("BusyModeSet");
gAgent.setDoNotDisturb(true);
LLNotificationsUtil::add("DoNotDisturbModeSet");
}
return true;
}
@ -5737,7 +5737,7 @@ bool complete_give_money(const LLSD& notification, const LLSD& response, LLObjec
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0)
{
gAgent.clearBusy();
gAgent.setDoNotDisturb(false);
}
LLViewerObject* objectp = selection->getPrimaryObject();
@ -5770,12 +5770,12 @@ bool complete_give_money(const LLSD& notification, const LLSD& response, LLObjec
void handle_give_money_dialog()
{
LLNotification::Params params("BusyModePay");
LLNotification::Params params("DoNotDisturbModePay");
params.functor.function(boost::bind(complete_give_money, _1, _2, LLSelectMgr::getInstance()->getSelection()));
if (gAgent.getBusy())
if (gAgent.isDoNotDisturb())
{
// warn users of being in busy mode during a transaction
// warn users of being in do not disturb mode during a transaction
LLNotifications::instance().add(params);
}
else
@ -8288,7 +8288,7 @@ void initialize_menus()
view_listener_t::addMenu(new LLWorldSetHomeLocation(), "World.SetHomeLocation");
view_listener_t::addMenu(new LLWorldTeleportHome(), "World.TeleportHome");
view_listener_t::addMenu(new LLWorldSetAway(), "World.SetAway");
view_listener_t::addMenu(new LLWorldSetBusy(), "World.SetBusy");
view_listener_t::addMenu(new LLWorldSetDoNotDisturb(), "World.SetDoNotDisturb");
view_listener_t::addMenu(new LLWorldEnableCreateLandmark(), "World.EnableCreateLandmark");
view_listener_t::addMenu(new LLWorldEnableSetHomeLocation(), "World.EnableSetHomeLocation");

2
indra/newview/llviewermenu.h
View File

@ -188,7 +188,7 @@ extern LLContextMenu* gAttachBodyPartPieMenus[8];
extern LLContextMenu* gDetachBodyPartPieMenus[8];
extern LLMenuItemCallGL* gAFKMenu;
extern LLMenuItemCallGL* gBusyMenu;
extern LLMenuItemCallGL* gDoNotDisturbMenu;
extern LLMenuItemCallGL* gMutePieMenu;
extern LLMenuItemCallGL* gMuteObjectPieMenu;
extern LLMenuItemCallGL* gBuyPassPieMenu;

83
indra/newview/llviewermessage.cpp
View File

@ -179,7 +179,7 @@ const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
FALSE // TeleportYourAgent
};
static void busy_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id = LLUUID::null);
static void send_do_not_disturb_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id = LLUUID::null);
bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
{
@ -258,11 +258,6 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
static LLNotificationFunctorRegistration friendship_offer_callback_reg("OfferFriendship", friendship_offer_callback);
static LLNotificationFunctorRegistration friendship_offer_callback_reg_nm("OfferFriendshipNoMessage", friendship_offer_callback);
//const char BUSY_AUTO_RESPONSE[] = "The Resident you messaged is in 'busy mode' which means they have "
// "requested not to be disturbed. Your message will still be shown in their IM "
// "panel for later viewing.";
//
// Functions
//
@ -1520,8 +1515,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
// TODO: when task inventory offers can also be handled the new way, migrate the code that sets these strings here:
from_string = chatHistory_string = mFromName;
bool busy = gAgent.getBusy();
LLNotificationFormPtr modified_form(notification_ptr ? new LLNotificationForm(*notification_ptr->getForm()) : new LLNotificationForm());
switch(button)
@ -1623,9 +1616,9 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
}
if (busy && (!mFromGroup && !mFromObject))
if (gAgent.isDoNotDisturb() && (!mFromGroup && !mFromObject))
{
busy_message(gMessageSystem, mFromID);
send_do_not_disturb_message(gMessageSystem, mFromID);
}
if (modified_form != NULL)
@ -1750,7 +1743,7 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
from_string = chatHistory_string = mFromName;
}
bool busy = gAgent.getBusy();
bool is_do_not_disturb = gAgent.isDoNotDisturb();
switch(button)
{
@ -1823,9 +1816,9 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
LLNotificationsUtil::add("SystemMessageTip", args);
}
if (busy && (!mFromGroup && !mFromObject))
if (is_do_not_disturb && (!mFromGroup && !mFromObject))
{
busy_message(msg,mFromID);
send_do_not_disturb_message(msg,mFromID);
}
break;
}
@ -2207,7 +2200,7 @@ static std::string clean_name_from_im(const std::string& name, EInstantMessage t
case IM_SESSION_SEND:
case IM_SESSION_LEAVE:
//IM_FROM_TASK
case IM_BUSY_AUTO_RESPONSE:
case IM_DO_NOT_DISTURB_AUTO_RESPONSE:
case IM_CONSOLE_AND_CHAT_HISTORY:
case IM_LURE_USER:
case IM_LURE_ACCEPTED:
@ -2356,7 +2349,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// IDEVO convert new-style "Resident" names for display
name = clean_name_from_im(name, dialog);
BOOL is_busy = gAgent.getBusy();
BOOL is_do_not_disturb = gAgent.isDoNotDisturb();
BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat)
// object IMs contain sender object id in session_id (STORM-1209)
|| dialog == IM_FROM_TASK && LLMuteList::getInstance()->isMuted(session_id);
@ -2402,15 +2395,15 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// do nothing -- don't distract newbies in
// Prelude with global IMs
}
else if (offline == IM_ONLINE && is_busy && name != SYSTEM_FROM)
else if (offline == IM_ONLINE && is_do_not_disturb && name != SYSTEM_FROM)
{
// return a standard "busy" message, but only do it to online IM
// return a standard "do not disturb" message, but only do it to online IM
// (i.e. not other auto responses and not store-and-forward IM)
if (!gIMMgr->hasSession(session_id))
{
// if there is not a panel for this conversation (i.e. it is a new IM conversation
// initiated by the other party) then...
busy_message(msg, from_id, session_id);
send_do_not_disturb_message(msg, from_id, session_id);
}
// now store incoming IM in chat history
@ -2645,9 +2638,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
break;
case IM_GROUP_INVITATION:
{
if (is_busy || is_muted)
if (is_do_not_disturb || is_muted)
{
busy_message(msg, from_id);
send_do_not_disturb_message(msg, from_id);
}
else
{
@ -2730,7 +2723,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
info->mFromName = name;
info->mDesc = message;
info->mHost = msg->getSender();
//if (((is_busy && !is_owned_by_me) || is_muted))
//if (((is_do_not_disturb && !is_owned_by_me) || is_muted))
if (is_muted)
{
// Prefetch the offered item so that it can be discarded by the appropriate observer. (EXT-4331)
@ -2741,9 +2734,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// Same as closing window
info->forceResponse(IOR_DECLINE);
}
else if (is_busy && dialog != IM_TASK_INVENTORY_OFFERED) // busy mode must not affect interaction with objects (STORM-565)
else if (is_do_not_disturb && dialog != IM_TASK_INVENTORY_OFFERED) // busy mode must not affect interaction with objects (STORM-565)
{
// Until throttling is implemented, busy mode should reject inventory instead of silently
// Until throttling is implemented, do not disturb mode should reject inventory instead of silently
// accepting it. SEE SL-39554
info->forceResponse(IOR_DECLINE);
}
@ -2788,7 +2781,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_SESSION_SEND:
{
if (is_busy)
if (is_do_not_disturb)
{
return;
}
@ -2829,7 +2822,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_FROM_TASK:
{
if (is_busy && !is_owned_by_me)
if (is_do_not_disturb && !is_owned_by_me)
{
return;
}
@ -2926,7 +2919,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
break;
case IM_FROM_TASK_AS_ALERT:
if (is_busy && !is_owned_by_me)
if (is_do_not_disturb && !is_owned_by_me)
{
return;
}
@ -2937,10 +2930,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
LLNotificationsUtil::add("ObjectMessage", args);
}
break;
case IM_BUSY_AUTO_RESPONSE:
case IM_DO_NOT_DISTURB_AUTO_RESPONSE:
if (is_muted)
{
LL_DEBUGS("Messaging") << "Ignoring busy response from " << from_id << LL_ENDL;
LL_DEBUGS("Messaging") << "Ignoring do-not-disturb response from " << from_id << LL_ENDL;
return;
}
else
@ -2957,9 +2950,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
{
return;
}
else if (is_busy)
else if (is_do_not_disturb)
{
busy_message(msg, from_id);
send_do_not_disturb_message(msg, from_id);
}
else
{
@ -3180,9 +3173,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
payload["online"] = (offline == IM_ONLINE);
payload["sender"] = msg->getSender().getIPandPort();
if (is_busy)
if (is_do_not_disturb)
{
busy_message(msg, from_id);
send_do_not_disturb_message(msg, from_id);
LLNotifications::instance().forceResponse(LLNotification::Params("OfferFriendship").payload(payload), 1);
}
else if (is_muted)
@ -3246,13 +3239,13 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
}
static void busy_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id)
static void send_do_not_disturb_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id)
{
if (gAgent.getBusy())
if (gAgent.isDoNotDisturb())
{
std::string my_name;
LLAgentUI::buildFullname(my_name);
std::string response = gSavedPerAccountSettings.getString("BusyModeResponse");
std::string response = gSavedPerAccountSettings.getString("DoNotDisturbModeResponse");
pack_instant_message(
msg,
gAgent.getID(),
@ -3262,7 +3255,7 @@ static void busy_message (LLMessageSystem* msg, const LLUUID& from_id, const LLU
my_name,
response,
IM_ONLINE,
IM_BUSY_AUTO_RESPONSE,
IM_DO_NOT_DISTURB_AUTO_RESPONSE,
session_id);
gAgent.sendReliableMessage();
}
@ -3298,7 +3291,7 @@ bool callingcard_offer_callback(const LLSD& notification, const LLSD& response)
msg->nextBlockFast(_PREHASH_TransactionBlock);
msg->addUUIDFast(_PREHASH_TransactionID, notification["payload"]["transaction_id"].asUUID());
msg->sendReliable(LLHost(notification["payload"]["sender"].asString()));
busy_message(msg, notification["payload"]["source_id"].asUUID());
send_do_not_disturb_message(msg, notification["payload"]["source_id"].asUUID());
break;
default:
// close button probably, possibly timed out
@ -3340,7 +3333,7 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
if(!source_name.empty())
{
if (gAgent.getBusy()
if (gAgent.isDoNotDisturb()
|| LLMuteList::getInstance()->isMuted(source_id, source_name, LLMute::flagTextChat))
{
// automatically decline offer
@ -3469,7 +3462,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
chat.mFromName = from_name;
}
BOOL is_busy = gAgent.getBusy();
BOOL is_do_not_disturb = gAgent.isDoNotDisturb();
BOOL is_muted = FALSE;
BOOL is_linden = FALSE;
@ -3503,7 +3496,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// record last audible utterance
if (is_audible
&& (is_linden || (!is_muted && !is_busy)))
&& (is_linden || (!is_muted && !is_do_not_disturb)))
{
if (chat.mChatType != CHAT_TYPE_START
&& chat.mChatType != CHAT_TYPE_STOP)
@ -3598,7 +3591,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
LLLocalSpeakerMgr::getInstance()->setSpeakerTyping(from_id, FALSE);
((LLVOAvatar*)chatter)->stopTyping();
if (!is_muted && !is_busy)
if (!is_muted && !is_do_not_disturb)
{
visible_in_chat_bubble = gSavedSettings.getBOOL("UseChatBubbles");
std::string formated_msg = "";
@ -4136,14 +4129,14 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
gAgent.setFlying(gAgent.canFly());
}
// force simulator to recognize busy state
if (gAgent.getBusy())
// force simulator to recognize do not disturb state
if (gAgent.isDoNotDisturb())
{
gAgent.setBusy();
gAgent.setDoNotDisturb(true);
}
else
{
gAgent.clearBusy();
gAgent.setDoNotDisturb(false);
}
if (isAgentAvatarValid())

4
indra/newview/llviewerwindow.cpp
View File

@ -1824,8 +1824,8 @@ void LLViewerWindow::initBase()
gDebugView->init();
gToolTipView = getRootView()->getChild<LLToolTipView>("tooltip view");
// Initialize busy response message when logged in
LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLFloaterPreference::initBusyResponse));
// Initialize do not disturb response message when logged in
LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLFloaterPreference::initDoNotDisturbResponse));
// Add the progress bar view (startup view), which overrides everything
mProgressView = getRootView()->findChild<LLProgressView>("progress_view");

16
indra/newview/llvoavatar.cpp
View File

@ -680,7 +680,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mNameString(),
mTitle(),
mNameAway(false),
mNameBusy(false),
mNameDoNotDisturb(false),
mNameMute(false),
mNameAppearance(false),
mNameFriend(false),
@ -1366,7 +1366,7 @@ void LLVOAvatar::initInstance(void)
if (LLCharacter::sInstances.size() == 1)
{
LLKeyframeMotion::setVFS(gStaticVFS);
registerMotion( ANIM_AGENT_BUSY, LLNullMotion::create );
registerMotion( ANIM_AGENT_DO_NOT_DISTURB, LLNullMotion::create );
registerMotion( ANIM_AGENT_CROUCH, LLKeyframeStandMotion::create );
registerMotion( ANIM_AGENT_CROUCHWALK, LLKeyframeWalkMotion::create );
registerMotion( ANIM_AGENT_EXPRESS_AFRAID, LLEmote::create );
@ -3100,7 +3100,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
if (!firstname || !lastname) return;
bool is_away = mSignaledAnimations.find(ANIM_AGENT_AWAY) != mSignaledAnimations.end();
bool is_busy = mSignaledAnimations.find(ANIM_AGENT_BUSY) != mSignaledAnimations.end();
bool is_do_not_disturb = mSignaledAnimations.find(ANIM_AGENT_DO_NOT_DISTURB) != mSignaledAnimations.end();
bool is_appearance = mSignaledAnimations.find(ANIM_AGENT_CUSTOMIZE) != mSignaledAnimations.end();
bool is_muted;
if (isSelf())
@ -3132,7 +3132,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
|| (!title && !mTitle.empty())
|| (title && mTitle != title->getString())
|| is_away != mNameAway
|| is_busy != mNameBusy
|| is_do_not_disturb != mNameDoNotDisturb
|| is_muted != mNameMute
|| is_appearance != mNameAppearance
|| is_friend != mNameFriend
@ -3142,7 +3142,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
clearNameTag();
if (is_away || is_muted || is_busy || is_appearance)
if (is_away || is_muted || is_do_not_disturb || is_appearance)
{
std::string line;
if (is_away)
@ -3150,9 +3150,9 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
line += LLTrans::getString("AvatarAway");
line += ", ";
}
if (is_busy)
if (is_do_not_disturb)
{
line += LLTrans::getString("AvatarBusy");
line += LLTrans::getString("AvatarDoNotDisturb");
line += ", ";
}
if (is_muted)
@ -3222,7 +3222,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
}
mNameAway = is_away;
mNameBusy = is_busy;
mNameDoNotDisturb = is_do_not_disturb;
mNameMute = is_muted;
mNameAppearance = is_appearance;
mNameFriend = is_friend;

2
indra/newview/llvoavatar.h
View File

@ -942,7 +942,7 @@ private:
std::string mNameString; // UTF-8 title + name + status
std::string mTitle;
bool mNameAway;
bool mNameBusy;
bool mNameDoNotDisturb;
bool mNameMute;
bool mNameAppearance;
bool mNameFriend;

6
indra/newview/llvoicevivox.cpp
View File

@ -3939,7 +3939,7 @@ void LLVivoxVoiceClient::messageEvent(
sessionState *session = findSession(sessionHandle);
if(session)
{
bool is_busy = gAgent.getBusy();
bool is_do_not_disturb = gAgent.isDoNotDisturb();
bool is_muted = LLMuteList::getInstance()->isMuted(session->mCallerID, session->mName, LLMute::flagTextChat);
bool is_linden = LLMuteList::getInstance()->isLinden(session->mName);
bool quiet_chat = false;
@ -3953,10 +3953,10 @@ void LLVivoxVoiceClient::messageEvent(
chat.mFromName = session->mName;
chat.mSourceType = CHAT_SOURCE_AGENT;
if(is_busy && !is_linden)
if(is_do_not_disturb && !is_linden)
{
quiet_chat = true;
// TODO: Question: Return busy mode response here? Or maybe when session is started instead?
// TODO: Question: Return do not disturb mode response here? Or maybe when session is started instead?
}
LL_DEBUGS("Voice") << "adding message, name " << session->mName << " session " << session->mIMSessionID << ", target " << session->mCallerID << LL_ENDL;

4
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -138,9 +138,9 @@
</menu_item_call>
<menu_item_call
label="Busy"
name="Set Busy">
name="set_do_not_disturb">
<menu_item_call.on_click
function="World.SetBusy"/>
function="World.SetDoNotDisturb"/>
</menu_item_call>
</menu>

14
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -3691,12 +3691,12 @@ Cannot offer friendship at this time. Please try again in a moment.
<notification
icon="alert.tga"
name="BusyModeSet"
name="DoNotDisturbModeSet"
type="alert">
Busy mode is set.
Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
<usetemplate
ignoretext="I change my status to Busy mode"
ignoretext="I change my status to Do Not Disturb mode"
name="okignore"
yestext="OK"/>
</notification>
@ -5167,8 +5167,8 @@ Do you want to replace it with the selected object?
<notification
icon="alert.tga"
label="Busy Mode Warning"
name="BusyModePay"
label="Do Not Disturb Mode Warning"
name="DoNotDisturbModePay"
type="alert">
You are in Busy Mode, which means you will not receive any items offered in exchange for this payment.
@ -5177,15 +5177,15 @@ Would you like to leave Busy Mode before completing this transaction?
<form name="form">
<ignore name="ignore"
save_option="true"
text="I am about to pay a person or object while I am in Busy mode"/>
text="I am about to pay a person or object while I am in Do Not Disturb mode"/>
<button
default="true"
ignore="Always leave Busy Mode"
ignore="Always leave Do Not Disturb Mode"
index="0"
name="Yes"
text="OK"/>
<button
ignore="Never leave Busy Mode"
ignore="Never leave Do Not Disturb Mode"
index="1"
name="No"
text="Cancel"/>

4
indra/newview/skins/default/xui/en/panel_preferences_general.xml
View File

@ -412,7 +412,7 @@
Busy mode response:
</text>
<text_editor
control_name="BusyModeResponse"
control_name="DoNotDisturbModeResponse"
text_readonly_color="LabelDisabledColor"
bg_writeable_color="LtGray"
use_ellipses="false"
@ -421,7 +421,7 @@
height="29"
layout="topleft"
left="30"
name="busy_response"
name="do_not_disturb_response"
width="470"
word_wrap="true">
log_in_to_change

8
indra/newview/skins/default/xui/en/strings.xml
View File

@ -295,7 +295,7 @@ Please try logging in again in a minute.</string>
<!-- llvoavatar. Displayed in the avatar chat bubble -->
<string name="AvatarEditingAppearance">(Editing Appearance)</string>
<string name="AvatarAway">Away</string>
<string name="AvatarBusy">Busy</string>
<string name="AvatarDoNotDisturb">Busy</string>
<string name="AvatarMuted">Blocked</string>
<!-- animations -->
@ -2077,8 +2077,8 @@ For AI Character: Get the closest navigable point to the point provided.
<!-- Avatar busy/away mode -->
<string name="AvatarSetNotAway">Not Away</string>
<string name="AvatarSetAway">Away</string>
<string name="AvatarSetNotBusy">Not Busy</string>
<string name="AvatarSetBusy">Busy</string>
<string name="AvatarSetAvailable">Not Busy</string>
<string name="AvatarSetDoNotDisturb">Busy</string>
<!-- Wearable Types -->
<string name="shape">Shape</string>
@ -2526,7 +2526,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
<string name="PanelContentsNewScript">New Script</string>
<!-- panel preferences general -->
<string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
<string name="DoNotDisturbModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
<!-- Mute -->
<string name="MuteByName">(By name)</string>