diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/llpanelmarketplaceinventory.cpp (renamed from indra/newview/llpanelmarketplace.cpp) | 13 | ||||
| -rw-r--r-- | indra/newview/llpanelmarketplaceinventory.h (renamed from indra/newview/llpanelmarketplace.h) | 16 | 
3 files changed, 16 insertions, 17 deletions
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/llpanelmarketplaceinventory.cpp index c3d97f9d62..be2cef3601 100644 --- a/indra/newview/llpanelmarketplace.cpp +++ b/indra/newview/llpanelmarketplaceinventory.cpp @@ -1,7 +1,6 @@  /**  - * @file llfloatersounddevices.cpp - * @author Leyla Farazha - * @brief Sound Preferences used for minimal skin + * @file llpanelmarketplaceinventory.cpp + * @brief Panel for marketplace inbox and outbox   *  * $LicenseInfo:firstyear=2011&license=viewerlgpl$   * Second Life Viewer Source Code @@ -26,21 +25,21 @@   */  #include "llviewerprecompiledheaders.h" -#include "llpanelmarketplace.h" +#include "llpanelmarketplaceinventory.h"  // protected -LLPanelMarketplace::LLPanelMarketplace() +LLPanelMarketplaceInventory::LLPanelMarketplaceInventory()  :	LLPanel()  {  } -LLPanelMarketplace::~LLPanelMarketplace() +LLPanelMarketplaceInventory::~LLPanelMarketplaceInventory()  {  }  // virtual -BOOL LLPanelMarketplace::postBuild() +BOOL LLPanelMarketplaceInventory::postBuild()  {  	return TRUE;  } diff --git a/indra/newview/llpanelmarketplace.h b/indra/newview/llpanelmarketplaceinventory.h index bd0ef523fc..367656ad38 100644 --- a/indra/newview/llpanelmarketplace.h +++ b/indra/newview/llpanelmarketplaceinventory.h @@ -1,5 +1,5 @@  /**  - * @file llpanelmarketplaces.h + * @file llpanelmarketplaceinventory.h   * @brief Panel for marketplace inbox and outbox   *  * $LicenseInfo:firstyear=2011&license=viewerlgpl$ @@ -24,23 +24,23 @@   * $/LicenseInfo$   */ -#ifndef LL_LLPANELMARKETPLACE_H -#define LL_LLPANELMARKETPLACE_H +#ifndef LL_LLPANELMARKETPLACEINVENTORY_H +#define LL_LLPANELMARKETPLACEINVENTORY_H  #include "llpanel.h" -class LLPanelMarketplace : public LLPanel +class LLPanelMarketplaceInventory : public LLPanel  {  public: -	LOG_CLASS(LLPanelMarketplace); +	LOG_CLASS(LLPanelMarketplaceInventory); -	LLPanelMarketplace(); -	~LLPanelMarketplace(); +	LLPanelMarketplaceInventory(); +	~LLPanelMarketplaceInventory();  	/*virtual*/ BOOL postBuild();  }; -#endif //LL_LLPANELMARKETPLACE_H +#endif //LL_LLPANELMARKETPLACEINVENTORY_H  | 
