Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/llfloateravatarpicker.cpp - Includes to v-d style, since plain alphabetical just won't cut it. Shyotl's changes for name system, here.
	indra/newview/llpanelgroupinvite.cpp - Shyotl's changes for name system, here.

Also corrected new README to have less typos and be slightly more accurate.
This commit is contained in:
Lirusaito
2012-12-10 11:24:25 -05:00
parent 1ffb5aa6fe 018737eb15
commit c24950b261
333 changed files with 11005 additions and 6945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llpanelgrouproles.cpp
View File

@@ -790,7 +790,7 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
row["columns"][column_index]["column"] = "action";
row["columns"][column_index]["value"] = (*ra_it)->mDescription;
row["columns"][column_index]["font"] = "SANSSERIFSMALL";
row["columns"][column_index]["font"] = "SANSSERIF_SMALL";
LLScrollListItem* item = ctrl->addElement(row, ADD_BOTTOM, (*ra_it));
@@ -890,11 +890,10 @@ BOOL LLPanelGroupMembersSubTab::postBuildSubTab(LLView* root)
if (!mMembersList || !mAssignedRolesList || !mAllowedActionsList) return FALSE;
// We want to be notified whenever a member is selected.
mMembersList->setCallbackUserData(this);
mMembersList->setCommitOnSelectionChange(TRUE);
mMembersList->setCommitCallback(onMemberSelect);
mMembersList->setCommitCallback(boost::bind(&LLPanelGroupMembersSubTab::onMemberSelect,_1,this));
// Show the member's profile on double click.
mMembersList->setDoubleClickCallback(onMemberDoubleClick);
mMembersList->setDoubleClickCallback(boost::bind(&LLPanelGroupMembersSubTab::onMemberDoubleClick,this));
LLButton* button = parent->getChild<LLButton>("member_invite", recurse);
if ( button )
@@ -1616,7 +1615,7 @@ void LLPanelGroupMembersSubTab::update(LLGroupChange gc)
retrieved << "Retrieving role member mappings...";
}
mMembersList->setEnabled(FALSE);
mMembersList->addCommentText(retrieved.str());
mMembersList->setCommentText(retrieved.str());
}
}
@@ -1679,9 +1678,9 @@ void LLPanelGroupMembersSubTab::updateMembers()
row["columns"][2]["column"] = "online";
row["columns"][2]["value"] = mMemberProgress->second->getOnlineStatus();
row["columns"][2]["font"] = "SANSSERIFSMALL";
row["columns"][2]["font"] = "SANSSERIF_SMALL";
mMembersList->addElement(row);//, ADD_SORTED);
mMembersList->addNameItem(row);
mHasMatch = TRUE;
}
}
@@ -1695,7 +1694,7 @@ void LLPanelGroupMembersSubTab::updateMembers()
else
{
mMembersList->setEnabled(FALSE);
mMembersList->addCommentText(std::string("No match."));
mMembersList->setCommentText(std::string("No match."));
}
}
else