From 080efd853cba3efb4a52cd91aec3ba42ba9063cb Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 20 Oct 2011 21:36:00 +0200 Subject: [PATCH] Moving money balance and mutelist data request deeper in startup chain. Apparent fix for FIRE-2483 --- indra/newview/llstartup.cpp | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index c1e0c7bc7f..073c1759bf 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -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; }