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

FIRE-8560: Friends List in People Panel Fails to Load

meow-7.2.2
Ansariel 2012-12-22 01:15:47 +01:00
parent 21f13e8b87
commit 5c79512231
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llstartup.cpp
View File

@ -229,7 +229,7 @@
#include "fswsassetblacklist.h" // <FS:WS> For Assetblacklist init on startup
#include "fsfloatersearchlegacy.h" // <FS:CR> FIRE-6310
#include "llfloatersidepanelcontainer.h"
//
@ -1673,6 +1673,13 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
llinfos << "Constructed " << pContacts->getTitle() << llendl;
// </FS:ND>
// <FS:Ansariel> FIRE-8560/FIRE-8592: We neet to create the instance of the people
// floater for the radar functions and the V2 friendlist here.
// This is because of the standalone group panels that will
// prevent doing this at login when receiving the agent group
// data update.
LLFloaterSidePanelContainer::getPanel("people", "panel_people");
//gCacheName is required for nearby chat history loading
//so I just moved nearby history loading a few states further
if (gSavedPerAccountSettings.getBOOL("LogShowHistory"))
@ -2421,12 +2428,6 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
set_startup_status(1.0, "", "");
display_startup();
// <FS:Ansariel> FIRE-8592: We neet to create the instance of the people
// floater for the radar functions here. This is because
// of the standalone group panels that will prevent doing
// this at login when receiving the agent group data update.
LLFloaterReg::getInstance("people");
// <FS:AW Disable LSL bridge on opensim>
#ifdef HAS_OPENSIM_SUPPORT // <FS:AW optional opensim support/>
if (LLGridManager::getInstance()->isInOpenSim())