summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpeople.h
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-04-23 17:14:13 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-04-23 17:14:13 -0700
commit1a5ef465ef4059e05a21aae0aa2c6de610f7485f (patch)
treeb68fa232454fc12e17cb2c8cfd4499f89b37cc88 /indra/newview/llpanelpeople.h
parent2ca3612dae3258b489df8e47879f8339e24947ba (diff)
ACME-251 Create AvatarFolderItemView: Now the facebook friends tab is using LLPersonFolderViewModel instead of mConversationViewModel
Diffstat (limited to 'indra/newview/llpanelpeople.h')
-rw-r--r--indra/newview/llpanelpeople.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index d112ac2ec7..f1fa7ec981 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -30,7 +30,7 @@
#include <llpanel.h>
#include "llcallingcard.h" // for avatar tracker
-#include "llconversationmodel.h"
+#include "llpersonmodelcommon.h"
#include "llevents.h"
#include "llfloaterwebcontent.h"
#include "llvoiceclient.h"
@@ -191,7 +191,7 @@ private:
person_folder_model_map mPersonFolderModelMap;
person_folder_view_map mPersonFolderViewMap;
- LLConversationViewModel mConversationViewModel;
+ LLPersonFolderViewModel mPersonFolderViewModel;
LLFolderView* mConversationsRoot;
LLEventStream mConversationsEventStream;
};