From e5d643b16a7e33e44912f5bbd8d2e24599d73002 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 27 Feb 2014 13:32:08 +0100 Subject: [PATCH] Add RLV check for touch object in area search --- indra/newview/fsareasearch.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp index 189f5994ae..fac9533c32 100644 --- a/indra/newview/fsareasearch.cpp +++ b/indra/newview/fsareasearch.cpp @@ -59,6 +59,7 @@ #include "llagentcamera.h" // gAgentCamera #include "llviewerjoystick.h" // For disabling/re-enabling when requested to look at an object. #include "llmoveview.h" // For LLPanelStandStopFlying::clearStandStopFlyingMode +#include "rlvhandler.h" // max number of objects that can be (de-)selected in a single packet. const S32 MAX_OBJECTS_PER_PACKET = 255; @@ -1846,9 +1847,12 @@ void FSPanelAreaSearchList::touchObject(LLViewerObject* objectp) { // *NOTE: Hope the packets arrive safely and in order or else // there will be some problems. - LLPickInfo pick; // default constructor will set sane values. - send_ObjectGrab_message(objectp, pick, LLVector3::zero); - send_ObjectDeGrab_message(objectp, pick); + if (gRlvHandler.canTouch(objectp)) + { + LLPickInfo pick; // default constructor will set sane values. + send_ObjectGrab_message(objectp, pick, LLVector3::zero); + send_ObjectDeGrab_message(objectp, pick); + } } void FSPanelAreaSearchList::buyObject(FSObjectProperties& details, LLViewerObject* objectp)