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

Implementing FIRE-5314, making comm->friends/groups open either the legacy v2 side tray tabs or the v1 style communicate tabs.

Liny 2012-03-02 17:27:55 -08:00
parent eff1f4be54
commit b7628c85d7
2 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -23,6 +23,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>FSUseV2Friends</key>
<map>
<key>Comment</key>
<string>Makes Comm->Friends and Comm->Groups open the v2 based windows.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FSFolderViewItemHeight</key>
<map>
<key>Comment</key>

53
indra/newview/llviewermenu.cpp
View File

@ -4029,31 +4029,44 @@ class LLTogglePanelPeopleTab : public view_listener_t
param["people_panel_tab_name"] = panel_name;
// <FS:Zi> Open groups and friends lists in communicate floater
// if ( panel_name == "friends_panel"
// || panel_name == "groups_panel"
// || panel_name == "nearby_panel")
// {
// return togglePeoplePanel(panel_name, param);
// }
if(panel_name=="nearby_panel")
// <FS:Lo> Adding an option to still use v2 windows
if(gSavedSettings.getBOOL("FSUseV2Friends"))
{
return togglePeoplePanel(panel_name,param);
if ( panel_name == "friends_panel"
|| panel_name == "groups_panel"
|| panel_name == "nearby_panel")
{
return togglePeoplePanel(panel_name, param);
}
else
{
return false;
}
}
else if(panel_name=="groups_panel")
{
FSFloaterContacts::getInstance()->openTab("groups");
return true;
}
else if(panel_name=="friends_panel")
{
FSFloaterContacts::getInstance()->openTab("friends");
return true;
}
// </FS:Zi>
else
{
return false;
if(panel_name=="nearby_panel")
{
return togglePeoplePanel(panel_name,param);
}
else if(panel_name=="groups_panel")
{
FSFloaterContacts::getInstance()->openTab("groups");
return true;
}
else if(panel_name=="friends_panel")
{
FSFloaterContacts::getInstance()->openTab("friends");
return true;
}
else
{
return false;
}
}
// </FS:Lo>
// </FS:Zi>
return false;
}
static bool togglePeoplePanel(const std::string& panel_name, const LLSD& param)