Pull merge from viewer-chui
commit
04e84eb826
|
|
@ -20,7 +20,7 @@
|
|||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>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.</string>
|
||||
<string>This resident has turned on 'Do Not Disturb' and will see your message later.</string>
|
||||
</map>
|
||||
<key>ConversationsExpandMessagePaneFirst</key>
|
||||
<map>
|
||||
|
|
|
|||
|
|
@ -1356,12 +1356,7 @@ void LLAgent::setAFK()
|
|||
{
|
||||
sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_START);
|
||||
setControlFlags(AGENT_CONTROL_AWAY | AGENT_CONTROL_STOP);
|
||||
LL_INFOS("AFK") << "Setting Away" << LL_ENDL;
|
||||
gAwayTimer.start();
|
||||
if (gAFKMenu)
|
||||
{
|
||||
gAFKMenu->setLabel(LLTrans::getString("AvatarSetNotAway"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1380,11 +1375,6 @@ void LLAgent::clearAFK()
|
|||
{
|
||||
sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_STOP);
|
||||
clearControlFlags(AGENT_CONTROL_AWAY);
|
||||
LL_INFOS("AFK") << "Clearing Away" << LL_ENDL;
|
||||
if (gAFKMenu)
|
||||
{
|
||||
gAFKMenu->setLabel(LLTrans::getString("AvatarSetAway"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1402,13 +1392,7 @@ BOOL LLAgent::getAFK() const
|
|||
void LLAgent::setDoNotDisturb(bool pIsDotNotDisturb)
|
||||
{
|
||||
mIsDoNotDisturb = pIsDotNotDisturb;
|
||||
EAnimRequest animRequest = (pIsDotNotDisturb ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
|
||||
|
||||
sendAnimationRequest(ANIM_AGENT_DO_NOT_DISTURB, animRequest);
|
||||
if (gDoNotDisturbMenu)
|
||||
{
|
||||
gDoNotDisturbMenu->setLabel(LLTrans::getString((pIsDotNotDisturb ? "AvatarSetAvailable" : "AvatarSetDoNotDisturb")));
|
||||
}
|
||||
sendAnimationRequest(ANIM_AGENT_DO_NOT_DISTURB, (pIsDotNotDisturb ? ANIM_REQUEST_START : ANIM_REQUEST_STOP));
|
||||
LLNotificationsUI::LLChannelManager::getInstance()->muteAllChannels(pIsDotNotDisturb);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -207,11 +207,11 @@ BOOL LLConversationViewSession::handleMouseDown( S32 x, S32 y, MASK mask )
|
|||
{
|
||||
LLConversationItem* item = dynamic_cast<LLConversationItem *>(getViewModelItem());
|
||||
LLUUID session_id = item? item->getUUID() : LLUUID();
|
||||
|
||||
BOOL result = LLFolderViewFolder::handleMouseDown(x, y, mask);
|
||||
(LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"))->
|
||||
selectConversationPair(session_id, false);
|
||||
|
||||
return LLFolderViewFolder::handleMouseDown(x, y, mask);
|
||||
return result;
|
||||
}
|
||||
|
||||
// virtual
|
||||
|
|
@ -240,7 +240,7 @@ void LLConversationViewSession::toggleOpen()
|
|||
{
|
||||
getParentFolder()->setSelection(this, true);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -504,11 +504,11 @@ BOOL LLConversationViewParticipant::handleMouseDown( S32 x, S32 y, MASK mask )
|
|||
item = dynamic_cast<LLConversationItem*>(session_widget->getViewModelItem());
|
||||
}
|
||||
LLUUID session_id = item? item->getUUID() : LLUUID();
|
||||
BOOL result = LLFolderViewItem::handleMouseDown(x, y, mask);
|
||||
(LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"))->
|
||||
selectConversationPair(session_id, false);
|
||||
|
||||
(LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"))->
|
||||
selectConversationPair(session_id, false);
|
||||
|
||||
return LLFolderViewItem::handleMouseDown(x, y, mask);
|
||||
return result;
|
||||
}
|
||||
|
||||
S32 LLConversationViewParticipant::getLabelXPos()
|
||||
|
|
|
|||
|
|
@ -178,9 +178,6 @@ LLContextMenu* gDetachPieMenu = NULL;
|
|||
LLContextMenu* gDetachScreenPieMenu = NULL;
|
||||
LLContextMenu* gDetachBodyPartPieMenus[8];
|
||||
|
||||
LLMenuItemCallGL* gAFKMenu = NULL;
|
||||
LLMenuItemCallGL* gDoNotDisturbMenu = NULL;
|
||||
|
||||
//
|
||||
// Local prototypes
|
||||
|
||||
|
|
@ -470,8 +467,6 @@ void init_menus()
|
|||
gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost);
|
||||
gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost);
|
||||
|
||||
gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE);
|
||||
gDoNotDisturbMenu = gMenuBarView->getChild<LLMenuItemCallGL>("set_do_not_disturb", TRUE);
|
||||
gAttachSubMenu = gMenuBarView->findChildMenuByName("Attach Object", TRUE);
|
||||
gDetachSubMenu = gMenuBarView->findChildMenuByName("Detach Object", TRUE);
|
||||
|
||||
|
|
@ -7843,6 +7838,22 @@ class LLViewCheckRenderType : public view_listener_t
|
|||
}
|
||||
};
|
||||
|
||||
class LLViewStatusAway : public view_listener_t
|
||||
{
|
||||
bool handleEvent(const LLSD& userdata)
|
||||
{
|
||||
return (gAgent.isInitialized() && gAgent.getAFK());
|
||||
}
|
||||
};
|
||||
|
||||
class LLViewStatusDoNotDisturb : public view_listener_t
|
||||
{
|
||||
bool handleEvent(const LLSD& userdata)
|
||||
{
|
||||
return (gAgent.isInitialized() && gAgent.isDoNotDisturb());
|
||||
}
|
||||
};
|
||||
|
||||
class LLViewShowHUDAttachments : public view_listener_t
|
||||
{
|
||||
bool handleEvent(const LLSD& userdata)
|
||||
|
|
@ -8276,8 +8287,10 @@ void initialize_menus()
|
|||
view_listener_t::addMenu(new LLViewCheckShowHoverTips(), "View.CheckShowHoverTips");
|
||||
view_listener_t::addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
|
||||
view_listener_t::addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
|
||||
view_listener_t::addMenu(new LLViewStatusAway(), "View.Status.CheckAway");
|
||||
view_listener_t::addMenu(new LLViewStatusDoNotDisturb(), "View.Status.CheckDoNotDisturb");
|
||||
view_listener_t::addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
|
||||
|
||||
|
||||
// Me > Movement
|
||||
view_listener_t::addMenu(new LLAdvancedAgentFlyingInfo(), "Agent.getFlying");
|
||||
|
||||
|
|
|
|||
|
|
@ -187,8 +187,6 @@ extern LLContextMenu* gDetachPieMenu;
|
|||
extern LLContextMenu* gAttachBodyPartPieMenus[8];
|
||||
extern LLContextMenu* gDetachBodyPartPieMenus[8];
|
||||
|
||||
extern LLMenuItemCallGL* gAFKMenu;
|
||||
extern LLMenuItemCallGL* gDoNotDisturbMenu;
|
||||
extern LLMenuItemCallGL* gMutePieMenu;
|
||||
extern LLMenuItemCallGL* gMuteObjectPieMenu;
|
||||
extern LLMenuItemCallGL* gBuyPassPieMenu;
|
||||
|
|
|
|||
|
|
@ -2941,9 +2941,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
|
|||
}
|
||||
else
|
||||
{
|
||||
// TODO: after LLTrans hits release, get "busy response" into translatable file
|
||||
buffer = llformat("%s (%s): %s", name.c_str(), "busy response", message.c_str());
|
||||
gIMMgr->addMessage(session_id, from_id, name, buffer);
|
||||
gIMMgr->addMessage(session_id, from_id, name, message);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -130,19 +130,22 @@
|
|||
label="Status"
|
||||
name="Status"
|
||||
tear_off="true">
|
||||
<menu_item_call
|
||||
label="Away"
|
||||
name="Set Away">
|
||||
<menu_item_call.on_click
|
||||
<menu_item_check
|
||||
label="Away">
|
||||
<menu_item_check.on_check
|
||||
function="View.Status.CheckAway" />
|
||||
<menu_item_check.on_click
|
||||
function="World.SetAway" />
|
||||
</menu_item_call>
|
||||
<menu_item_call
|
||||
label="Busy"
|
||||
name="set_do_not_disturb">
|
||||
<menu_item_call.on_click
|
||||
</menu_item_check>
|
||||
<menu_item_check
|
||||
label="Do Not Disturb">
|
||||
<menu_item_check.on_check
|
||||
function="View.Status.CheckDoNotDisturb" />
|
||||
<menu_item_check.on_click
|
||||
function="World.SetDoNotDisturb"/>
|
||||
</menu_item_call>
|
||||
</menu>
|
||||
</menu_item_check>
|
||||
|
||||
</menu>
|
||||
|
||||
<menu_item_separator/>
|
||||
|
||||
|
|
@ -254,8 +257,7 @@
|
|||
parameter="speak" />
|
||||
</menu_item_check>
|
||||
<menu_item_check
|
||||
label="Conversations Log..."
|
||||
name="ConversationsLog">
|
||||
label="Conversation Log...">
|
||||
<menu_item_check.on_check
|
||||
function="Floater.Visible"
|
||||
parameter="conversation" />
|
||||
|
|
@ -318,6 +320,15 @@
|
|||
function="SideTray.PanelPeopleTab"
|
||||
parameter="blocked_panel" />
|
||||
</menu_item_call>
|
||||
<menu_item_separator/>
|
||||
<menu_item_check
|
||||
label="Do Not Disturb">
|
||||
<menu_item_check.on_check
|
||||
function="View.Status.CheckDoNotDisturb" />
|
||||
<menu_item_check.on_click
|
||||
function="World.SetDoNotDisturb"/>
|
||||
</menu_item_check>
|
||||
|
||||
</menu>
|
||||
<menu
|
||||
create_jump_keys="true"
|
||||
|
|
|
|||
|
|
@ -3693,8 +3693,11 @@ Cannot offer friendship at this time. Please try again in a moment.
|
|||
icon="alert.tga"
|
||||
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.
|
||||
Do Not Disturb is on. You will not be notified of incoming communications.
|
||||
|
||||
- Other residents will receive your Do Not Disturb response (set in Preferences > General).
|
||||
- Teleportation offers will be declined.
|
||||
- Inventory offers will go to your Trash.
|
||||
<usetemplate
|
||||
ignoretext="I change my status to Do Not Disturb mode"
|
||||
name="okignore"
|
||||
|
|
@ -5170,9 +5173,9 @@ Do you want to replace it with the selected object?
|
|||
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.
|
||||
You have turned on Do Not Disturb. You will not receive any items offered in exchange for this payment.
|
||||
|
||||
Would you like to leave Busy Mode before completing this transaction?
|
||||
Would you like to turn off Do Not Disturb before completing this transaction?
|
||||
<tag>confirm</tag>
|
||||
<form name="form">
|
||||
<ignore name="ignore"
|
||||
|
|
|
|||
|
|
@ -1,151 +1,150 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<panel
|
||||
border="true"
|
||||
follows="left|top|right|bottom"
|
||||
height="408"
|
||||
label="Text Chat"
|
||||
layout="topleft"
|
||||
left="102"
|
||||
name="chat"
|
||||
top="1"
|
||||
width="517">
|
||||
border="true"
|
||||
follows="left|top|right|bottom"
|
||||
height="408"
|
||||
label="Text Chat"
|
||||
layout="topleft"
|
||||
left="102"
|
||||
name="chat"
|
||||
top="1"
|
||||
width="517">
|
||||
|
||||
<panel
|
||||
border="false"
|
||||
follows="left|top"
|
||||
height="90"
|
||||
layout="topleft"
|
||||
top="10"
|
||||
left="13"
|
||||
width="517">
|
||||
border="false"
|
||||
follows="left|top"
|
||||
height="90"
|
||||
layout="topleft"
|
||||
top="10"
|
||||
left="13"
|
||||
width="517">
|
||||
|
||||
<check_box
|
||||
control_name="PlayTypingAnim"
|
||||
height="16"
|
||||
initial_value="true"
|
||||
label="Play typing animation when chatting"
|
||||
layout="topleft"
|
||||
top="0"
|
||||
name="play_typing_animation"
|
||||
width="330" />
|
||||
control_name="PlayTypingAnim"
|
||||
height="16"
|
||||
initial_value="true"
|
||||
label="Play typing animation when chatting"
|
||||
layout="topleft"
|
||||
top="0"
|
||||
name="play_typing_animation"
|
||||
width="330" />
|
||||
<check_box
|
||||
enabled="false"
|
||||
height="16"
|
||||
label="Email me IMs when I'm offline"
|
||||
layout="topleft"
|
||||
name="send_im_to_email"
|
||||
top_pad="6"
|
||||
width="330" />
|
||||
enabled="false"
|
||||
height="16"
|
||||
label="Email me IMs when I'm offline"
|
||||
layout="topleft"
|
||||
name="send_im_to_email"
|
||||
top_pad="6"
|
||||
width="330" />
|
||||
<check_box
|
||||
height="16"
|
||||
label="Keep a conversation log and transcripts"
|
||||
layout="topleft"
|
||||
name="keep_convo_log_and_transcripts"
|
||||
top_pad="6"
|
||||
width="330" />
|
||||
height="16"
|
||||
label="Keep a conversation log and transcripts"
|
||||
layout="topleft"
|
||||
name="keep_convo_log_and_transcripts"
|
||||
top_pad="6"
|
||||
width="330" />
|
||||
<check_box
|
||||
control_name="UseChatBubbles"
|
||||
follows="left|top"
|
||||
height="16"
|
||||
label="Bubble Chat"
|
||||
layout="topleft"
|
||||
top_pad="6"
|
||||
name="bubble_text_chat"
|
||||
width="330" />
|
||||
control_name="UseChatBubbles"
|
||||
follows="left|top"
|
||||
height="16"
|
||||
label="Bubble Chat"
|
||||
layout="topleft"
|
||||
top_pad="6"
|
||||
name="bubble_text_chat"
|
||||
width="330" />
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="345"
|
||||
height="12"
|
||||
name="font_size"
|
||||
width="120"
|
||||
top="0">
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="345"
|
||||
height="12"
|
||||
name="font_size"
|
||||
width="120"
|
||||
top="0">
|
||||
Font size:
|
||||
</text>
|
||||
<radio_group
|
||||
height="90"
|
||||
layout="topleft"
|
||||
left="352"
|
||||
control_name="ChatFontSize"
|
||||
name="chat_font_size"
|
||||
top_pad="0"
|
||||
width="50">
|
||||
height="90"
|
||||
layout="topleft"
|
||||
left="352"
|
||||
control_name="ChatFontSize"
|
||||
name="chat_font_size"
|
||||
top_pad="0"
|
||||
width="50">
|
||||
<radio_item
|
||||
height="16"
|
||||
label="Small"
|
||||
layout="topleft"
|
||||
name="radio"
|
||||
value="0"
|
||||
top="10"
|
||||
width="125" />
|
||||
height="16"
|
||||
label="Small"
|
||||
layout="topleft"
|
||||
name="radio"
|
||||
value="0"
|
||||
top="10"
|
||||
width="125" />
|
||||
<radio_item
|
||||
height="16"
|
||||
label="Medium"
|
||||
layout="topleft"
|
||||
name="radio2"
|
||||
value="1"
|
||||
top_pad="6"
|
||||
width="125" />
|
||||
height="16"
|
||||
label="Medium"
|
||||
layout="topleft"
|
||||
name="radio2"
|
||||
value="1"
|
||||
top_pad="6"
|
||||
width="125" />
|
||||
<radio_item
|
||||
height="16"
|
||||
label="Large"
|
||||
layout="topleft"
|
||||
name="radio3"
|
||||
value="2"
|
||||
top_pad="6"
|
||||
width="125" />
|
||||
height="16"
|
||||
label="Large"
|
||||
layout="topleft"
|
||||
name="radio3"
|
||||
value="2"
|
||||
top_pad="6"
|
||||
width="125" />
|
||||
</radio_group>
|
||||
|
||||
</panel>
|
||||
|
||||
<panel
|
||||
border="false"
|
||||
follows="left|top"
|
||||
height="193"
|
||||
layout="topleft"
|
||||
left="13"
|
||||
width="517">
|
||||
border="false"
|
||||
follows="left|top"
|
||||
height="198"
|
||||
layout="topleft"
|
||||
left="13"
|
||||
width="517">
|
||||
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
height="12"
|
||||
name="notifications"
|
||||
left="0"
|
||||
width="120">
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
height="12"
|
||||
name="notifications"
|
||||
left="0"
|
||||
width="120">
|
||||
Notifications:
|
||||
</text>
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
height="12"
|
||||
name="friend_ims"
|
||||
width="145"
|
||||
left="0"
|
||||
top_pad="15"
|
||||
>
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
height="12"
|
||||
name="friend_ims"
|
||||
width="145"
|
||||
left="0"
|
||||
top_pad="15">
|
||||
Friend IMs:
|
||||
</text>
|
||||
<combo_box
|
||||
control_name="NotificationFriendIMOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="FriendIMOptions"
|
||||
width="223">
|
||||
control_name="NotificationFriendIMOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="FriendIMOptions"
|
||||
width="223">
|
||||
<combo_box.item
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
<combo_box.item
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
<combo_box.item
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
</combo_box>
|
||||
<text
|
||||
follows="left|top"
|
||||
|
|
@ -154,244 +153,239 @@
|
|||
name="non_friend_ims"
|
||||
width="145"
|
||||
left="0"
|
||||
top_pad="15"
|
||||
>
|
||||
top_pad="15">
|
||||
Non-friend IMs:
|
||||
</text>
|
||||
<combo_box
|
||||
control_name="NotificationNonFriendIMOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="NonFriendIMOptions"
|
||||
width="223">
|
||||
control_name="NotificationNonFriendIMOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="NonFriendIMOptions"
|
||||
width="223">
|
||||
<combo_box.item
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
<combo_box.item
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
<combo_box.item
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
</combo_box>
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
height="13"
|
||||
name="conference_ims"
|
||||
width="145"
|
||||
top_pad="14"
|
||||
>
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
height="13"
|
||||
name="conference_ims"
|
||||
width="145"
|
||||
top_pad="14">
|
||||
Conference IMs:
|
||||
</text>
|
||||
<combo_box
|
||||
control_name="NotificationConferenceIMOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="ConferenceIMOptions"
|
||||
width="223">
|
||||
control_name="NotificationConferenceIMOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="ConferenceIMOptions"
|
||||
width="223">
|
||||
<combo_box.item
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
<combo_box.item
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
<combo_box.item
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
</combo_box>
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
height="13"
|
||||
name="group_chat"
|
||||
width="145"
|
||||
top_pad="14"
|
||||
>
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
height="13"
|
||||
name="group_chat"
|
||||
width="145"
|
||||
top_pad="14">
|
||||
Group chat:
|
||||
</text>
|
||||
<combo_box
|
||||
control_name="NotificationGroupChatOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="GroupChatOptions"
|
||||
width="223">
|
||||
control_name="NotificationGroupChatOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="GroupChatOptions"
|
||||
width="223">
|
||||
<combo_box.item
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
<combo_box.item
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
<combo_box.item
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
</combo_box>
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
height="12"
|
||||
name="nearby_chat"
|
||||
width="145"
|
||||
top_pad="14"
|
||||
>
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
height="12"
|
||||
name="nearby_chat"
|
||||
width="145"
|
||||
top_pad="14">
|
||||
Nearby chat:
|
||||
</text>
|
||||
<combo_box
|
||||
control_name="NotificationNearbyChatOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="NearbyChatOptions"
|
||||
width="223">
|
||||
control_name="NotificationNearbyChatOptions"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
top_delta="-6"
|
||||
name="NearbyChatOptions"
|
||||
width="223">
|
||||
<combo_box.item
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
label="Pop up the message"
|
||||
name="0"
|
||||
value="0"/>
|
||||
<combo_box.item
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
label="Flash toolbar button"
|
||||
name="1"
|
||||
value="1"/>
|
||||
<combo_box.item
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
label="None"
|
||||
name="2"
|
||||
value="2"/>
|
||||
</combo_box>
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
height="12"
|
||||
name="notifications_alert"
|
||||
width="350"
|
||||
top_pad="11"
|
||||
visible="true"
|
||||
text_color="DrYellow"
|
||||
>
|
||||
To temporarily stop all notifications, use Me > Status > Busy.
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
height="13"
|
||||
name="notifications_alert"
|
||||
width="500"
|
||||
top_pad="11"
|
||||
visible="true"
|
||||
text_color="DrYellow">
|
||||
To temporarily stop all notifications, use Communicate > Do Not Disturb.
|
||||
</text>
|
||||
|
||||
</panel>
|
||||
|
||||
<panel
|
||||
border="false"
|
||||
follows="left|top"
|
||||
height="1"
|
||||
layout="topleft"
|
||||
left="13"
|
||||
width="517">
|
||||
border="false"
|
||||
follows="left|top"
|
||||
height="67"
|
||||
layout="topleft"
|
||||
left="13"
|
||||
width="517">
|
||||
|
||||
<text
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
name="play_sound"
|
||||
width="100"
|
||||
top_pad="13"
|
||||
visible="true">
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
name="play_sound"
|
||||
width="100"
|
||||
top_pad="8"
|
||||
visible="true">
|
||||
Play sound:
|
||||
</text>
|
||||
<check_box
|
||||
control_name="NewConversation"
|
||||
height="16"
|
||||
initial_value="true"
|
||||
label="New conversation"
|
||||
layout="topleft"
|
||||
left_pad="15"
|
||||
top_pad="-10"
|
||||
name="new_conversation"
|
||||
width="150" />
|
||||
control_name="NewConversation"
|
||||
height="16"
|
||||
initial_value="true"
|
||||
label="New conversation"
|
||||
layout="topleft"
|
||||
left_pad="15"
|
||||
top_pad="-10"
|
||||
name="new_conversation"
|
||||
width="150" />
|
||||
<check_box
|
||||
control_name="IncomingVoiceCall"
|
||||
height="16"
|
||||
initial_value="true"
|
||||
label="Incoming voice call"
|
||||
layout="topleft"
|
||||
top_pad="6"
|
||||
name="incoming_voice_call"
|
||||
width="150" />
|
||||
control_name="IncomingVoiceCall"
|
||||
height="16"
|
||||
initial_value="true"
|
||||
label="Incoming voice call"
|
||||
layout="topleft"
|
||||
top_pad="6"
|
||||
name="incoming_voice_call"
|
||||
width="150" />
|
||||
<check_box
|
||||
control_name="GroupChatMessages"
|
||||
height="16"
|
||||
initial_value="false"
|
||||
label="Group chat messages"
|
||||
layout="topleft"
|
||||
top_pad="6"
|
||||
name="group_chat_messages"
|
||||
width="150" />
|
||||
control_name="GroupChatMessages"
|
||||
height="16"
|
||||
initial_value="false"
|
||||
label="Group chat messages"
|
||||
layout="topleft"
|
||||
top_pad="6"
|
||||
name="group_chat_messages"
|
||||
width="150" />
|
||||
<check_box
|
||||
control_name="TeleportOffer"
|
||||
height="16"
|
||||
initial_value="true"
|
||||
label="Teleport offer"
|
||||
layout="topleft"
|
||||
left_pad="35"
|
||||
top_pad="-59"
|
||||
name="teleport_offer"
|
||||
width="150" />
|
||||
control_name="TeleportOffer"
|
||||
height="16"
|
||||
initial_value="true"
|
||||
label="Teleport offer"
|
||||
layout="topleft"
|
||||
left_pad="35"
|
||||
top_pad="-59"
|
||||
name="teleport_offer"
|
||||
width="150" />
|
||||
<check_box
|
||||
control_name="InventoryOffer"
|
||||
height="16"
|
||||
initial_value="false"
|
||||
label="Inventory offer"
|
||||
layout="topleft"
|
||||
top_pad="6"
|
||||
name="inventory_offer"
|
||||
width="150" />
|
||||
control_name="InventoryOffer"
|
||||
height="16"
|
||||
initial_value="false"
|
||||
label="Inventory offer"
|
||||
layout="topleft"
|
||||
top_pad="6"
|
||||
name="inventory_offer"
|
||||
width="150" />
|
||||
|
||||
</panel>
|
||||
|
||||
|
||||
<button
|
||||
follows="left|top"
|
||||
height="23"
|
||||
label="Translation..."
|
||||
layout="topleft"
|
||||
left="9"
|
||||
name="ok_btn"
|
||||
top="-29"
|
||||
width="170">
|
||||
<button.commit_callback
|
||||
function="Pref.TranslationSettings" />
|
||||
follows="left|top"
|
||||
height="23"
|
||||
label="Translation..."
|
||||
layout="topleft"
|
||||
left="9"
|
||||
name="ok_btn"
|
||||
top="-29"
|
||||
width="170">
|
||||
<button.commit_callback
|
||||
function="Pref.TranslationSettings" />
|
||||
</button>
|
||||
<button
|
||||
follows="top|left"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
top_pad="-23"
|
||||
left_pad="5"
|
||||
name="autoreplace_showgui"
|
||||
commit_callback.function="Pref.AutoReplace"
|
||||
label="Auto-Replace..."
|
||||
width="150">
|
||||
follows="top|left"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
top_pad="-23"
|
||||
left_pad="5"
|
||||
name="autoreplace_showgui"
|
||||
commit_callback.function="Pref.AutoReplace"
|
||||
label="Auto-Replace..."
|
||||
width="150">
|
||||
</button>
|
||||
<button
|
||||
follows="top|left"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
top_pad="-23"
|
||||
left_pad="5"
|
||||
name="spellcheck_showgui"
|
||||
commit_callback.function="Pref.SpellChecker"
|
||||
label="Spell Checking..."
|
||||
width="150">
|
||||
follows="top|left"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
top_pad="-23"
|
||||
left_pad="5"
|
||||
name="spellcheck_showgui"
|
||||
commit_callback.function="Pref.SpellChecker"
|
||||
label="Spell Checking..."
|
||||
width="150">
|
||||
</button>
|
||||
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -409,7 +409,7 @@
|
|||
name="text_box3"
|
||||
top_pad="3"
|
||||
width="240">
|
||||
Busy mode response:
|
||||
Do Not Disturb response:
|
||||
</text>
|
||||
<text_editor
|
||||
control_name="DoNotDisturbModeResponse"
|
||||
|
|
|
|||
|
|
@ -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="AvatarDoNotDisturb">Busy</string>
|
||||
<string name="AvatarDoNotDisturb">Do Not Disturb</string>
|
||||
<string name="AvatarMuted">Blocked</string>
|
||||
|
||||
<!-- animations -->
|
||||
|
|
@ -2074,12 +2074,6 @@ For AI Character: Get the closest navigable point to the point provided.
|
|||
</string>
|
||||
|
||||
|
||||
<!-- Avatar busy/away mode -->
|
||||
<string name="AvatarSetNotAway">Not Away</string>
|
||||
<string name="AvatarSetAway">Away</string>
|
||||
<string name="AvatarSetAvailable">Not Busy</string>
|
||||
<string name="AvatarSetDoNotDisturb">Busy</string>
|
||||
|
||||
<!-- Wearable Types -->
|
||||
<string name="shape">Shape</string>
|
||||
<string name="skin">Skin</string>
|
||||
|
|
@ -2526,7 +2520,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="DoNotDisturbModeResponseDefault">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.</string>
|
||||
<string name="DoNotDisturbModeResponseDefault">This resident has turned on 'Do Not Disturb' and will see your message later.</string>
|
||||
|
||||
<!-- Mute -->
|
||||
<string name="MuteByName">(By name)</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue