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

Wording correction for FIRE-1245 (commit 3ce736e2e3e4)

PanteraPolnocy 2013-10-18 18:17:25 +02:00
parent 639ac3fd97
commit 84222a8b5b
11 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,10 +132,10 @@
<key>Value</key>
<string>The Resident you messaged has activated Firestorm viewer&apos;s &apos;autorespond 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>
</map>
<key>FSRejectTeleportRequestsMode</key>
<key>FSRejectTeleportOffersMode</key>
<map>
<key>Comment</key>
<string>Has the user selected reject all teleport requests mode?</string>
<string>Has the user selected reject all teleport offers mode?</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -143,16 +143,16 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>FSRejectTeleportRequestsResponse</key>
<key>FSRejectTeleportOffersResponse</key>
<map>
<key>Comment</key>
<string>Auto response to instant messages from all avatars while in reject all teleport requests mode.</string>
<string>Auto response to instant messages from all avatars while in reject all teleport offers mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>The Resident you messaged has activated Firestorm viewer&apos;s &apos;reject all teleport requests mode&apos; which means they have requested not to be disturbed with teleport requests. You may still send an IM message manually.</string>
<string>The Resident you messaged has activated Firestorm viewer&apos;s &apos;reject all teleport offers mode&apos; which means they have requested not to be disturbed with teleport offers. You may still send an IM message manually.</string>
</map>
<key>FSLSLBridgeUUID</key>
<map>

36
indra/newview/llagent.cpp
View File

@ -417,7 +417,7 @@ LLAgent::LLAgent() :
mIsDoNotDisturb(false),
mIsAutorespond(FALSE),
mIsAutorespondNonFriends(FALSE),
mIsRejectTeleportRequests(FALSE), // <FS:PP> FIRE-1245: Option to block/reject teleport requests
mIsRejectTeleportOffers(FALSE), // <FS:PP> FIRE-1245: Option to block/reject teleport offers
mControlFlags(0x00000000),
mbFlagsDirty(FALSE),
@ -517,7 +517,7 @@ void LLAgent::init()
gSavedSettings.getControl("FSAlwaysFly")->getSignal()->connect(boost::bind(&LLAgent::updateFSAlwaysFly, this, _2));
selectAutorespond(gSavedPerAccountSettings.getBOOL("FSAutorespondMode"));
selectAutorespondNonFriends(gSavedPerAccountSettings.getBOOL("FSAutorespondNonFriendsMode"));
selectRejectTeleportRequests(gSavedPerAccountSettings.getBOOL("FSRejectTeleportRequestsMode")); // <FS:PP> FIRE-1245: Option to block/reject teleport requests
selectRejectTeleportOffers(gSavedPerAccountSettings.getBOOL("FSRejectTeleportOffersMode")); // <FS:PP> FIRE-1245: Option to block/reject teleport offers
LLViewerParcelMgr::getInstance()->addAgentParcelChangedCallback(boost::bind(&LLAgent::parcelChangedCallback));
@ -1713,43 +1713,43 @@ BOOL LLAgent::getAutorespondNonFriends() const
return mIsAutorespondNonFriends;
}
// <FS:PP> FIRE-1245: Option to block/reject teleport requests
// <FS:PP> FIRE-1245: Option to block/reject teleport offers
//-----------------------------------------------------------------------------
// setRejectTeleportRequests()
// setRejectTeleportOffers()
//-----------------------------------------------------------------------------
void LLAgent::setRejectTeleportRequests()
void LLAgent::setRejectTeleportOffers()
{
selectRejectTeleportRequests(TRUE);
selectRejectTeleportOffers(TRUE);
}
//-----------------------------------------------------------------------------
// clearRejectTeleportRequests()
// clearRejectTeleportOffers()
//-----------------------------------------------------------------------------
void LLAgent::clearRejectTeleportRequests()
void LLAgent::clearRejectTeleportOffers()
{
selectRejectTeleportRequests(FALSE);
selectRejectTeleportOffers(FALSE);
}
//-----------------------------------------------------------------------------
// selectRejectTeleportRequests()
// selectRejectTeleportOffers()
//-----------------------------------------------------------------------------
void LLAgent::selectRejectTeleportRequests(BOOL selected)
void LLAgent::selectRejectTeleportOffers(BOOL selected)
{
llinfos << "Setting rejecting teleport requests mode to " << selected << llendl;
mIsRejectTeleportRequests = selected;
gSavedPerAccountSettings.setBOOL("FSRejectTeleportRequestsMode", selected);
llinfos << "Setting rejecting teleport offers mode to " << selected << llendl;
mIsRejectTeleportOffers = selected;
gSavedPerAccountSettings.setBOOL("FSRejectTeleportOffersMode", selected);
}
//-----------------------------------------------------------------------------
// getRejectTeleportRequests()
// getRejectTeleportOffers()
//-----------------------------------------------------------------------------
BOOL LLAgent::getRejectTeleportRequests() const
BOOL LLAgent::getRejectTeleportOffers() const
{
return mIsRejectTeleportRequests;
return mIsRejectTeleportOffers;
}
// </FS:PP> FIRE-1245: Option to block/reject teleport requests
// </FS:PP> FIRE-1245: Option to block/reject teleport offers
//-----------------------------------------------------------------------------
// startAutoPilotGlobal()

14
indra/newview/llagent.h
View File

@ -427,15 +427,15 @@ public:
private:
BOOL mIsAutorespondNonFriends;
// <FS:PP> FIRE-1245: Option to block/reject teleport requests
// <FS:PP> FIRE-1245: Option to block/reject teleport offers
public:
void setRejectTeleportRequests();
void clearRejectTeleportRequests();
void selectRejectTeleportRequests(BOOL);
BOOL getRejectTeleportRequests() const;
void setRejectTeleportOffers();
void clearRejectTeleportOffers();
void selectRejectTeleportOffers(BOOL);
BOOL getRejectTeleportOffers() const;
private:
BOOL mIsRejectTeleportRequests;
// </FS:PP> FIRE-1245: Option to block/reject teleport requests
BOOL mIsRejectTeleportOffers;
// </FS:PP> FIRE-1245: Option to block/reject teleport offers
//--------------------------------------------------------------------
// Grab

22
indra/newview/llviewermenu.cpp
View File

@ -6782,34 +6782,34 @@ class LLWorldGetAutorespondNonFriends : public view_listener_t
}
};
// <FS:PP> FIRE-1245: Option to block/reject teleport requests
class LLWorldSetRejectTeleportRequests : public view_listener_t
// <FS:PP> FIRE-1245: Option to block/reject teleport offers
class LLWorldSetRejectTeleportOffers : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
if (gAgent.getRejectTeleportRequests())
if (gAgent.getRejectTeleportOffers())
{
gAgent.clearRejectTeleportRequests();
gAgent.clearRejectTeleportOffers();
}
else
{
gAgent.setRejectTeleportRequests();
LLNotificationsUtil::add("RejectTeleportRequestsModeSet");
gAgent.setRejectTeleportOffers();
LLNotificationsUtil::add("RejectTeleportOffersModeSet");
}
return true;
}
};
// [SJ - FIRE-2177 - Making Autorespons a simple Check in the menu again for clarity]
class LLWorldGetRejectTeleportRequests : public view_listener_t
class LLWorldGetRejectTeleportOffers : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
bool new_value = gAgent.getRejectTeleportRequests();
bool new_value = gAgent.getRejectTeleportOffers();
return new_value;
}
};
// </FS:PP> FIRE-1245: Option to block/reject teleport requests
// </FS:PP> FIRE-1245: Option to block/reject teleport offers
class LLWorldCreateLandmark : public view_listener_t
{
@ -10391,8 +10391,8 @@ void initialize_menus()
view_listener_t::addMenu(new LLWorldSetAutorespond(), "World.SetAutorespond");
view_listener_t::addMenu(new LLWorldGetAutorespond(), "World.GetAutorespond"); //[SJ FIRE-2177]
// <FS:PP> FIRE-1245: Option to block/reject teleport requests
view_listener_t::addMenu(new LLWorldSetRejectTeleportRequests(), "World.SetRejectTeleportRequests");
view_listener_t::addMenu(new LLWorldGetRejectTeleportRequests(), "World.GetRejectTeleportRequests");
view_listener_t::addMenu(new LLWorldSetRejectTeleportOffers(), "World.SetRejectTeleportOffers");
view_listener_t::addMenu(new LLWorldGetRejectTeleportOffers(), "World.GetRejectTeleportOffers");
// </FS:PP>
view_listener_t::addMenu(new LLWorldSetAutorespondNonFriends(), "World.SetAutorespondNonFriends");
view_listener_t::addMenu(new LLWorldGetAutorespondNonFriends(), "World.GetAutorespondNonFriends"); //[SJ FIRE-2177]

16
indra/newview/llviewermessage.cpp
View File

@ -2729,7 +2729,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
BOOL is_do_not_disturb = gAgent.isDoNotDisturb();
BOOL is_autorespond = gAgent.getAutorespond();
BOOL is_autorespond_nonfriends = gAgent.getAutorespondNonFriends();
BOOL is_rejecting_tp_requests = gAgent.getRejectTeleportRequests(); // <FS:PP> FIRE-1245: Option to block/reject teleport requests
BOOL is_rejecting_tp_offers = gAgent.getRejectTeleportOffers(); // <FS:PP> FIRE-1245: Option to block/reject teleport offers
BOOL is_autorespond_muted = gSavedPerAccountSettings.getBOOL("FSSendMutedAvatarResponse");
BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat)
// object IMs contain sender object id in session_id (STORM-1209)
@ -3617,10 +3617,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
{
send_do_not_disturb_message(msg, from_id);
}
// <FS:PP> FIRE-1245: Option to block/reject teleport requests
else if ( (is_rejecting_tp_requests) && (!fRlvSummon) )
// <FS:PP> FIRE-1245: Option to block/reject teleport offers
else if ( (is_rejecting_tp_offers) && (!fRlvSummon) )
{
send_rejecting_tp_requests_message(msg, from_id);
send_rejecting_tp_offers_message(msg, from_id);
}
// </FS:PP>
else
@ -3966,12 +3966,12 @@ void send_do_not_disturb_message (LLMessageSystem* msg, const LLUUID& from_id, c
}
}
// <FS:PP> FIRE-1245: Option to block/reject teleport requests
void send_rejecting_tp_requests_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id)
// <FS:PP> FIRE-1245: Option to block/reject teleport offers
void send_rejecting_tp_offers_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id)
{
std::string my_name;
LLAgentUI::buildFullname(my_name);
std::string response = gSavedPerAccountSettings.getString("FSRejectTeleportRequestsResponse");
std::string response = gSavedPerAccountSettings.getString("FSRejectTeleportOffersResponse");
pack_instant_message(
msg,
gAgent.getID(),
@ -3985,7 +3985,7 @@ void send_rejecting_tp_requests_message (LLMessageSystem* msg, const LLUUID& fro
session_id);
gAgent.sendReliableMessage();
}
// </FS:PP> FIRE-1245: Option to block/reject teleport requests
// </FS:PP> FIRE-1245: Option to block/reject teleport offers
bool callingcard_offer_callback(const LLSD& notification, const LLSD& response)
{

2
indra/newview/llviewermessage.h
View File

@ -158,7 +158,7 @@ void send_group_notice(const LLUUID& group_id,
const LLInventoryItem* item);
void send_do_not_disturb_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id = LLUUID::null);
void send_rejecting_tp_requests_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id = LLUUID::null); // <FS:PP> FIRE-1245: Option to block/reject teleport requests
void send_rejecting_tp_offers_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id = LLUUID::null); // <FS:PP> FIRE-1245: Option to block/reject teleport offers
void handle_lure(const LLUUID& invitee);
void handle_lure(const uuid_vec_t& ids);

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

@ -465,12 +465,12 @@
<menu_item_separator/>
<menu_item_check
label="Automatically reject teleport requests"
name="Automatically reject teleport requests">
label="Automatically reject teleport offers"
name="Automatically reject teleport offers">
<menu_item_check.on_check
function="World.GetRejectTeleportRequests"/>
function="World.GetRejectTeleportOffers"/>
<menu_item_check.on_click
function="World.SetRejectTeleportRequests"/>
function="World.SetRejectTeleportOffers"/>
</menu_item_check>
</menu>

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

@ -3962,12 +3962,12 @@ Incoming instant messages from anyone who is not your friend will now receive yo
<notification
icon="alert.tga"
name="RejectTeleportRequestsModeSet"
name="RejectTeleportOffersModeSet"
type="alert">
Reject all incoming teleport requests mode is on.
Incoming teleport requests from anyone will now receive your configured autoresponse. You will not be notified because of that fact.
Reject all incoming teleport offers mode is on.
Incoming teleport offers from anyone will now receive your configured autoresponse. You will not be notified because of that fact.
<usetemplate
ignoretext="I change my status to reject all teleport requests mode"
ignoretext="I change my status to reject all teleport offers mode"
name="okignore"
yestext="OK"/>
</notification>

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

@ -540,10 +540,10 @@
name="autorespond_rtr_response_label"
top_pad="10"
width="450">
Automatic response to all avatars when in REJECT TELEPORT REQUESTS mode:
Automatic response to all avatars when in REJECT TELEPORT OFFERS mode:
</text>
<text_editor
control_name="FSRejectTeleportRequestsResponse"
control_name="FSRejectTeleportOffersResponse"
use_ellipses="false"
commit_on_focus_lost = "true"
follows="left|top"

2
indra/newview/skins/default/xui/pl/menu_viewer.xml
View File

@ -55,7 +55,7 @@
<menu_item_check label="Zajęty lub Niedostępny" name="Do Not Disturb" />
<menu_item_check label="Autoodpowiedź" name="Set Autorespond"/>
<menu_item_check label="Autoodpowiedź dla nieznajomych" name="Set Autorespond to non-friends"/>
<menu_item_check label="Automatycznie odrzucaj propozycje teleportów" name="Automatically reject teleport requests"/>
<menu_item_check label="Automatycznie odrzucaj propozycje teleportów" name="Automatically reject teleport offers"/>
</menu>
<menu_item_call label="Znajomi" name="My Friends"/>
<menu_item_check label="Kontakty" name="Contacts"/>

2
indra/newview/skins/default/xui/pl/notifications.xml
View File

@ -1605,7 +1605,7 @@ Wiadomości przychodzące będą teraz otrzymywać skonfigurowaną wcześniej au
Wiadomości przychodzące od osób spoza listy znajomych będą teraz otrzymywać skonfigurowaną wcześniej automatyczną odpowiedź.
<usetemplate ignoretext="Status zmieniony na Tryb Autoodpowiedzi dla nieznajomych" name="okignore" yestext="OK"/>
</notification>
<notification name="RejectTeleportRequestsModeSet">
<notification name="RejectTeleportOffersModeSet">
Tryb odrzucania wszystkich propozycji teleportacji jest włączony.
Wszystkie nadchodzące propozycje teleportacji będą teraz otrzymywać skonfigurowaną wcześniej automatyczną odpowiedź. Nie będziesz dostawać żadnego powiadomienia o tym fakcie.
<usetemplate ignoretext="Status zmieniony na odrzucanie wszystkich propozycji teleportacji" name="okignore" yestext="OK"/>