diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml index cab03f74f..949c66a93 100644 --- a/indra/newview/app_settings/settings_ascent.xml +++ b/indra/newview/app_settings/settings_ascent.xml @@ -145,7 +145,7 @@ Type Boolean Value - 1 + 0 AscentShowSelfTagColor diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 790ba6cec..60a6df143 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -54,16 +54,12 @@ #include "llworld.h" - #include "llsdutil.h" - #include "llaudioengine.h" - #include "llstartup.h" - -// #include "llviewermenu.h" -// + +#include "hippogridmanager.h" // [RLVa:KB] #include "rlvhandler.h" @@ -264,6 +260,16 @@ void LLFloaterAvatarList::createInstance(bool visible) sInstance->setVisible(FALSE); gSavedSettings.setBOOL("ShowRadar", FALSE); } + if(gHippoGridManager->getConnectedGrid()->isSecondLife()){ + LLScrollListCtrl* list = sInstance->getChild("avatar_list"); + list->getColumn(1)->setWidth(0); + list->getColumn(6)->setWidth(0); + list->getColumn(6)->mDynamicWidth = FALSE; + list->getColumn(6)->mRelWidth = 0; + list->getColumn(1)->mDynamicWidth = TRUE; + list->getColumn(1)->mRelWidth = -1; + list->updateLayout(); + } } //static void LLFloaterAvatarList::toggle(void*)