diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-02 16:36:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-02 16:36:02 -0700 |
| commit | cc7440d0853d269a5b955ab021db729ed5b6a92c (patch) | |
| tree | 12139acedc8bf22f95d4da0507ef84fb870590cd /indra/newview/llpanelpeople.cpp | |
| parent | a73305c41d058fc755b824e5a9243afe43b424e1 (diff) | |
| parent | f849606399b902e71f4389ad1d7e0fc15f10d8b5 (diff) | |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 9daf441ab3..03135ce580 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -111,12 +111,11 @@ public: { mPanelPeople->connectToFacebook(query_map["code"]); mPanelPeople = NULL; - return true; } } + return true; } } - return false; } }; @@ -1688,12 +1687,12 @@ void LLPanelPeople::showFacebookFriends(const LLSD& friends) void LLPanelPeople::addTestParticipant() { std::string suffix("Aa"); - std::string prefix("EastBayGuy"); + std::string prefix("Test Name"); for(int i = 0; i < 300; ++i) { LLPersonTabModel * person_folder_model = dynamic_cast<LLPersonTabModel *>(mPersonFolderView->mPersonFolderModelMap.begin()->second); std::string name = prefix + " " + suffix; - addParticipantToModel(person_folder_model, LLUUID().generateNewID(), name); + addParticipantToModel(person_folder_model, gAgent.getID(), name); // Next suffix : Aa, Ab, Ac ... Az, Ba, Bb, Bc ... Bz, Ca, Cb ... suffix[1]+=1; if (suffix[1]=='{') |