diff options
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 102 |
1 files changed, 77 insertions, 25 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 38a8e17827..a0ba2f739b 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -2,25 +2,31 @@ * @file llpanelavatar.cpp * @brief LLPanelAvatar and related class implementations * - * $LicenseInfo:firstyear=2004&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. + * $LicenseInfo:firstyear=2004&license=viewergpl$ + * + * Copyright (c) 2004-2009, 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. + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 * - * 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. + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception * - * 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 + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ */ @@ -45,7 +51,6 @@ #include "llnotificationsutil.h" #include "llvoiceclient.h" #include "llnamebox.h" -#include "lltrans.h" //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLDropTarget @@ -158,7 +163,7 @@ BOOL LLPanelAvatarNotes::postBuild() resetControls(); resetData(); - LLVoiceClient::getInstance()->addObserver((LLVoiceClientStatusObserver*)this); + gVoiceClient->addObserver((LLVoiceClientStatusObserver*)this); return TRUE; } @@ -369,7 +374,7 @@ void LLPanelAvatarNotes::onChange(EStatusType status, const std::string &channel return; } - childSetEnabled("call", LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking()); + childSetEnabled("call", LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking()); } void LLPanelAvatarNotes::setAvatarId(const LLUUID& id) @@ -507,7 +512,13 @@ BOOL LLPanelAvatarProfile::postBuild() mProfileMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_profile_overflow.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); - LLVoiceClient::getInstance()->addObserver((LLVoiceClientStatusObserver*)this); + LLTextureCtrl* pic = getChild<LLTextureCtrl>("2nd_life_pic"); + pic->setFallbackImageName("default_profile_picture.j2c"); + + pic = getChild<LLTextureCtrl>("real_world_pic"); + pic->setFallbackImageName("default_profile_picture.j2c"); + + gVoiceClient->addObserver((LLVoiceClientStatusObserver*)this); resetControls(); resetData(); @@ -634,11 +645,7 @@ void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data) LLAvatarIconIDCache::getInstance()->remove(avatar_data->avatar_id); LLStringUtil::format_map_t args; - { - std::string birth_date = LLTrans::getString("AvatarBirthDateFormat"); - LLStringUtil::format(birth_date, LLSD().with("datetime", (S32) avatar_data->born_on.secondsSinceEpoch())); - args["[REG_DATE]"] = birth_date; - } + args["[REG_DATE]"] = avatar_data->born_on; args["[AGE]"] = LLDateUtil::ageFromDate( avatar_data->born_on, LLDate::now()); std::string register_date = getString("RegisterDateFormat", args); childSetValue("register_date", register_date ); @@ -802,7 +809,7 @@ void LLPanelAvatarProfile::onChange(EStatusType status, const std::string &chann return; } - childSetEnabled("call", LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking()); + childSetEnabled("call", LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking()); } void LLPanelAvatarProfile::setAvatarId(const LLUUID& id) @@ -831,6 +838,9 @@ BOOL LLPanelMyProfile::postBuild() { LLPanelAvatarProfile::postBuild(); + mStatusCombobox = getChild<LLComboBox>("status_combo"); + + childSetCommitCallback("status_combo", boost::bind(&LLPanelMyProfile::onStatusChanged, this), NULL); childSetCommitCallback("status_me_message_text", boost::bind(&LLPanelMyProfile::onStatusMessageChanged, this), NULL); resetControls(); @@ -850,9 +860,30 @@ void LLPanelMyProfile::processProfileProperties(const LLAvatarData* avatar_data) fillPartnerData(avatar_data); + fillStatusData(avatar_data); + fillAccountStatus(avatar_data); } +void LLPanelMyProfile::fillStatusData(const LLAvatarData* avatar_data) +{ + std::string status; + if (gAgent.getAFK()) + { + status = "away"; + } + else if (gAgent.getBusy()) + { + status = "busy"; + } + else + { + status = "online"; + } + + mStatusCombobox->setValue(status); +} + void LLPanelMyProfile::resetControls() { childSetVisible("status_panel", false); @@ -863,6 +894,27 @@ void LLPanelMyProfile::resetControls() childSetVisible("profile_me_buttons_panel", true); } +void LLPanelMyProfile::onStatusChanged() +{ + LLSD::String status = mStatusCombobox->getValue().asString(); + + if ("online" == status) + { + gAgent.clearAFK(); + gAgent.clearBusy(); + } + else if ("away" == status) + { + gAgent.clearBusy(); + gAgent.setAFK(); + } + else if ("busy" == status) + { + gAgent.clearAFK(); + gAgent.setBusy(); + LLNotificationsUtil::add("BusyModeSet"); + } +} void LLPanelMyProfile::onStatusMessageChanged() { |