diff --git a/indra/newview/lldroptarget.cpp b/indra/newview/lldroptarget.cpp
index f41d0681a..6354ae522 100644
--- a/indra/newview/lldroptarget.cpp
+++ b/indra/newview/lldroptarget.cpp
@@ -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))
 	{
diff --git a/indra/newview/lldroptarget.h b/indra/newview/lldroptarget.h
index 69d9a6998..56b0a817d 100644
--- a/indra/newview/lldroptarget.h
+++ b/indra/newview/lldroptarget.h
@@ -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;
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index e6bfd0251..31d9ea516 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -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;