From e0c4793bcffce018aa2aacd673a209551757ff5b Mon Sep 17 00:00:00 2001 From: kadah Date: Fri, 21 Jan 2011 10:44:28 -0800 Subject: [PATCH] Fixed EOLs --- indra/newview/fscontactsfloater.cpp | 182 ++++++++++++++-------------- indra/newview/fscontactsfloater.h | 104 ++++++++-------- 2 files changed, 143 insertions(+), 143 deletions(-) diff --git a/indra/newview/fscontactsfloater.cpp b/indra/newview/fscontactsfloater.cpp index ed2a24c874..0ed5ae3e65 100644 --- a/indra/newview/fscontactsfloater.cpp +++ b/indra/newview/fscontactsfloater.cpp @@ -1,91 +1,91 @@ -/** - * @file - * @brief - * - * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$ - * Phoenix Firestorm Viewer Source Code - * Copyright (C) 2011, The Phoenix Viewer Project, 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 - * - * The Phoenix Viewer Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA - * $/LicenseInfo$ - */ - - -#include "llviewerprecompiledheaders.h" - -#include "fscontactsfloater.h" -#include "llfloaterreg.h" -#include "llfloater.h" - -// -// LLFloaterContacts -// - -LLFloaterContacts::LLFloaterContacts(const LLSD& seed) - : LLFloater(seed) -{ - //mFactoryMap["friends_panel"] = LLCallbackMap(LLFloaterContacts::createFriendsPanel, NULL); - //mFactoryMap["groups_panel"] = LLCallbackMap(LLFloaterContacts::createGroupsPanel, NULL); -} - -LLFloaterContacts::~LLFloaterContacts() -{ -} - -BOOL LLFloaterContacts::postBuild() -{ - return TRUE; -} - -void LLFloaterContacts::onOpen(const LLSD& key) -{ - if (key.asString() == "friends") - { - childShowTab("friends_and_groups", "friends_panel"); - } - else if (key.asString() == "groups") - { - childShowTab("friends_and_groups", "groups_panel"); - } -} - -//static -void* LLFloaterContacts::createFriendsPanel(void* data) -{ - //return new LLPanelPeople(); - return NULL; -} - -//static -void* LLFloaterContacts::createGroupsPanel(void* data) -{ - //return new LLPanelGroups(); - return NULL; -} - -//static -LLFloaterContacts* LLFloaterContacts::findInstance() -{ - return LLFloaterReg::findTypedInstance("imcontacts"); -} - -LLFloaterContacts* LLFloaterContacts::getInstance() -{ - return LLFloaterReg::getTypedInstance("imcontacts"); -} - -// EOF +/** + * @file + * @brief + * + * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$ + * Phoenix Firestorm Viewer Source Code + * Copyright (C) 2011, The Phoenix Viewer Project, 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 + * + * The Phoenix Viewer Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA + * $/LicenseInfo$ + */ + + +#include "llviewerprecompiledheaders.h" + +#include "fscontactsfloater.h" +#include "llfloaterreg.h" +#include "llfloater.h" + +// +// LLFloaterContacts +// + +LLFloaterContacts::LLFloaterContacts(const LLSD& seed) + : LLFloater(seed) +{ + //mFactoryMap["friends_panel"] = LLCallbackMap(LLFloaterContacts::createFriendsPanel, NULL); + //mFactoryMap["groups_panel"] = LLCallbackMap(LLFloaterContacts::createGroupsPanel, NULL); +} + +LLFloaterContacts::~LLFloaterContacts() +{ +} + +BOOL LLFloaterContacts::postBuild() +{ + return TRUE; +} + +void LLFloaterContacts::onOpen(const LLSD& key) +{ + if (key.asString() == "friends") + { + childShowTab("friends_and_groups", "friends_panel"); + } + else if (key.asString() == "groups") + { + childShowTab("friends_and_groups", "groups_panel"); + } +} + +//static +void* LLFloaterContacts::createFriendsPanel(void* data) +{ + //return new LLPanelPeople(); + return NULL; +} + +//static +void* LLFloaterContacts::createGroupsPanel(void* data) +{ + //return new LLPanelGroups(); + return NULL; +} + +//static +LLFloaterContacts* LLFloaterContacts::findInstance() +{ + return LLFloaterReg::findTypedInstance("imcontacts"); +} + +LLFloaterContacts* LLFloaterContacts::getInstance() +{ + return LLFloaterReg::getTypedInstance("imcontacts"); +} + +// EOF diff --git a/indra/newview/fscontactsfloater.h b/indra/newview/fscontactsfloater.h index 8b3bbd09bf..7f96e2cf37 100644 --- a/indra/newview/fscontactsfloater.h +++ b/indra/newview/fscontactsfloater.h @@ -1,52 +1,52 @@ -/** - * @file fscontactsfloater.h - * @brief - * - * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$ - * Phoenix Firestorm Viewer Source Code - * Copyright (C) 2011, The Phoenix Viewer Project, 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 - * - * The Phoenix Viewer Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA - * $/LicenseInfo$ - */ - - -#ifndef LL_FSCONTACTSFLOATER_H -#define LL_FSCONTACTSFLOATER_H - -#include -#include - -#include "llfloater.h" - -class LLFloaterContacts : public LLFloater -{ -public: - LLFloaterContacts(const LLSD& seed); - virtual ~LLFloaterContacts(); - - /*virtual*/ BOOL postBuild(); - /*virtual*/ void onOpen(const LLSD& key); - - static LLFloaterContacts* getInstance(); - static LLFloaterContacts* findInstance(); - - static void* createFriendsPanel(void* data); - static void* createGroupsPanel(void* data); -}; - -#endif // LL_FSCONTACTSFLOATER_H +/** + * @file fscontactsfloater.h + * @brief + * + * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$ + * Phoenix Firestorm Viewer Source Code + * Copyright (C) 2011, The Phoenix Viewer Project, 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 + * + * The Phoenix Viewer Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA + * $/LicenseInfo$ + */ + + +#ifndef LL_FSCONTACTSFLOATER_H +#define LL_FSCONTACTSFLOATER_H + +#include +#include + +#include "llfloater.h" + +class LLFloaterContacts : public LLFloater +{ +public: + LLFloaterContacts(const LLSD& seed); + virtual ~LLFloaterContacts(); + + /*virtual*/ BOOL postBuild(); + /*virtual*/ void onOpen(const LLSD& key); + + static LLFloaterContacts* getInstance(); + static LLFloaterContacts* findInstance(); + + static void* createFriendsPanel(void* data); + static void* createGroupsPanel(void* data); +}; + +#endif // LL_FSCONTACTSFLOATER_H