livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating comments for merge conflicts after reviewing with Richard.

meow-7.2.2
Todd Stinson 2012-07-27 14:28:31 -07:00
parent 3e038cd71b
commit 0479e8d4ad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llfolderviewitem.cpp
View File

@ -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();

2
indra/newview/llimfloater.cpp
View File

@ -316,7 +316,7 @@ BOOL LLIMFloater::postBuild()
mInputEditor = getChild<LLChatEntry>("chat_editor");
mInputEditor->setMaxTextLength(1023);
// enable line history support for instant message bar
// XXX stinson TODO : resolve merge conflict
// XXX stinson TODO : resolve merge by adding autoreplace to text editors
#if 0
// *TODO Establish LineEditor with autoreplace callback
mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2));