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

Moving money balance and mutelist data request deeper in startup chain. Apparent fix for FIRE-2483

master
Ansariel 2011-10-20 21:36:00 +02:00
parent 5d7e8e55d9
commit 080efd853c
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llstartup.cpp
View File

@ -1857,13 +1857,16 @@ bool idle_startup()
llinfos << " Landmark" << llendl;
LLLandmark::registerCallbacks(msg);
// request mute list
llinfos << "Requesting Mute List" << llendl;
LLMuteList::getInstance()->requestFromServer(gAgent.getID());
// Ansariel: Moved after inventory creation. Otherwise the responses
// from the money balance request and mutelist request
// seem to get lost under certain conditions
//// request mute list
//llinfos << "Requesting Mute List" << llendl;
//LLMuteList::getInstance()->requestFromServer(gAgent.getID());
// Get L$ and ownership credit information
llinfos << "Requesting Money Balance" << llendl;
LLStatusBar::sendMoneyBalanceRequest();
//// Get L$ and ownership credit information
//llinfos << "Requesting Money Balance" << llendl;
//LLStatusBar::sendMoneyBalanceRequest();
// request all group information
llinfos << "Requesting Agent Data" << llendl;
@ -1881,6 +1884,17 @@ bool idle_startup()
}
// [/RLVa:KB]
// Ansariel: Moved after inventory creation. Otherwise the responses
// from the money balance request and mutelist request
// seem to get lost under certain conditions
// request mute list
llinfos << "Requesting Mute List" << llendl;
LLMuteList::getInstance()->requestFromServer(gAgent.getID());
// Get L$ and ownership credit information
llinfos << "Requesting Money Balance" << llendl;
LLStatusBar::sendMoneyBalanceRequest();
LLStartUp::setStartupState( STATE_MISC );
return FALSE;
}