diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
| commit | 383edf8015743becc37650ab018a112b9ff347b1 (patch) | |
| tree | 1e9a33f1517c6fff3416f5426de525628f1d29c2 /indra/llinventory | |
| parent | d56958e68934e673195ec2966e0a3c20dac7fb41 (diff) | |
| parent | 06b605b8666f2336e77126f8ff47765115c08a27 (diff) | |
merge changes for MAINT-4356
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 5f8aaae20b..23bf6da1f9 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; |