Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLDropTarget::mEntityID=>LLDropTarget::mID

Browse Source
This commit is contained in:
Inusaito Sayori
2015-04-24 18:27:01 -04:00
parent b9a6fb8468
commit 9ce9a1f472
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lldroptarget.cpp
View File

@@ -253,8 +253,8 @@ void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, std::string& tooltip_msg)
{
if (mEntityID.notNull())
return getParent() ? LLToolDragAndDrop::handleGiveDragAndDrop(mEntityID, LLUUID::null, drop, cargo_type, cargo_data, accept) : false;
if (mID.notNull())
return getParent() ? LLToolDragAndDrop::handleGiveDragAndDrop(mID, LLUUID::null, drop, cargo_type, cargo_data, accept) : false;
if (LLViewerInventoryItem* inv_item = static_cast<LLViewerInventoryItem*>(cargo_data))
{

4
indra/newview/lldroptarget.h
View File

@@ -76,13 +76,13 @@ public:
void setChildRects(LLRect rect);
void fillParent(const LLView* parent);
void setEntityID(const LLUUID& id) { mEntityID = id;}
void setEntityID(const LLUUID& id) { mID = id;}
protected:
virtual void setItem(const class LLInventoryItem* item);
void setControlValue(const std::string& val);
LLUUID mEntityID;
LLUUID mID;
class LLViewBorder* mBorder;
LLControlVariable* mControl;
boost::signals2::scoped_connection mConnection;

2
indra/newview/llpanelgroupnotices.cpp
View File

@@ -124,7 +124,7 @@ BOOL LLGroupDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
{
BOOL handled = FALSE;
if (!gAgent.hasPowerInGroup(mEntityID,GP_NOTICES_SEND))
if (!gAgent.hasPowerInGroup(mID,GP_NOTICES_SEND))
{
*accept = ACCEPT_NO;
return TRUE;