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

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

Browse Source
This commit is contained in:
Lirusaito
2013-06-23 02:25:15 -04:00
parent c8427e1c63 62f5e73767
commit d4bed6382c
68 changed files with 661 additions and 1039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llpanelavatar.cpp
View File

@@ -1214,7 +1214,7 @@ void LLPanelAvatarPicks::processProperties(void* data, EAvatarProcessorType type
for(LLAvatarPicks::picks_list_t::iterator it = picks->picks_list.begin();
it != picks->picks_list.end(); ++it)
{
LLPanelPick* panel_pick = new LLPanelPick(FALSE);
LLPanelPick* panel_pick = new LLPanelPick();
panel_pick->setPickID(it->first, mAvatarID);
// This will request data from the server when the pick is first
@@ -1259,7 +1259,7 @@ void LLPanelAvatarPicks::onClickNew(void* data)
}
// [/RLVa:KB]
LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
LLPanelPick* panel_pick = new LLPanelPick(FALSE);
LLPanelPick* panel_pick = new LLPanelPick();
LLTabContainer* tabs = self->getChild<LLTabContainer>("picks tab");
panel_pick->initNewPick();
@@ -1275,7 +1275,7 @@ void LLPanelAvatarPicks::onClickNew(void* data)
void LLPanelAvatarPicks::onClickImport(void* data)
{
LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
self->mPanelPick = new LLPanelPick(FALSE);
self->mPanelPick = new LLPanelPick();
self->mPanelPick->importNewPick(&LLPanelAvatarPicks::onClickImport_continued, data);
}
@@ -1514,7 +1514,10 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
void LLPanelAvatar::onAvatarNameResponse(const LLUUID& agent_id, const LLAvatarName& av_name)
{
std::string name;
LLAvatarNameCache::getPNSName(av_name, name);
if (gSavedSettings.getBOOL("SinguCompleteNameProfiles"))
name = av_name.getCompleteName();
else
LLAvatarNameCache::getPNSName(av_name, name);
getChild<LLLineEditor>("dnname")->setText(name);
}