diff options
Diffstat (limited to 'indra/newview/llfloaterevent.cpp')
| -rw-r--r-- | indra/newview/llfloaterevent.cpp | 92 |
1 files changed, 59 insertions, 33 deletions
diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp index 64efa10ef9..ee2ba2ba54 100644 --- a/indra/newview/llfloaterevent.cpp +++ b/indra/newview/llfloaterevent.cpp @@ -2,31 +2,25 @@ * @file llfloaterevent.cpp * @brief Display for events in the finder * - * $LicenseInfo:firstyear=2004&license=viewergpl$ - * - * Copyright (c) 2004-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2004&license=viewerlgpl$ * 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 + * Copyright (C) 2010, 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. * - * 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 + * 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. * - * 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. + * 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 * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -58,6 +52,7 @@ #include "llviewercontrol.h" #include "llweb.h" #include "llworldmap.h" +#include "llworldmapmessage.h" #include "lluictrlfactory.h" #include "lltrans.h" @@ -112,7 +107,6 @@ BOOL LLFloaterEvent::postBuild() mTBDuration = getChild<LLTextBox>("event_duration"); mTBDesc = getChild<LLExpandableTextBox>("event_desc"); - mTBDesc->setEnabled(FALSE); mTBRunBy = getChild<LLTextBox>("event_runby"); mTBLocation = getChild<LLTextBox>("event_location"); @@ -192,7 +186,7 @@ void LLFloaterEvent::processEventInfoReply(LLMessageSystem *msg, void **) floater->mTBCategory->setText(floater->mEventInfo.mCategoryStr); floater->mTBDate->setText(floater->mEventInfo.mTimeStr); floater->mTBDesc->setText(floater->mEventInfo.mDesc); - floater->mTBRunBy->setText(LLSLURL::buildCommand("agent", floater->mEventInfo.mRunByID, "inspect")); + floater->mTBRunBy->setText(LLSLURL("agent", floater->mEventInfo.mRunByID, "inspect").getSLURLString()); floater->mTBDuration->setText(llformat("%d:%.2d", floater->mEventInfo.mDuration / 60, floater->mEventInfo.mDuration % 60)); @@ -215,16 +209,15 @@ void LLFloaterEvent::processEventInfoReply(LLMessageSystem *msg, void **) std::string desc = floater->mEventInfo.mSimName + llformat(" (%d, %d, %d)", region_x, region_y, region_z); floater->mTBLocation->setText(desc); - if (floater->mEventInfo.mEventFlags & EVENT_FLAG_MATURE) - { - floater->childSetVisible("event_mature_yes", TRUE); - floater->childSetVisible("event_mature_no", FALSE); - } - else - { - floater->childSetVisible("event_mature_yes", FALSE); - floater->childSetVisible("event_mature_no", TRUE); - } + floater->getChildView("rating_icon_m")->setVisible( FALSE); + floater->getChildView("rating_icon_r")->setVisible( FALSE); + floater->getChildView("rating_icon_pg")->setVisible( FALSE); + floater->getChild<LLUICtrl>("rating_value")->setValue(floater->getString("unknown")); + + //for some reason there's not adult flags for now, so see if region is adult and then + //set flags + LLWorldMapMessage::url_callback_t cb = boost::bind( ®ionInfoCallback, floater->mEventInfo.mID, _1); + LLWorldMapMessage::getInstance()->sendNamedRegionRequest(floater->mEventInfo.mSimName, cb, std::string("unused"), false); if (floater->mEventInfo.mUnixTime < time_corrected()) { @@ -249,6 +242,39 @@ void LLFloaterEvent::processEventInfoReply(LLMessageSystem *msg, void **) } } +//static +void LLFloaterEvent::regionInfoCallback(U32 event_id, U64 region_handle) +{ + LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromHandle(region_handle); + LLFloaterEvent* floater = LLFloaterReg::getTypedInstance<LLFloaterEvent>("event"); + + if (sim_info && floater && (event_id == floater->getEventID())) + { + // update the event with the maturity info + if (sim_info->isAdult()) + { + floater->getChildView("rating_icon_m")->setVisible( FALSE); + floater->getChildView("rating_icon_r")->setVisible( TRUE); + floater->getChildView("rating_icon_pg")->setVisible( FALSE); + floater->getChild<LLUICtrl>("rating_value")->setValue(floater->getString("adult")); + + } + else if (floater->mEventInfo.mEventFlags & EVENT_FLAG_MATURE) + { + floater->getChildView("rating_icon_m")->setVisible( TRUE); + floater->getChildView("rating_icon_r")->setVisible( FALSE); + floater->getChildView("rating_icon_pg")->setVisible( FALSE); + floater->getChild<LLUICtrl>("rating_value")->setValue(floater->getString("moderate")); + } + else + { + floater->getChildView("rating_icon_m")->setVisible( FALSE); + floater->getChildView("rating_icon_r")->setVisible( FALSE); + floater->getChildView("rating_icon_pg")->setVisible( TRUE); + floater->getChild<LLUICtrl>("rating_value")->setValue(floater->getString("general")); + } + } +} void LLFloaterEvent::draw() { |