summaryrefslogtreecommitdiff
path: root/indra/llinventory/llparcel.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-09-28 21:40:32 -0700
committerMerov Linden <merov@lindenlab.com>2014-09-28 21:40:32 -0700
commit4b80a5ed059d91bc37558db8ed664365e39d21d6 (patch)
tree55cfddc381448a72b54c03347deabada9687f629 /indra/llinventory/llparcel.cpp
parent896f48229e577b1bcf94f2cb80d73a6bf1a9330c (diff)
parent499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff)
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llinventory/llparcel.cpp')
-rwxr-xr-xindra/llinventory/llparcel.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index e400877b3b..b24e14c72b 100755
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -793,8 +793,6 @@ BOOL LLParcel::addToAccessList(const LLUUID& agent_id, S32 time)
}
}
- removeFromBanList(agent_id);
-
LLAccessEntry new_entry;
new_entry.mID = agent_id;
new_entry.mTime = time;
@@ -838,8 +836,6 @@ BOOL LLParcel::addToBanList(const LLUUID& agent_id, S32 time)
}
}
- removeFromAccessList(agent_id);
-
LLAccessEntry new_entry;
new_entry.mID = agent_id;
new_entry.mTime = time;