summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/CMakeLists.txt2
-rwxr-xr-xindra/newview/llpanelpeople.cpp32
-rwxr-xr-xindra/newview/llpanelpeople.h2
-rw-r--r--indra/newview/llsociallist.cpp154
-rw-r--r--indra/newview/llsociallist.h102
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_people.xml95
6 files changed, 0 insertions, 387 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a5ad2e4d4e..f593375aed 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -513,7 +513,6 @@ set(viewer_SOURCE_FILES
llsky.cpp
llslurl.cpp
llsnapshotlivepreview.cpp
- llsociallist.cpp
llspatialpartition.cpp
llspeakers.cpp
llspeakingindicatormanager.cpp
@@ -1092,7 +1091,6 @@ set(viewer_HEADER_FILES
llsky.h
llslurl.h
llsnapshotlivepreview.h
- llsociallist.h
llspatialpartition.h
llspeakers.h
llspeakingindicatormanager.h
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 92391f0537..d3493373f6 100755
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -72,7 +72,6 @@
#include "llviewermenu.h" // for gMenuHolder
#include "llvoiceclient.h"
#include "llworld.h"
-#include "llsociallist.h"
#include "llspeakers.h"
#include "llfloaterwebcontent.h"
@@ -87,7 +86,6 @@ static const std::string FRIENDS_TAB_NAME = "friends_panel";
static const std::string GROUP_TAB_NAME = "groups_panel";
static const std::string RECENT_TAB_NAME = "recent_panel";
static const std::string BLOCKED_TAB_NAME = "blocked_panel"; // blocked avatars
-static const std::string FBCTEST_TAB_NAME = "fbctest_panel";
static const std::string FBCTESTTWO_TAB_NAME = "fbctesttwo_panel";
static const std::string COLLAPSED_BY_USER = "collapsed_by_user";
@@ -528,7 +526,6 @@ LLPanelPeople::LLPanelPeople()
mCommitCallbackRegistrar.add("People.loginFBC", boost::bind(&LLPanelPeople::onLoginFbcButtonClicked, this));
mCommitCallbackRegistrar.add("People.requestFBC", boost::bind(&LLPanelPeople::onFacebookAppRequestClicked, this));
mCommitCallbackRegistrar.add("People.sendFBC", boost::bind(&LLPanelPeople::onFacebookAppSendClicked, this));
- mCommitCallbackRegistrar.add("People.testaddFBC", boost::bind(&LLPanelPeople::onFacebookTestAddClicked, this));
mCommitCallbackRegistrar.add("People.testaddFBCFolderView", boost::bind(&LLPanelPeople::addTestParticipant, this));
mCommitCallbackRegistrar.add("People.AddFriend", boost::bind(&LLPanelPeople::onAddFriendButtonClicked, this));
@@ -648,13 +645,6 @@ BOOL LLPanelPeople::postBuild()
mOnlineFriendList->setContextMenu(&LLPanelPeopleMenus::gPeopleContextMenu);
mSuggestedFriends->setContextMenu(&LLPanelPeopleMenus::gSuggestedFriendsContextMenu);
- //===Temporary ========================================================================
-
- LLPanel * social_tab = getChild<LLPanel>(FBCTEST_TAB_NAME);
- mFacebookFriends = social_tab->getChild<LLSocialList>("facebook_friends");
- // Note: we use the same updater for both test lists (brute force but OK since it's temporary)
- social_tab->setVisibleCallback(boost::bind(&LLPanelPeople::updateFacebookList, this, _2));
-
//===Test START========================================================================
LLPanel * socialtwo_tab = getChild<LLPanel>(FBCTESTTWO_TAB_NAME);
@@ -1025,8 +1015,6 @@ LLUUID LLPanelPeople::getCurrentItemID() const
if (cur_tab == BLOCKED_TAB_NAME)
return LLUUID::null; // FIXME?
- if (cur_tab == FBCTEST_TAB_NAME)
- return LLUUID::null;
if (cur_tab == FBCTESTTWO_TAB_NAME)
return LLUUID::null;
@@ -1054,8 +1042,6 @@ void LLPanelPeople::getCurrentItemIDs(uuid_vec_t& selected_uuids) const
mGroupList->getSelectedUUIDs(selected_uuids);
else if (cur_tab == BLOCKED_TAB_NAME)
selected_uuids.clear(); // FIXME?
- else if (cur_tab == FBCTEST_TAB_NAME)
- return;
else if (cur_tab == FBCTESTTWO_TAB_NAME)
return;
else
@@ -1695,22 +1681,4 @@ void LLPanelPeople::onFacebookAppSendClicked()
{
}
-static LLFastTimer::DeclareTimer FTM_AVATAR_LIST_TEST("avatar list test");
-
-void LLPanelPeople::onFacebookTestAddClicked()
-{
- LLFastTimer _(FTM_AVATAR_LIST_TEST);
-
- mFacebookFriends->clear();
-
- LL_INFOS("LLPanelPeople") << "start adding 300 users" << LL_ENDL;
-
- for(int i = 0; i < 300; ++i)
- {
- mFacebookFriends->addNewItem(LLUUID(), "Test", false);
- }
-
- LL_INFOS("LLPanelPeople") << "finished adding 300 users" << LL_ENDL;
-}
-
// EOF
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 1cd2a05e91..cbfd74a2a0 100755
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -35,7 +35,6 @@
#include "llvoiceclient.h"
class LLAvatarList;
-class LLAvatarListSocial;
class LLAvatarName;
class LLFilterEditor;
class LLGroupList;
@@ -123,7 +122,6 @@ private:
void onLoginFbcButtonClicked();
void onFacebookAppRequestClicked();
void onFacebookAppSendClicked();
- void onFacebookTestAddClicked();
bool onFriendsViewSortMenuItemCheck(const LLSD& userdata);
bool onRecentViewSortMenuItemCheck(const LLSD& userdata);
diff --git a/indra/newview/llsociallist.cpp b/indra/newview/llsociallist.cpp
deleted file mode 100644
index 9f827cf04f..0000000000
--- a/indra/newview/llsociallist.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
-* @file llsociallist.cpp
-* @brief Implementation of llsociallist
-* @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 "llsociallist.h"
-
-#include "llavataractions.h"
-#include "llfloaterreg.h"
-#include "llavatariconctrl.h"
-#include "llavatarnamecache.h"
-#include "lloutputmonitorctrl.h"
-#include "lltextutil.h"
-
-static LLDefaultChildRegistry::Register<LLSocialList> r("social_list");
-
-LLSocialList::LLSocialList(const Params&p) : LLFlatListViewEx(p)
-{
-
-}
-
-LLSocialList::~LLSocialList()
-{
-
-}
-
-void LLSocialList::draw()
-{
- LLFlatListView::draw();
-}
-
-void LLSocialList::refresh()
-{
-
-}
-
-void LLSocialList::addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos)
-{
- LLSocialListItem * item = new LLSocialListItem();
- LLAvatarName avatar_name;
- bool has_avatar_name = id.notNull() && LLAvatarNameCache::get(id, &avatar_name);
-
- item->mAvatarId = id;
- if(id.notNull())
- {
- item->mIcon->setValue(id);
- }
-
- item->setName(has_avatar_name ? name + " (" + avatar_name.getDisplayName() + ")" : name, mNameFilter);
- addItem(item, id, pos);
-}
-
-LLSocialListItem::LLSocialListItem()
-{
- buildFromFile("panel_avatar_list_item.xml");
-}
-
-LLSocialListItem::~LLSocialListItem()
-{
-
-}
-
-BOOL LLSocialListItem::postBuild()
-{
- mIcon = getChild<LLAvatarIconCtrl>("avatar_icon");
- mLabelTextBox = getChild<LLTextBox>("avatar_name");
-
- mLastInteractionTime = getChild<LLTextBox>("last_interaction");
- mIconPermissionOnline = getChild<LLIconCtrl>("permission_online_icon");
- mIconPermissionMap = getChild<LLIconCtrl>("permission_map_icon");
- mIconPermissionEditMine = getChild<LLIconCtrl>("permission_edit_mine_icon");
- mIconPermissionEditTheirs = getChild<LLIconCtrl>("permission_edit_theirs_icon");
- mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
- mInfoBtn = getChild<LLButton>("info_btn");
- mProfileBtn = getChild<LLButton>("profile_btn");
-
- mLastInteractionTime->setVisible(false);
- mIconPermissionOnline->setVisible(false);
- mIconPermissionMap->setVisible(false);
- mIconPermissionEditMine->setVisible(false);
- mIconPermissionEditTheirs->setVisible(false);
- mSpeakingIndicator->setVisible(false);
- mInfoBtn->setVisible(false);
- mProfileBtn->setVisible(false);
-
- mInfoBtn->setClickedCallback(boost::bind(&LLSocialListItem::onInfoBtnClick, this));
- mProfileBtn->setClickedCallback(boost::bind(&LLSocialListItem::onProfileBtnClick, this));
-
- return TRUE;
-}
-
-void LLSocialListItem::setName(const std::string& name, const std::string& highlight)
-{
- mLabel = name;
- LLTextUtil::textboxSetHighlightedVal(mLabelTextBox, mLabelTextBoxStyle, name, highlight);
-}
-
-void LLSocialListItem::setValue(const LLSD& value)
-{
- getChildView("selected_icon")->setVisible( value["selected"]);
-}
-
-void LLSocialListItem::onMouseEnter(S32 x, S32 y, MASK mask)
-{
- getChildView("hovered_icon")->setVisible( true);
- mInfoBtn->setVisible(true);
- mProfileBtn->setVisible(true);
-
- LLPanel::onMouseEnter(x, y, mask);
-}
-
-void LLSocialListItem::onMouseLeave(S32 x, S32 y, MASK mask)
-{
- getChildView("hovered_icon")->setVisible( false);
- mInfoBtn->setVisible(false);
- mProfileBtn->setVisible(false);
-
- LLPanel::onMouseLeave(x, y, mask);
-}
-
-void LLSocialListItem::onInfoBtnClick()
-{
- LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", mAvatarId));
-}
-
-void LLSocialListItem::onProfileBtnClick()
-{
- LLAvatarActions::showProfile(mAvatarId);
-}
diff --git a/indra/newview/llsociallist.h b/indra/newview/llsociallist.h
deleted file mode 100644
index bc667fc400..0000000000
--- a/indra/newview/llsociallist.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
-* @file llsociallist.h
-* @brief Header file for llsociallist
-* @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_LLSOCIALLIST_H
-#define LL_LLSOCIALLIST_H
-
-#include "llflatlistview.h"
-#include "llstyle.h"
-
-
-/**
- * Generic list of avatars.
- *
- * Updates itself when it's dirty, using optional name filter.
- * To initiate update, modify the UUID list and call setDirty().
- *
- * @see getIDs()
- * @see setDirty()
- * @see setNameFilter()
- */
-
-class LLAvatarIconCtrl;
-class LLIconCtrl;
-class LLOutputMonitorCtrl;
-
-class LLSocialList : public LLFlatListViewEx
-{
-public:
-
- struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
- {
- };
-
- LLSocialList(const Params&p);
- virtual ~LLSocialList();
-
- virtual void draw();
- void refresh();
- void addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos = ADD_BOTTOM);
-
-
-
- std::string mNameFilter;
-};
-
-class LLSocialListItem : public LLPanel
-{
- public:
- LLSocialListItem();
- ~LLSocialListItem();
-
- BOOL postBuild();
- void setName(const std::string& name, const std::string& highlight = LLStringUtil::null);
- void setValue(const LLSD& value);
- void onMouseEnter(S32 x, S32 y, MASK mask);
- void onMouseLeave(S32 x, S32 y, MASK mask);
- void onInfoBtnClick();
- void onProfileBtnClick();
-
- LLUUID mAvatarId;
-
- LLTextBox * mLabelTextBox;
- std::string mLabel;
- LLStyle::Params mLabelTextBoxStyle;
-
-
- LLAvatarIconCtrl * mIcon;
- LLTextBox * mLastInteractionTime;
- LLIconCtrl * mIconPermissionOnline;
- LLIconCtrl * mIconPermissionMap;
- LLIconCtrl * mIconPermissionEditMine;
- LLIconCtrl * mIconPermissionEditTheirs;
- LLOutputMonitorCtrl * mSpeakingIndicator;
- LLButton * mInfoBtn;
- LLButton * mProfileBtn;
-};
-
-
-#endif // LL_LLSOCIALLIST_H
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 451095c7d8..76124148a0 100755
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -651,101 +651,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
right="-1" />
</panel>
-<!-- ================================= FBC TEST tab (Temporary) ========================== -->
-
- <panel
- background_opaque="true"
- background_visible="true"
- bg_alpha_color="DkGray"
- bg_opaque_color="DkGray"
- follows="all"
- height="383"
- label="FBC TEST"
- layout="topleft"
- left="0"
- help_topic="people_fbctest_tab"
- name="fbctest_panel"
- top="0"
- width="313">
- <accordion
- background_visible="true"
- bg_alpha_color="DkGray2"
- bg_opaque_color="DkGray2"
- follows="all"
- height="356"
- layout="topleft"
- left="3"
- name="friends_accordion"
- top="0"
- width="307">
- <accordion_tab
- layout="topleft"
- height="172"
- min_height="150"
- name="tab_facebook"
- title="Facebook Friends">
- <social_list
- allow_select="true"
- follows="all"
- height="172"
- layout="topleft"
- left="0"
- multi_select="true"
- name="facebook_friends"
- show_permissions_granted="true"
- top="0"
- width="307" />
- </accordion_tab>
- </accordion>
- <panel
- background_visible="true"
- follows="left|right|bottom"
- height="27"
- label="bottom_panel"
- layout="topleft"
- left="3"
- name="bottom_panel"
- top_pad="0"
- width="313">
- <menu_button
- follows="bottom|left"
- tool_tip="Options"
- height="25"
- image_hover_unselected="Toolbar_Left_Over"
- image_overlay="OptionsMenu_Off"
- image_selected="Toolbar_Left_Selected"
- image_unselected="Toolbar_Left_Off"
- layout="topleft"
- name="fbc_options_btn"
- top="1"
- width="31" />
- <button
- follows="bottom|left"
- height="25"
- image_hover_unselected="Toolbar_Middle_Over"
- image_overlay="AddItem_Off"
- image_selected="Toolbar_Middle_Selected"
- image_unselected="Toolbar_Middle_Off"
- layout="topleft"
- left_pad="1"
- name="fbc_login_btn"
- tool_tip="Log in to FBC"
- width="31">
- <commit_callback
- function="People.loginFBC" />
- </button>
- <icon
- follows="bottom|left|right"
- height="25"
- image_name="Toolbar_Right_Off"
- layout="topleft"
- left_pad="1"
- name="dummy_icon"
- width="244"
- />
- </panel>
- </panel>
-
<!-- ================================= FBC TEST TWO tab (Final, to be renamed) ========================== -->
<panel
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 15:05:42 +0000