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

FIRE-2323 / FIRE-5966: Added some debugging code and moved AgentDataUpdateRequest in startup sequence before inventory (maybe response gets lost same as what happened with mutelist and money balance request earlier)

Ansariel 2014-01-22 15:54:42 +01:00
parent ec38707cf8
commit 688c4480e4
4 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llagent.cpp
View File

@ -3832,6 +3832,12 @@ void LLAgent::processAgentGroupDataUpdate(LLMessageSystem *msg, void **)
llwarns << "processAgentGroupDataUpdate for agent other than me" << llendl;
return;
}
// <FS:Ansariel> Groupdata debug
else
{
LL_INFOS("Agent_GroupData") << "GROUPDEBUG: Executing deprecated processAgentGroupDataUpdate" << LL_ENDL;
}
// </FS:Ansariel>
S32 count = msg->getNumberOfBlocksFast(_PREHASH_GroupData);
LLGroupData group;
@ -3884,6 +3890,12 @@ class LLAgentGroupDataUpdateViewerNode : public LLHTTPNode
llwarns << "processAgentGroupDataUpdate for agent other than me" << llendl;
return;
}
// <FS:Ansariel> Groupdata debug
else
{
LL_INFOS("Agent_GroupData") << "GROUPDEBUG: Executing processAgentGroupDataUpdate" << LL_ENDL;
}
// </FS:Ansariel>
LLSD group_data = body["GroupData"];

10
indra/newview/llimview.cpp
View File

@ -4063,7 +4063,7 @@ public:
}
// [/RLVa:KB]
// Mute group chat port from Phoenix
// <FS> Mute group chat port from Phoenix
BOOL FSMuteAllGroups = gSavedSettings.getBOOL("FSMuteAllGroups");
BOOL FSMuteGroupWhenNoticesDisabled = gSavedSettings.getBOOL("FSMuteGroupWhenNoticesDisabled");
LLGroupData group_data;
@ -4101,7 +4101,13 @@ public:
return;
}
}
// END: Mute group chat port from Phoenix
// <FS:Ansariel> Groupdata debug
else
{
LL_INFOS("Agent_GroupData") << "GROUPDEBUG: Group chat mute: No agent group data for group " << session_id.asString() << LL_ENDL;
}
// </FS:Ansariel>
// </FS> Mute group chat port from Phoenix
// standard message, not from system
std::string saved;

12
indra/newview/llpanelgroupgeneral.cpp
View File

@ -173,6 +173,12 @@ BOOL LLPanelGroupGeneral::postBuild()
accept_notices = data.mAcceptNotices;
list_in_profile = data.mListInProfile;
}
// <FS:Ansariel> Groupdata debug
else
{
LL_INFOS("Agent_GroupData") << "GROUPDEBUG: Group panel: No agent group data for group " << mGroupID.asString() << LL_ENDL;
}
// </FS:Ansariel>
mCtrlReceiveNotices = getChild<LLCheckBoxCtrl>("receive_notices", recurse);
if (mCtrlReceiveNotices)
{
@ -1037,6 +1043,12 @@ void LLPanelGroupGeneral::setGroupID(const LLUUID& id)
accept_notices = data.mAcceptNotices;
list_in_profile = data.mListInProfile;
}
// <FS:Ansariel> Groupdata debug
else
{
LL_INFOS("Agent_GroupData") << "GROUPDEBUG: Group panel: No agent group data for group " << mGroupID.asString() << LL_ENDL;
}
// </FS:Ansariel>
mCtrlReceiveNotices = getChild<LLCheckBoxCtrl>("receive_notices");
if (mCtrlReceiveNotices)
{

13
indra/newview/llstartup.cpp
View File

@ -2005,6 +2005,11 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
llinfos << "Requesting Money Balance" << llendl;
LLStatusBar::sendMoneyBalanceRequest();
display_startup();
// request all group information
LL_INFOS("Agent_GroupData") << "GROUPDEBUG: Requesting Agent Data during startup" << LL_ENDL;
gAgent.sendAgentDataUpdateRequest();
display_startup();
// </FS:Ansariel>
@ -2181,12 +2186,12 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
//llinfos << "Requesting Money Balance" << llendl;
//LLStatusBar::sendMoneyBalanceRequest();
//display_startup();
//// request all group information
//llinfos << "Requesting Agent Data" << llendl;
//gAgent.sendAgentDataUpdateRequest();
//display_startup();
// </FS:Ansariel>
// request all group information
llinfos << "Requesting Agent Data" << llendl;
gAgent.sendAgentDataUpdateRequest();
display_startup();
// Create the inventory views
llinfos << "Creating Inventory Views" << llendl;