diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2143e70a8b79a0968f97f1c03ffb6ced27109bcb..fcd4f3c2c798fa7cf617a665412670612812dbe8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -255,10 +255,21 @@
<key>Value</key>
<boolean>1</boolean>
</map>
+ <key>RLVaShowRedirectChatTyping</key>
+ <map>
+ <key>Comment</key>
+ <string>Sends typing start messages (and optionally plays the typing animation) when @redirchat restricted</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <boolean>0</boolean>
+ </map>
<key>RLVaSplitRedirectChat</key>
<map>
<key>Comment</key>
- <string>Splits long nearby chat lines across multiple messages when @redir* restricted.</string>
+ <string>Splits long nearby chat lines across multiple messages when @redir* restricted</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 9bfb64626be5f0832e6851c25a2f940770b17d15..89eb0520b3ab13d0e39b31b7934985f408b4ec6b 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -2016,6 +2016,13 @@ BOOL LLAgent::needsRenderHead()
//-----------------------------------------------------------------------------
void LLAgent::startTyping()
{
+// [RLVa:KB] - @redirchat
+ if (!RlvActions::canSendTypingStart())
+ {
+ return;
+ }
+// [/RLVa:KB]
+
mTypingTimer.reset();
if (getRenderState() & AGENT_STATE_TYPING)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3779900088733c9c080c1674c05fe7296f197387..e2af1d946d2730279ce48ef9cda3178be578f69f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -380,7 +380,10 @@ const std::string START_MARKER_FILE_NAME("SecondLife.start_marker");
const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker");
const std::string LLERROR_MARKER_FILE_NAME("SecondLife.llerror_marker");
const std::string LOGOUT_MARKER_FILE_NAME("SecondLife.logout_marker");
-static BOOL gDoDisconnect = FALSE;
+//static BOOL gDoDisconnect = FALSE;
+// [RLVa:KB] - Checked: RLVa-2.3
+BOOL gDoDisconnect = FALSE;
+// [/RLVa:KB]
static std::string gLaunchFileOnQuit;
// Used on Win32 for other apps to identify our window (eg, win_setup)
@@ -2894,7 +2897,7 @@ bool LLAppViewer::initConfiguration()
}
// [RLVa:KB] - Patch: RLVa-2.1.0
- if (LLControlVariable* pControl = gSavedSettings.getControl(RLV_SETTING_MAIN))
+ if (LLControlVariable* pControl = gSavedSettings.getControl(RlvSettingNames::Main))
{
if ( (pControl->getValue().asBoolean()) && (pControl->hasUnsavedValue()) )
{
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index e19f1bd15c5944848448e07b67a25d1d647f701d..501c6c119d283bc3903fe5da51cb13416b4dc3f4 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -479,11 +479,7 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
S32 length = raw_text.length();
-// if( (length > 0) && (raw_text[0] != '/') ) // forward slash is used for escape (eg. emote) sequences
-// [RLVa:KB] - Checked: 2010-03-26 (RLVa-1.2.0b) | Modified: RLVa-1.0.0d
- // RELEASE-RLVa: [SL-2.0.0] This entire class appears to be dead/non-functional?
- if ( (length > 0) && (raw_text[0] != '/') && (!RlvActions::hasBehaviour(RLV_BHVR_REDIRCHAT)) )
-// [/RLVa:KB]
+ if( (length > 0) && (raw_text[0] != '/') ) // forward slash is used for escape (eg. emote) sequences
{
gAgent.startTyping();
}
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index b0f6eb3806c3f0bfb6d4ca1e2ff05e9e305a0462..72b6058bf1236584f30b6b725aadc4134a6b80f2 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -66,6 +66,7 @@
#include "llviewercontrol.h"
#include "llviewerobjectlist.h"
// [RLVa:KB] - Checked: 2010-04-22 (RLVa-1.2.0f)
+#include "rlvactions.h"
#include "rlvcommon.h"
// [/RLVa:KB]
@@ -486,6 +487,12 @@ class LLChatHistoryHeader: public LLPanel
{
return canModerate(userdata);
}
+// [RLVa:KB] - @pay
+ else if (level == "can_pay")
+ {
+ return RlvActions::canPayAvatar(getAvatarId());
+ }
+// [/RLVa:KB]
else if (level == "can_ban_member")
{
return canBanGroupMember(getAvatarId());
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp
index 86e23e7c83c5e4af85c62856b6bf55448a138a82..45fd7b327fb67a9d009bb969eb0311ad68dfd52b 100644
--- a/indra/newview/llconversationloglist.cpp
+++ b/indra/newview/llconversationloglist.cpp
@@ -34,6 +34,9 @@
#include "llconversationloglistitem.h"
#include "llviewermenu.h"
#include "lltrans.h"
+// [RLVa:KB] - @pay
+#include "rlvactions.h"
+// [/RLVa:KB]
static LLDefaultChildRegistry::Register<LLConversationLogList> r("conversation_log_list");
@@ -387,6 +390,12 @@ bool LLConversationLogList::isActionEnabled(const LLSD& userdata)
{
return (is_p2p || is_group_member) && LLAvatarActions::canCall();
}
+// [RLVa:KB] - @pay
+ else if ("can_pay" == command_name)
+ {
+ return is_p2p && RlvActions::canPayAvatar(selected_id);
+ }
+// [/RLVa:KB]
else if ("add_rem_friend" == command_name ||
"can_invite_to_group" == command_name ||
"can_share" == command_name ||
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 21420b122b8ead0d1db60d868cef5b0b15d3b6c5..6ebb1dd7f295a9f7735c6b2ede72f2c3c893f527 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -55,6 +55,9 @@
#include "llworld.h"
#include "llsdserialize.h"
#include "llviewerobjectlist.h"
+// [RLVa:KB] - @pay
+#include "rlvactions.h"
+// [/RLVa:KB]
#include "boost/foreach.hpp"
//
@@ -1426,11 +1429,20 @@ bool LLFloaterIMContainer::enableContextMenuItem(const std::string& item, uuid_v
}
// Handle all other options
- if (("can_invite" == item) || ("can_chat_history" == item) || ("can_share" == item) || ("can_pay" == item))
+// if (("can_invite" == item) || ("can_chat_history" == item) || ("can_share" == item) || ("can_pay" == item))
+// [RLVa:KB] - @pay
+ if (("can_invite" == item) || ("can_chat_history" == item) || ("can_share" == item))
+// [/RLVa:KB]
{
// Those menu items are enable only if a single avatar is selected
return is_single_select;
}
+// [RLVa:KB] - @pay
+ else if ("can_pay" == item)
+ {
+ return is_single_select && RlvActions::canPayAvatar(single_id);
+ }
+// [/RLVa:KB]
else if ("can_block" == item)
{
return (is_single_select ? LLAvatarActions::canBlock(single_id) : false);
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 269172f282afe882eff6da4f76ec0654c72a1b67..655276af0bf3e40093efe8a7b2860b8fcd32e00a 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -476,10 +476,7 @@ void LLFloaterIMNearbyChat::onChatBoxKeystroke()
S32 length = raw_text.length();
-// if( (length > 0) && (raw_text[0] != '/') ) // forward slash is used for escape (eg. emote) sequences
-// [RLVa:KB] - Checked: 2010-03-26 (RLVa-1.2.0b) | Modified: RLVa-1.0.0d
- if ( (length > 0) && (raw_text[0] != '/') && (!RlvActions::hasBehaviour(RLV_BHVR_REDIRCHAT)) )
-// [/RLVa:KB]
+ if( (length > 0) && (raw_text[0] != '/') ) // forward slash is used for escape (eg. emote) sequences
{
gAgent.startTyping();
}
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index f3c693a29aa384ea57444076a9bcd2a3897ce7e5..c615a36299303597816d7c5cbf80d7dae892c669 100644
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -254,6 +254,12 @@ bool PeopleContextMenu::enableContextMenuItem(const LLSD& userdata)
{
return LLLogChat::isTranscriptExist(mUUIDs.front());
}
+// [RLVa:KB] - @pay
+ else if (item == std::string("can_pay"))
+ {
+ return RlvActions::canPayAvatar(mUUIDs.front());
+ }
+// [/RLVa:KB]
else if (item == std::string("can_im") || item == std::string("can_invite") ||
item == std::string("can_share") || item == std::string("can_pay"))
{
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 20bf2f7da595b60d9d07c2e407bd4af2ce2b7c1b..3bc8a21cc23ce87f006b4a7395f911b8a72d8297 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -294,14 +294,39 @@ BOOL LLToolPie::handleLeftClickPick()
}
// [/RLVa:KB]
+// [RLVa:KB] - @buy
+ const std::function<bool(const LLUUID&, U8)> fnRlvCheck = [](const LLUUID& idObj, U8 clickAction) {
+ switch (clickAction)
+ {
+ case CLICK_ACTION_BUY:
+ return RlvActions::canBuyObject(idObj);
+ case CLICK_ACTION_PAY:
+ return RlvActions::canPayObject(idObj);
+ default:
+ return true;
+ }
+ };
+// [/RLVa:KB]
mClickAction = 0;
if (object && object->getClickAction())
{
mClickAction = object->getClickAction();
+// [RLVa:KB] - @buy
+ if ( (RlvActions::isRlvEnabled()) && (!fnRlvCheck(object->getID(), mClickAction)) )
+ {
+ mClickAction = CLICK_ACTION_NONE;
+ }
+// [/RLVa:KB]
}
else if (parent && parent->getClickAction())
{
mClickAction = parent->getClickAction();
+// [RLVa:KB] - @buy
+ if ((RlvActions::isRlvEnabled()) && (!fnRlvCheck(parent->getID(), mClickAction)))
+ {
+ mClickAction = CLICK_ACTION_NONE;
+ }
+// [/RLVa:KB]
}
switch(mClickAction)
@@ -541,7 +566,12 @@ ECursorType LLToolPie::cursorFromObject(LLViewerObject* object)
LLSelectNode* node = LLSelectMgr::getInstance()->getHoverNode();
if (!node || node->mSaleInfo.isForSale())
{
- cursor = UI_CURSOR_TOOLBUY;
+// [RLVa:KB] - @buy
+ cursor = (!object || RlvActions::canBuyObject(parent ? parent->getID() : object->getID()))
+ ? UI_CURSOR_TOOLBUY
+ : ((object && object->flagHandleTouch()) || (parent && parent->flagHandleTouch())) ? UI_CURSOR_HAND : UI_CURSOR_ARROW;
+// [/RLVa:KB]
+// cursor = UI_CURSOR_TOOLBUY;
}
}
break;
@@ -558,7 +588,12 @@ ECursorType LLToolPie::cursorFromObject(LLViewerObject* object)
if ((object && object->flagTakesMoney())
|| (parent && parent->flagTakesMoney()))
{
- cursor = UI_CURSOR_TOOLBUY;
+// [RLVa:KB] - @buy
+ cursor = ((object && RlvActions::canPayObject(object->getID())) || (parent && RlvActions::canPayObject(parent->getID())))
+ ? UI_CURSOR_TOOLBUY
+ : ((object && object->flagHandleTouch()) || (parent && parent->flagHandleTouch())) ? UI_CURSOR_HAND : UI_CURSOR_ARROW;
+// [/RLVa:KB]
+// cursor = UI_CURSOR_TOOLBUY;
}
}
break;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8a934241a387e8876d2433eb8b48193e6a38b1fc..77033d61f81a8bbc87ce9e36d037cfbe5f6341ad 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3650,6 +3650,11 @@ bool enable_buy_object()
if( for_sale_selection(node) )
{
+// [RLVa:KB] - @buy
+ if (!RlvActions::canBuyObject(obj->getID()))
+ return false;
+// [/RLVa:KB]
+
// *NOTE: Is this needed? This checks to see if anyone owns the
// object, dating back to when we had "public" objects owned by
// no one. JC
@@ -5129,6 +5134,11 @@ BOOL is_selection_buy_not_take()
LLViewerObject* obj = node->getObject();
if(obj && !(obj->permYouOwner()) && (node->mSaleInfo.isForSale()))
{
+// [RLVa:KB] - @buy
+ if (!RlvActions::canBuyObject(obj->getID()))
+ continue;
+// [/RLVa:KB]
+
// you do not own the object and it is for sale, thus,
// it's a buy
return TRUE;
@@ -6424,8 +6434,8 @@ bool enable_pay_avatar()
LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
LLVOAvatar* avatar = find_avatar_from_object(obj);
// return (avatar != NULL);
-// [RLVa:KB] - Checked: RLVa-1.2.1
- return (avatar != NULL) && (RlvActions::canShowName(RlvActions::SNC_DEFAULT, avatar->getID()));
+// [RLVa:KB] - @shownames and @pay
+ return (avatar != NULL) && (RlvActions::canShowName(RlvActions::SNC_DEFAULT, avatar->getID())) && (RlvActions::canPayAvatar(avatar->getID()));
// [/RLVa:KB]
}
@@ -6437,7 +6447,10 @@ bool enable_pay_object()
LLViewerObject *parent = (LLViewerObject *)object->getParent();
if((object->flagTakesMoney()) || (parent && parent->flagTakesMoney()))
{
- return true;
+// [RLVa:KB] - @buy
+ return RlvActions::canBuyObject(object->getID());
+// [/RLVa:KB]
+// return true;
}
}
return false;
diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index 1728717ccef36697f4f2aaf6671f2370ef8d7110..2b2753dee7df4cff324930cd013c29ca0593d35e 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -188,6 +188,15 @@ bool RlvActions::canSendIM(const LLUUID& idRecipient)
( (!gRlvHandler.hasBehaviour(RLV_BHVR_SENDIMTO)) || (!gRlvHandler.isException(RLV_BHVR_SENDIMTO, idRecipient)) ) );
}
+// Handles: @redirchat
+bool RlvActions::canSendTypingStart()
+{
+ // The CHAT_TYPE_START indicator can be sent if:
+ // - nearby chat isn't being redirected
+ // - the user specifically indicated that they want to show typing under @redirchat
+ return !RlvHandler::instance().hasBehaviour(RLV_BHVR_REDIRCHAT) || gSavedSettings.get<bool>(RLV_SETTING_SHOWREDIRECTCHATTYPING);
+}
+
bool RlvActions::canStartIM(const LLUUID& idRecipient, bool fIgnoreOpen)
{
// User can start an IM session with "recipient" (could be an agent or a group) if:
@@ -376,6 +385,14 @@ bool RlvActions::canBuild()
(!gRlvHandler.hasBehaviour(RLV_BHVR_REZ));
}
+// Handles: @buy
+bool RlvActions::canBuyObject(const LLUUID& idObj)
+{
+ // User can buy an object set for sale if:
+ // - not restricted from buying objects
+ return (!RlvHandler::instance().hasBehaviour(RLV_BHVR_BUY));
+}
+
// Handles: @edit and @editobj
bool RlvActions::canEdit(const LLViewerObject* pObj)
{
@@ -406,6 +423,22 @@ bool RlvActions::canInteract(const LLViewerObject* pObj, const LLVector3& posOff
( (!rlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) || (pObj->isHUDAttachment()) || (dist_vec_squared(gAgent.getPositionGlobal(), pObj->getPositionGlobal() + LLVector3d(posOffset)) <= s_nFartouchDist * s_nFartouchDist)) );
}
+// Handles: @pay
+bool RlvActions::canPayAvatar(const LLUUID& idAvatar)
+{
+ // User can pay an avatar if:
+ // - not restricted from paying avatars
+ return (!RlvHandler::instance().hasBehaviour(RLV_BHVR_PAY));
+}
+
+// Handles: @buy
+bool RlvActions::canPayObject(const LLUUID& idObj)
+{
+ // User can pay an object/vendor if:
+ // - not restricted from buying objects
+ return (!RlvHandler::instance().hasBehaviour(RLV_BHVR_BUY));
+}
+
bool RlvActions::canRez()
{
return (!gRlvHandler.hasBehaviour(RLV_BHVR_REZ));
diff --git a/indra/newview/rlvactions.h b/indra/newview/rlvactions.h
index 81d8e1fc425863bc175fc73599d3b2a5b4ce6fe7..fb2e14f7aafabff85044fae8f0e84831ff17055e 100644
--- a/indra/newview/rlvactions.h
+++ b/indra/newview/rlvactions.h
@@ -108,6 +108,11 @@ class RlvActions
*/
static bool canSendIM(const LLUUID& idRecipient);
+ /*
+ * Returns true if the viewer can inform the region about the user's (nearby chat) typing
+ */
+ static bool canSendTypingStart();
+
/*
* Returns true if the user is allowed to start a - P2P or group - conversation with the specified UUID (or if the session already exists, unless 'ignore open' is specified)
*/
@@ -233,6 +238,11 @@ class RlvActions
*/
static bool canBuild();
+ /*
+ * Returns true if the user can buy an object set for sale
+ */
+ static bool canBuyObject(const LLUUID& idObj);
+
/*
* Returns true if the user can edit the specified object (with an optional relative offset)
*/
@@ -249,6 +259,16 @@ class RlvActions
*/
static bool canInteract(const LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero);
+ /*
+ * Returns true if the user can pay an avatar
+ */
+ static bool canPayAvatar(const LLUUID& idAvatar);
+
+ /*
+ * Returns true if the user can pay an object (i.e. vendor)
+ */
+ static bool canPayObject(const LLUUID& idObj);
+
/*
* Returns true if the user can rez new objects (from inventory or through the create tool)
*/
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 37a7fbea0cce1021f8029bfe8c2b7912ab0dcfe3..023e35f53dadecbdc3d3d62dc6039b37fdd6957f 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -136,7 +136,7 @@ void RlvSettings::initClass()
// Checked: 2010-04-01 (RLVa-1.2.0c) | Modified: RLVa-0.2.1d
void RlvSettings::updateLoginLastLocation()
{
- if ( (!LLApp::isQuitting()) && (gSavedPerAccountSettings.controlExists(RlvSettingNames::LoginLastLocation)) )
+ if ( (!LLApp::isExiting()) && (gSavedPerAccountSettings.controlExists(RlvSettingNames::LoginLastLocation)) )
{
bool fValue = (gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)) || (!RlvActions::canStand());
if (gSavedPerAccountSettings.get<bool>(RlvSettingNames::LoginLastLocation) != fValue)
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index bf1a0e08354c6b10d48b2b73cb3fe8f173aed3c7..ca3180d5c18ccad603422bcf7ac4e4016a44a27e 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -154,8 +154,10 @@ enum ERlvBehaviour {
RLV_BHVR_ACCEPTTP, // "accepttp"
RLV_BHVR_ACCEPTTPREQUEST, // "accepttprequest"
RLV_BHVR_ALLOWIDLE, // "allowidle"
+ RLV_BHVR_BUY, // "buy"
RLV_BHVR_EDIT, // "edit"
RLV_BHVR_EDITOBJ, // "editobj"
+ RLV_BHVR_PAY, // "pay"
RLV_BHVR_REZ, // "rez"
RLV_BHVR_FARTOUCH, // "fartouch"
RLV_BHVR_INTERACT, // "interact"
@@ -388,6 +390,7 @@ namespace RlvSettingNames
/*inline*/ constexpr boost::string_view LoginLastLocation = make_string_view("RLVaLoginLastLocation");
/*inline*/ constexpr boost::string_view SharedInvAutoRename = make_string_view("RLVaSharedInvAutoRename");
/*inline*/ constexpr boost::string_view ShowAssertionFail = make_string_view("RLVaShowAssertionFailures");
+ /*inline*/ constexpr boost::string_view ShowRedirectChatTyping = make_string_view("RLVaShowRedirectChatTyping");
/*inline*/ constexpr boost::string_view SplitRedirectChat = make_string_view("RLVaSplitRedirectChat");
/*inline*/ constexpr boost::string_view TopLevelMenu = make_string_view("RLVaTopLevelMenu");
/*inline*/ constexpr boost::string_view WearReplaceUnlocked = make_string_view("RLVaWearReplaceUnlocked");
@@ -412,6 +415,7 @@ namespace RlvSettingNames
constexpr const char LoginLastLocation[] = "RLVaLoginLastLocation";
constexpr const char SharedInvAutoRename[] = "RLVaSharedInvAutoRename";
constexpr const char ShowAssertionFail[] = "RLVaShowAssertionFailures";
+ constexpr const char ShowRedirectChatTyping[] = "RLVaShowRedirectChatTyping";
constexpr const char SplitRedirectChat[] = "RLVaSplitRedirectChat";
constexpr const char TopLevelMenu[] = "RLVaTopLevelMenu";
constexpr const char WearReplaceUnlocked[] = "RLVaWearReplaceUnlocked";
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index fa73b1d527839751ca8f1cf6a01221357add0c60..6b462d01df6c4e8e219a7f5e0df9d62d420df25f 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -70,6 +70,9 @@
// Boost includes
#include <boost/algorithm/string.hpp>
+// llappviewer.cpp
+extern BOOL gDoDisconnect;
+
// ============================================================================
// Static variable initialization
//
@@ -158,7 +161,7 @@ void RlvHandler::cleanup()
//
// Clean up any restrictions that are still active
//
- RLV_ASSERT(LLApp::isQuitting()); // Several commands toggle debug settings but won't if they know the viewer is quitting
+ RLV_ASSERT(LLApp::isExiting() || gDoDisconnect); // Several commands toggle debug settings but won't if they know the viewer is quitting
// Assume we have no way to predict how m_Objects will change so make a copy ahead of time
uuid_vec_t idRlvObjects;
@@ -502,6 +505,11 @@ ERlvCmdRet RlvHandler::processCommand(std::reference_wrapper<const RlvCommand> r
{
RlvCommand rlvCmdRem(rlvCmd, RLV_TYPE_REMOVE);
itObj->second.removeCommand(rlvCmdRem);
+ if (itObj->second.m_Commands.empty())
+ {
+ RLV_DEBUGS << "\t- command list empty => removing " << idCurObj << RLV_ENDL;
+ m_Objects.erase(itObj);
+ }
}
// notifyBehaviourObservers(rlvCmd, !fFromObj);
}
@@ -1856,6 +1864,25 @@ ERlvCmdRet RlvBehaviourAddRemAttachHandler::onCommand(const RlvCommand& rlvCmd,
return RLV_RET_SUCCESS;
}
+// Handles: @buy=n|y toggles
+template<> template<>
+void RlvBehaviourToggleHandler<RLV_BHVR_BUY>::onCommandToggle(ERlvBehaviour eBhvr, bool fHasBhvr)
+{
+ // Start or stop filtering opening the buy, buy contents and pay object floaters
+ if (fHasBhvr)
+ {
+ RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("buy_object", std::string(RLV_STRING_BLOCKED_GENERIC)));
+ RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("buy_object_contents", std::string(RLV_STRING_BLOCKED_GENERIC)));
+ RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("pay_object", std::string(RLV_STRING_BLOCKED_GENERIC)));
+ }
+ else
+ {
+ RLV_VERIFY(RlvUIEnabler::instance().removeGenericFloaterFilter("buy_object"));
+ RLV_VERIFY(RlvUIEnabler::instance().removeGenericFloaterFilter("buy_object_contents"));
+ RLV_VERIFY(RlvUIEnabler::instance().removeGenericFloaterFilter("pay_object"));
+ }
+}
+
// Handles: @detach[:<attachpt>]=n|y
template<> template<>
ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_DETACH>::onCommand(const RlvCommand& rlvCmd, bool& fRefCount)
@@ -1989,9 +2016,28 @@ void RlvBehaviourToggleHandler<RLV_BHVR_EDIT>::onCommandToggle(ERlvBehaviour eBh
// Start or stop filtering opening the beacons floater
if (fHasBhvr)
- RlvUIEnabler::instance().addGenericFloaterFilter("beacons");
+ {
+ RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("beacons"));
+ }
else
- RlvUIEnabler::instance().removeGenericFloaterFilter("beacons");
+ {
+ RLV_VERIFY(RlvUIEnabler::instance().removeGenericFloaterFilter("beacons"));
+ }
+}
+
+// Handles: @pay=n|y toggles
+template<> template<>
+void RlvBehaviourToggleHandler<RLV_BHVR_PAY>::onCommandToggle(ERlvBehaviour eBhvr, bool fHasBhvr)
+{
+ // Start or stop filtering opening the pay avatar floater
+ if (fHasBhvr)
+ {
+ RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("pay_resident"));
+ }
+ else
+ {
+ RLV_VERIFY(RlvUIEnabler::instance().removeGenericFloaterFilter("pay_resident"));
+ }
}
// Handles: @setoverlay=n|y toggles
@@ -2333,11 +2379,11 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SETENV>::onCommandToggle(ERlvBehaviour e
LLFloaterReg::const_instance_list_t envFloaters = LLFloaterReg::getFloaterList(strEnvFloaters[idxFloater]);
for (LLFloater* pFloater : envFloaters)
pFloater->closeFloater();
- RlvUIEnabler::instance().addGenericFloaterFilter(strEnvFloaters[idxFloater]);
+ RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter(strEnvFloaters[idxFloater]));
}
else
{
- RlvUIEnabler::instance().removeGenericFloaterFilter(strEnvFloaters[idxFloater]);
+ RLV_VERIFY(RlvUIEnabler::instance().removeGenericFloaterFilter(strEnvFloaters[idxFloater]));
}
}
@@ -2390,7 +2436,7 @@ ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SHOWHOVERTEXT>::onCommand(const RlvComma
template<> template<>
void RlvBehaviourToggleHandler<RLV_BHVR_SHOWINV>::onCommandToggle(ERlvBehaviour eBhvr, bool fHasBhvr)
{
- if (LLApp::isQuitting())
+ if (LLApp::isExiting())
return; // Nothing to do if the viewer is shutting down
//
@@ -2436,16 +2482,20 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SHOWINV>::onCommandToggle(ERlvBehaviour
// Filter (or stop filtering) opening new inventory floaters
//
if (fHasBhvr)
- RlvUIEnabler::instance().addGenericFloaterFilter("inventory");
+ {
+ RLV_VERIFY(RlvUIEnabler::instance().addGenericFloaterFilter("inventory"));
+ }
else
- RlvUIEnabler::instance().removeGenericFloaterFilter("inventory");
+ {
+ RLV_VERIFY(RlvUIEnabler::instance().removeGenericFloaterFilter("inventory"));
+ }
}
// Handles: @shownames[:<uuid>]=n|y toggles
template<> template<>
void RlvBehaviourToggleHandler<RLV_BHVR_SHOWNAMES>::onCommandToggle(ERlvBehaviour eBhvr, bool fHasBhvr)
{
- if (LLApp::isQuitting())
+ if (LLApp::isExiting())
return; // Nothing to do if the viewer is shutting down
// Update the shownames context
@@ -2482,7 +2532,7 @@ template<> template<>
ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SHOWNAMES>::onCommand(const RlvCommand& rlvCmd, bool& fRefCount)
{
ERlvCmdRet eRet = RlvBehaviourGenericHandler<RLV_OPTION_NONE_OR_EXCEPTION>::onCommand(rlvCmd, fRefCount);
- if ( (RLV_RET_SUCCESS == eRet) && (rlvCmd.hasOption()) && (!LLApp::isQuitting()) )
+ if ( (RLV_RET_SUCCESS == eRet) && (rlvCmd.hasOption()) && (!LLApp::isExiting()) )
{
const LLUUID idAgent = RlvCommandOptionHelper::parseOption<LLUUID>(rlvCmd.getOption());
@@ -2507,7 +2557,7 @@ ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SHOWNAMES>::onCommand(const RlvCommand&
template<> template<>
void RlvBehaviourToggleHandler<RLV_BHVR_SHOWNAMETAGS>::onCommandToggle(ERlvBehaviour eBhvr, bool fHasBhvr)
{
- if (LLApp::isQuitting())
+ if (LLApp::isExiting())
return; // Nothing to do if the viewer is shutting down
// Update the shownames context
@@ -2531,7 +2581,7 @@ ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SHOWNAMETAGS>::onCommand(const RlvComman
template<> template<>
void RlvBehaviourToggleHandler<RLV_BHVR_SHOWNEARBY>::onCommandToggle(ERlvBehaviour eBhvr, bool fHasBhvr)
{
- if (LLApp::isQuitting())
+ if (LLApp::isExiting())
return; // Nothing to do if the viewer is shutting down
// Refresh the nearby people list
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 3f4c2f3e505a947f7b1ea1d0d78d010e1e70c08e..e28f13661ba31fa217b90fceda466e522259e5bd 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -1,6 +1,6 @@
/**
*
- * Copyright (c) 2009-2016, Kitty Barnett
+ * Copyright (c) 2009-2020, Kitty Barnett
*
* The source code in this file is provided to you under the terms of the
* GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
@@ -89,6 +89,7 @@ RlvBehaviourDictionary::RlvBehaviourDictionary()
addEntry(new RlvBehaviourInfo("attachallthis", RLV_BHVR_ATTACHTHIS, RLV_TYPE_ADDREM, RlvBehaviourInfo::FORCEWEAR_SUBTREE));
addEntry(new RlvBehaviourInfo("attachthis_except", RLV_BHVR_ATTACHTHISEXCEPT, RLV_TYPE_ADDREM, RlvBehaviourInfo::FORCEWEAR_NODE));
addEntry(new RlvBehaviourInfo("attachallthis_except", RLV_BHVR_ATTACHTHISEXCEPT, RLV_TYPE_ADDREM, RlvBehaviourInfo::FORCEWEAR_SUBTREE));
+ addEntry(new RlvBehaviourGenericToggleProcessor<RLV_BHVR_BUY, RLV_OPTION_NONE>("buy"));
addEntry(new RlvBehaviourGenericProcessor<RLV_OPTION_NONE>("chatwhisper", RLV_BHVR_CHATWHISPER));
addEntry(new RlvBehaviourGenericProcessor<RLV_OPTION_NONE>("chatnormal", RLV_BHVR_CHATNORMAL));
addEntry(new RlvBehaviourGenericProcessor<RLV_OPTION_NONE>("chatshout", RLV_BHVR_CHATSHOUT));
@@ -106,6 +107,7 @@ RlvBehaviourDictionary::RlvBehaviourDictionary()
addEntry(new RlvBehaviourGenericProcessor<RLV_OPTION_NONE>("interact", RLV_BHVR_INTERACT, RlvBehaviourInfo::BHVR_EXTENDED));
addEntry(new RlvBehaviourGenericProcessor<RLV_OPTION_NONE>("jump", RLV_BHVR_JUMP));
addEntry(new RlvBehaviourInfo("notify", RLV_BHVR_NOTIFY, RLV_TYPE_ADDREM));
+ addEntry(new RlvBehaviourGenericToggleProcessor<RLV_BHVR_PAY, RLV_OPTION_NONE>("pay"));
addEntry(new RlvBehaviourGenericProcessor<RLV_OPTION_NONE>("permissive", RLV_BHVR_PERMISSIVE));
addEntry(new RlvBehaviourGenericProcessor<RLV_OPTION_NONE_OR_EXCEPTION>("recvchat", RLV_BHVR_RECVCHAT, RlvBehaviourInfo::BHVR_STRICT));
addEntry(new RlvBehaviourGenericProcessor<RLV_OPTION_EXCEPTION>("recvchatfrom", RLV_BHVR_RECVCHATFROM, RlvBehaviourInfo::BHVR_STRICT));
diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index cd6e5831ce72e71df7c6032578164c4ccd579ba7..62ddf89189c4e4d8e8ae2a4d305f76d2ecd8d4c5 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -77,7 +77,7 @@ RlvUIEnabler::RlvUIEnabler()
// Checked: 2010-02-28 (RLVa-1.4.0a) | Added: RLVa-1.2.0a
void RlvUIEnabler::onBehaviourToggle(ERlvBehaviour eBhvr, ERlvParamType eType)
{
- bool fQuitting = LLApp::isQuitting();
+ bool fQuitting = LLApp::isExiting();
for (behaviour_handler_map_t::const_iterator itHandler = m_Handlers.lower_bound(eBhvr), endHandler = m_Handlers.upper_bound(eBhvr);
itHandler != endHandler; ++itHandler)
{
@@ -182,9 +182,13 @@ void RlvUIEnabler::onToggleShowMinimap()
// Start or stop filtering showing the mini-map floater
if (!fEnable)
- addGenericFloaterFilter("mini_map");
+ {
+ RLV_VERIFY(addGenericFloaterFilter("mini_map"));
+ }
else
- removeGenericFloaterFilter("mini_map");
+ {
+ RLV_VERIFY(removeGenericFloaterFilter("mini_map"));
+ }
// Hide the mini-map floater if it's currently visible (or restore it if it was previously visible)
static bool fPrevVisibile = false;
@@ -217,9 +221,13 @@ void RlvUIEnabler::onToggleShowWorldMap()
// Start or stop filtering opening the world map
if (!fEnable)
- addGenericFloaterFilter("world_map");
+ {
+ RLV_VERIFY(addGenericFloaterFilter("world_map"));
+ }
else
- removeGenericFloaterFilter("world_map");
+ {
+ RLV_VERIFY(removeGenericFloaterFilter("world_map"));
+ }
}
// Checked: 2010-08-22 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
@@ -271,31 +279,53 @@ void RlvUIEnabler::onUpdateLoginLastLocation(bool fQuitting)
// ============================================================================
-// Checked: 2010-02-28 (RLVa-1.4.0a) | Added: RLVa-1.2.0a
-void RlvUIEnabler::addGenericFloaterFilter(const std::string& strFloaterName)
+bool RlvUIEnabler::addGenericFloaterFilter(const std::string& strFloaterName, const std::string& strRlvNotification)
{
- m_FilteredFloaters.insert(strFloaterName);
+ return addGenericFloaterFilter(strFloaterName, [strRlvNotification]() { RlvUtil::notifyBlocked(strRlvNotification); });
+}
+
+bool RlvUIEnabler::addGenericFloaterFilter(const std::string& strFloaterName, const std::function<void()>& fn)
+{
+ // NOTE: we don't currently support multiple filters for the same floater (due to the need to remove the correct one at the end of it all)
+ if (m_FilteredFloaterMap.end() != m_FilteredFloaterMap.find(strFloaterName))
+ return false;
+
+ m_FilteredFloaterMap.insert(std::make_pair(strFloaterName, fn));
if (!m_ConnFloaterGeneric.connected())
+ {
m_ConnFloaterGeneric = LLFloaterReg::setValidateCallback(boost::bind(&RlvUIEnabler::filterFloaterGeneric, this, _1, _2));
+ }
+
+ return true;
}
-// Checked: 2010-02-28 (RLVa-1.4.0a) | Added: RLVa-1.2.0a
-void RlvUIEnabler::removeGenericFloaterFilter(const std::string& strFloaterName)
+bool RlvUIEnabler::removeGenericFloaterFilter(const std::string& strFloaterName)
{
- std::multiset<std::string>::iterator itFloater = m_FilteredFloaters.find(strFloaterName);
- RLV_ASSERT_DBG(itFloater != m_FilteredFloaters.end());
- m_FilteredFloaters.erase(itFloater);
+ auto itFloater = m_FilteredFloaterMap.find(strFloaterName);
+ if (itFloater != m_FilteredFloaterMap.end())
+ return false;
+
+ m_FilteredFloaterMap.erase(itFloater);
RLV_ASSERT_DBG(m_ConnFloaterGeneric.connected());
- if (m_FilteredFloaters.empty())
+ if (m_FilteredFloaterMap.empty())
m_ConnFloaterGeneric.disconnect();
+
+ return true;
}
-// Checked: 2010-02-28 (RLVa-1.4.0a) | Added: RLVa-1.2.0a
-bool RlvUIEnabler::filterFloaterGeneric(const std::string& strName, const LLSD&)
+bool RlvUIEnabler::filterFloaterGeneric(const std::string& strFloaterName, const LLSD&)
{
- return m_FilteredFloaters.end() == m_FilteredFloaters.find(strName);
+ auto itFloater = m_FilteredFloaterMap.find(strFloaterName);
+ if (m_FilteredFloaterMap.end() != itFloater)
+ {
+ if (itFloater->second)
+ itFloater->second();
+ return false;
+ }
+ return true;
+
}
// Checked: 2010-04-22 (RLVa-1.4.5) | Added: RLVa-1.2.0
diff --git a/indra/newview/rlvui.h b/indra/newview/rlvui.h
index c6f945a2c5a60e04f60fab94571e71f599bae389..c53a9ab190835bca18aad8a806dc860388238ffb 100644
--- a/indra/newview/rlvui.h
+++ b/indra/newview/rlvui.h
@@ -55,8 +55,9 @@ class RlvUIEnabler : public LLSingleton<RlvUIEnabler>
* Floater and sidebar validation callbacks
*/
public:
- void addGenericFloaterFilter(const std::string& strFloaterName);
- void removeGenericFloaterFilter(const std::string& strFloaterName);
+ bool addGenericFloaterFilter(const std::string& strFloaterName, const std::string& strRlvNotification);
+ bool addGenericFloaterFilter(const std::string& strFloaterName, const std::function<void()>& fn = nullptr);
+ bool removeGenericFloaterFilter(const std::string& strFloaterName);
protected:
bool filterFloaterGeneric(const std::string&, const LLSD&);
@@ -86,7 +87,7 @@ class RlvUIEnabler : public LLSingleton<RlvUIEnabler>
typedef std::multimap<ERlvBehaviour, behaviour_handler_t> behaviour_handler_map_t;
behaviour_handler_map_t m_Handlers;
- std::multiset<std::string> m_FilteredFloaters;
+ std::map<std::string, std::function<void()>> m_FilteredFloaterMap;
};
// ============================================================================
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 05ab4d35a0de1db0a1558565da38473b3c3f9ca3..597f480e833137c872c5d32e6cec9acc14c5f2d6 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -95,6 +95,7 @@
layout="topleft"
name="Pay">
<on_click function="AvatarIcon.Action" parameter="pay" />
+ <on_enable function="AvatarIcon.Enable" parameter="can_pay" />
</menu_item_call>
<menu_item_check
label="Block Voice"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2d3ea2926bcf6b1d20e09cc6c64b87fb0e92fd67..75390286d7c38d4080015be33a640332e03b63b0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1656,6 +1656,16 @@ function="World.EnvPreset"
function="ToggleControl"
parameter="RestrainedLoveShowEllipsis" />
</menu_item_check>
+ <menu_item_check
+ label="Show Redirected Chat Typing"
+ name="Show Redirected Chat Typing">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="RLVaShowRedirectChatTyping" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="RLVaShowRedirectChatTyping" />
+ </menu_item_check>
<menu_item_check
label="Split Long Redirected Chat"
name="Split Long Redirected Chat">