Merge of my DEV-36732 work and all the main line login api work that went on.

1 files changed, 72 insertions, 0 deletions

diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
new file mode 100644
index 0000000000..2f6d53a859
--- /dev/null
+++ b/indra/newview/llpanelprofile.h
@@ -0,0 +1,72 @@
+/** 
+* @file llpanelprofile.h
+* @brief Profile panel
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+* 
+* Copyright (c) 2009, Linden Research, Inc.
+* 
+* 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
+* 
+* 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
+* 
+* 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.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLPANELPROFILE_H
+#define LL_LLPANELPROFILE_H
+
+#include "llviewerprecompiledheaders.h"
+#include "llpanel.h"
+#include "llpanelavatar.h"
+
+class LLTabContainer;
+
+class LLPanelProfile : public LLPanel
+{
+	LOG_CLASS(LLPanelProfile);
+
+public:
+	virtual BOOL postBuild();
+
+	virtual void onOpen(const LLSD& key) {};
+
+	virtual void togglePanel(LLPanel*);
+
+protected:
+	LLPanelProfile();
+	~LLPanelProfile();
+
+	void onTabSelected(const LLSD& param);
+
+	void setAllChildrenVisible(BOOL visible);
+
+
+	LLTabContainer* mTabContainer;
+	
+	typedef std::map<std::string, LLPanelProfileTab*> profile_tabs_t;
+	profile_tabs_t mTabs;
+
+	LLUUID mAvatarId;
+};
+
+
+
+#endif //LL_LLPANELPROFILE_H