diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-07-27 14:28:31 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-07-27 14:28:31 -0700 |
| commit | 0479e8d4ad1212b0028805cd4e39b6fe593b86c7 (patch) | |
| tree | 33fa0c507ee08446f49159bf57ca9533495e91bf /indra/llui | |
| parent | 3e038cd71b3f3bc74d206267e451773fb963d258 (diff) | |
Updating comments for merge conflicts after reviewing with Richard.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfolderviewitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index cd8d8bafbc..777e778bc0 100644 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -1495,7 +1495,7 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item) item->getViewModelItem()->dirtyFilter(); - // XXX stinson TODO : handle the creation date + // TODO RN - port creation date management to new code location #if 0 // Update the folder creation date if the child is newer than our current date setCreationDate(llmax<time_t>(mCreationDate, item->getCreationDate())); @@ -1506,7 +1506,7 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item) requestSort(); getViewModelItem()->addChild(item->getViewModelItem()); - // XXX stinson TODO : handle the creation date + // TODO RN - port creation date management to new code location #if 0 // Traverse parent folders and update creation date and resort, if necessary LLFolderViewFolder* parentp = getParentFolder(); |