From e8b0db53b2dbfab3fc060fefb6abb2d6dcf31fe9 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Tue, 17 May 2011 14:44:23 -0700 Subject: changing llpanelmarketplace to llpanelmarketplaceinventory --- indra/newview/CMakeLists.txt | 4 +-- indra/newview/llpanelmarketplace.cpp | 46 --------------------------- indra/newview/llpanelmarketplace.h | 46 --------------------------- indra/newview/llpanelmarketplaceinventory.cpp | 45 ++++++++++++++++++++++++++ indra/newview/llpanelmarketplaceinventory.h | 46 +++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 94 deletions(-) delete mode 100644 indra/newview/llpanelmarketplace.cpp delete mode 100644 indra/newview/llpanelmarketplace.h create mode 100644 indra/newview/llpanelmarketplaceinventory.cpp create mode 100644 indra/newview/llpanelmarketplaceinventory.h diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f14313cf7d..8fde605cb0 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -348,7 +348,7 @@ set(viewer_SOURCE_FILES llpanellogin.cpp llpanelloginlistener.cpp llpanelmaininventory.cpp - llpanelmarketplace.cpp + llpanelmarketplaceinventory.cpp llpanelmediasettingsgeneral.cpp llpanelmediasettingspermissions.cpp llpanelmediasettingssecurity.cpp @@ -888,7 +888,7 @@ set(viewer_HEADER_FILES llpanellogin.h llpanelloginlistener.h llpanelmaininventory.h - llpanelmarketplace.h + llpanelmarketplaceinventory.h llpanelmediasettingsgeneral.h llpanelmediasettingspermissions.h llpanelmediasettingssecurity.h diff --git a/indra/newview/llpanelmarketplace.cpp b/indra/newview/llpanelmarketplace.cpp deleted file mode 100644 index c3d97f9d62..0000000000 --- a/indra/newview/llpanelmarketplace.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file llfloatersounddevices.cpp - * @author Leyla Farazha - * @brief Sound Preferences used for minimal skin - * -* $LicenseInfo:firstyear=2011&license=viewerlgpl$ - * Second Life Viewer Source Code - * 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. - * - * 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 "llpanelmarketplace.h" - - -// protected -LLPanelMarketplace::LLPanelMarketplace() -: LLPanel() -{ -} - -LLPanelMarketplace::~LLPanelMarketplace() -{ -} - -// virtual -BOOL LLPanelMarketplace::postBuild() -{ - return TRUE; -} diff --git a/indra/newview/llpanelmarketplace.h b/indra/newview/llpanelmarketplace.h deleted file mode 100644 index bd0ef523fc..0000000000 --- a/indra/newview/llpanelmarketplace.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file llpanelmarketplaces.h - * @brief Panel for marketplace inbox and outbox - * -* $LicenseInfo:firstyear=2011&license=viewerlgpl$ - * Second Life Viewer Source Code - * 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. - * - * 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_LLPANELMARKETPLACE_H -#define LL_LLPANELMARKETPLACE_H - -#include "llpanel.h" - -class LLPanelMarketplace : public LLPanel -{ -public: - - LOG_CLASS(LLPanelMarketplace); - - LLPanelMarketplace(); - ~LLPanelMarketplace(); - - /*virtual*/ BOOL postBuild(); -}; - - -#endif //LL_LLPANELMARKETPLACE_H - diff --git a/indra/newview/llpanelmarketplaceinventory.cpp b/indra/newview/llpanelmarketplaceinventory.cpp new file mode 100644 index 0000000000..be2cef3601 --- /dev/null +++ b/indra/newview/llpanelmarketplaceinventory.cpp @@ -0,0 +1,45 @@ +/** + * @file llpanelmarketplaceinventory.cpp + * @brief Panel for marketplace inbox and outbox + * +* $LicenseInfo:firstyear=2011&license=viewerlgpl$ + * Second Life Viewer Source Code + * 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. + * + * 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 "llpanelmarketplaceinventory.h" + + +// protected +LLPanelMarketplaceInventory::LLPanelMarketplaceInventory() +: LLPanel() +{ +} + +LLPanelMarketplaceInventory::~LLPanelMarketplaceInventory() +{ +} + +// virtual +BOOL LLPanelMarketplaceInventory::postBuild() +{ + return TRUE; +} diff --git a/indra/newview/llpanelmarketplaceinventory.h b/indra/newview/llpanelmarketplaceinventory.h new file mode 100644 index 0000000000..367656ad38 --- /dev/null +++ b/indra/newview/llpanelmarketplaceinventory.h @@ -0,0 +1,46 @@ +/** + * @file llpanelmarketplaceinventory.h + * @brief Panel for marketplace inbox and outbox + * +* $LicenseInfo:firstyear=2011&license=viewerlgpl$ + * Second Life Viewer Source Code + * 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. + * + * 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_LLPANELMARKETPLACEINVENTORY_H +#define LL_LLPANELMARKETPLACEINVENTORY_H + +#include "llpanel.h" + +class LLPanelMarketplaceInventory : public LLPanel +{ +public: + + LOG_CLASS(LLPanelMarketplaceInventory); + + LLPanelMarketplaceInventory(); + ~LLPanelMarketplaceInventory(); + + /*virtual*/ BOOL postBuild(); +}; + + +#endif //LL_LLPANELMARKETPLACEINVENTORY_H + -- cgit v1.2.3