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

Add RLV check for touch object in area search

master
Ansariel 2014-02-27 13:32:08 +01:00
parent 4ed2fa33bc
commit e5d643b16a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/fsareasearch.cpp
View File

@ -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)