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

fix for normal EXT-2820 [BSI] Functionality loss: Can't open groups from Resident's profile 

--HG--
branch : product-engine
master
Yuri Chebotarev 2009-12-01 15:55:24 +02:00
parent 9e0e0e4d54
commit b509e655bd
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llgroupactions.cpp
View File

@ -100,9 +100,9 @@ public:
}
if (tokens[1].asString() == "inspect")
{
LLSD key;
key["group_id"] = group_id;
LLFloaterReg::showInstance("inspect_group", key);
if (group_id.isNull())
return true;
LLGroupActions::show(group_id);
return true;
}
return false;

11
indra/newview/llpanelavatar.cpp
View File

@ -522,20 +522,19 @@ void LLPanelAvatarProfile::processGroupProperties(const LLAvatarGroups* avatar_g
for(; it_end != it; ++it)
{
LLAvatarGroups::LLGroupData group_data = *it;
// Check if there is no duplicates for this group
if (std::find(mGroups.begin(), mGroups.end(), group_data.group_name) == mGroups.end())
mGroups.push_back(group_data.group_name);
mGroups[group_data.group_name] = group_data.group_id;
}
// Creating string, containing group list
std::string groups = "";
for (group_list_t::const_iterator it = mGroups.begin(); it != mGroups.end(); ++it)
for (group_map_t::iterator it = mGroups.begin(); it != mGroups.end(); ++it)
{
if (it != mGroups.begin())
groups += ", ";
groups += *it;
std::string group_url="[secondlife:///app/group/" + it->second.asString() + "/about " + it->first + "]";
groups += group_url;
}
childSetValue("sl_groups", groups);

4
indra/newview/llpanelavatar.h
View File

@ -192,8 +192,8 @@ protected:
private:
typedef std::list<std::string> group_list_t;
group_list_t mGroups;
typedef std::map< std::string,LLUUID> group_map_t;
group_map_t mGroups;
LLToggleableMenu* mProfileMenu;
};