ACME-251 Create AvatarFolderItemView: When making the folderview using LLPersonModelCommon instead of LLConverationItem. Also the .xml file file read in for LLPersonTabView was incorrect, now using person_tab_view.xml. And lastly made a new file called llpersonfolderview which which be the implementation of folderview.
parent
f8ce67f0e0
commit
2ca3612dae
|
|
@ -452,6 +452,7 @@ set(viewer_SOURCE_FILES
|
|||
llpathfindingobjectlist.cpp
|
||||
llpathfindingpathtool.cpp
|
||||
llpersistentnotificationstorage.cpp
|
||||
llpersonfolderview.cpp
|
||||
llpersonmodelcommon.cpp
|
||||
llpersontabview.cpp
|
||||
llphysicsmotion.cpp
|
||||
|
|
@ -1031,6 +1032,7 @@ set(viewer_HEADER_FILES
|
|||
llpathfindingobjectlist.h
|
||||
llpathfindingpathtool.h
|
||||
llpersistentnotificationstorage.h
|
||||
llpersonfolderview.h
|
||||
llpersonmodelcommon.h
|
||||
llpersontabview.h
|
||||
llphysicsmotion.h
|
||||
|
|
|
|||
|
|
@ -695,7 +695,7 @@ BOOL LLPanelPeople::postBuild()
|
|||
LLPanel * socialtwo_tab = getChild<LLPanel>(FBCTESTTWO_TAB_NAME);
|
||||
|
||||
//Create folder view
|
||||
LLConversationItem* base_item = new LLConversationItem(mConversationViewModel);
|
||||
LLPersonModelCommon* base_item = new LLPersonModelCommon(mConversationViewModel);
|
||||
|
||||
LLFolderView::Params folder_view_params(LLUICtrlFactory::getDefaultParams<LLFolderView>());
|
||||
folder_view_params.parent_panel = friends_tab;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
/**
|
||||
* @file llpersonfolderview.cpp
|
||||
* @brief Implementation of llpersonfolderview
|
||||
* @author Gilbert@lindenlab.com
|
||||
*
|
||||
* $LicenseInfo:firstyear=2013&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2013, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#include "llviewerprecompiledheaders.h"
|
||||
|
||||
#include "llpersonfolderview.h"
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
/**
|
||||
* @file llpersonfolderview.h
|
||||
* @brief Header file for llpersonfolderview
|
||||
* @author Gilbert@lindenlab.com
|
||||
*
|
||||
* $LicenseInfo:firstyear=2013&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2013, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
#ifndef LL_LLPERSONFOLDERVIEW_H
|
||||
#define LL_LLPERSONFOLDERVIEW_H
|
||||
|
||||
#include "llfolderview.h"
|
||||
|
||||
#endif // LL_LLPERSONFOLDERVIEW_H
|
||||
|
||||
class LLPersonFolderView : public LLFolderView
|
||||
{
|
||||
|
||||
};
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
#include "llpersontabview.h"
|
||||
|
||||
static LLDefaultChildRegistry::Register<LLPersonTabView> r_person_folder_view("person_folder_view");
|
||||
static LLDefaultChildRegistry::Register<LLPersonTabView> r_person_tab_view("person_tab_view");
|
||||
|
||||
const LLColor4U DEFAULT_WHITE(255, 255, 255);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue