diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-09-28 21:40:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-09-28 21:40:32 -0700 |
| commit | 4b80a5ed059d91bc37558db8ed664365e39d21d6 (patch) | |
| tree | 55cfddc381448a72b54c03347deabada9687f629 /indra/llinventory | |
| parent | 896f48229e577b1bcf94f2cb80d73a6bf1a9330c (diff) | |
| parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llinventory')
| -rwxr-xr-x | indra/llinventory/llfoldertype.cpp | 2 | ||||
| -rwxr-xr-x | indra/llinventory/llparcel.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp index 3dee87c5fa..86aca77de8 100755 --- a/indra/llinventory/llfoldertype.cpp +++ b/indra/llinventory/llfoldertype.cpp @@ -93,7 +93,7 @@ LLFolderDictionary::LLFolderDictionary() addEntry(LLFolderType::FT_MESH, new FolderEntry("mesh", TRUE)); addEntry(LLFolderType::FT_INBOX, new FolderEntry("inbox", TRUE)); - addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", FALSE)); + addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", TRUE)); addEntry(LLFolderType::FT_BASIC_ROOT, new FolderEntry("basic_rt", TRUE)); 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; |