Whoopsie, forgot to commit a trivial merge fix

This commit is contained in:
Siana Gearz
2012-03-29 02:03:46 +02:00
parent f05edda4f4
commit 4770e7724c

View File

@@ -349,7 +349,7 @@ BOOL LLFloaterAvatarList::postBuild()
gIdleCallbacks.addFunction(LLFloaterAvatarList::callbackIdle);
if(gHippoGridManager->getConnectedGrid()->isSecondLife()){
LLScrollListCtrl* list = sInstance->getChild<LLScrollListCtrl>("avatar_list");
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("avatar_list");
list->getColumn(1)->setWidth(0);
list->getColumn(6)->setWidth(0);
list->getColumn(6)->mDynamicWidth = FALSE;