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

Fix friendlist-related startup bugs: 

* Reset variables on each iteration
* Can't add friends that came without agent ID
meow-7.2.2
Ansariel 2015-12-03 14:16:42 +01:00
parent 72568fb98c
commit ff11d6d601
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llstartup.cpp
View File

@ -2266,16 +2266,25 @@ bool idle_startup()
if(buddy_list.isDefined())
{
LLAvatarTracker::buddy_map_t list;
LLUUID agent_id;
S32 has_rights = 0, given_rights = 0;
// <FS:Ansariel> Reset on each iteration
//LLUUID agent_id;
//S32 has_rights = 0, given_rights = 0;
// </FS:Ansariel>
for(LLSD::array_const_iterator it = buddy_list.beginArray(),
end = buddy_list.endArray(); it != end; ++it)
{
// <FS:Ansariel> Reset on each iteration
LLUUID agent_id;
S32 has_rights = 0, given_rights = 0;
// </FS:Ansariel>
LLSD buddy_id = (*it)["buddy_id"];
if(buddy_id.isDefined())
{
agent_id = buddy_id.asUUID();
}
// <FS:Ansariel> Can't add "friends" that have no ID
else continue;
LLSD buddy_rights_has = (*it)["buddy_rights_has"];
if(buddy_rights_has.isDefined())