From 3e3735c16b47402d8fc2da8afa6086638fb5b948 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Fri, 28 Sep 2012 15:02:31 +0300 Subject: CHUI-345 ADDITIONAL FIX (LLConversationViewSession: enable speaking indicator) - Clicking on the conversation speaking icon brings up the volume floater for voice conversations --- indra/newview/llfloaterchatvoicevolume.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 indra/newview/llfloaterchatvoicevolume.h (limited to 'indra/newview/llfloaterchatvoicevolume.h') diff --git a/indra/newview/llfloaterchatvoicevolume.h b/indra/newview/llfloaterchatvoicevolume.h new file mode 100644 index 0000000000..0aeab7874c --- /dev/null +++ b/indra/newview/llfloaterchatvoicevolume.h @@ -0,0 +1,26 @@ +/* + * llfloaterchatvoicevolume.h + * + * Created on: Sep 27, 2012 + * Author: pguslisty + */ + +#ifndef LLFLOATERCHATVOICEVOLUME_H_ +#define LLFLOATERCHATVOICEVOLUME_H_ + +#include "llinspect.h" +#include "lltransientfloatermgr.h" + +class LLFloaterChatVoiceVolume : public LLInspect, LLTransientFloater +{ +public: + + LLFloaterChatVoiceVolume(const LLSD& key); + virtual ~LLFloaterChatVoiceVolume(); + + virtual void onOpen(const LLSD& key); + + /*virtual*/ LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::GLOBAL; } +}; + +#endif /* LLFLOATERCHATVOICEVOLUME_H_ */ -- cgit v1.2.3 From 4a41aa8fad7f4a0c1daab5d159920745a03a5950 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 28 Sep 2012 18:39:55 -0700 Subject: CHUI-345 : Add mandatory license to the files --- indra/newview/llfloaterchatvoicevolume.h | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloaterchatvoicevolume.h') diff --git a/indra/newview/llfloaterchatvoicevolume.h b/indra/newview/llfloaterchatvoicevolume.h index 0aeab7874c..61ad92b6da 100644 --- a/indra/newview/llfloaterchatvoicevolume.h +++ b/indra/newview/llfloaterchatvoicevolume.h @@ -1,8 +1,26 @@ -/* - * llfloaterchatvoicevolume.h +/** + * @file llfloaterchatvoicevolume.h * - * Created on: Sep 27, 2012 - * Author: pguslisty + * $LicenseInfo:firstyear=2012&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2012, 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 LLFLOATERCHATVOICEVOLUME_H_ -- cgit v1.2.3