Merged 'armin/grid-manager5' into login-manager

Conflicts:
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/llpanellogin.cpp

1 files changed, 37 insertions, 0 deletions

diff --git a/linden/indra/newview/controllerpasswords.h b/linden/indra/newview/controllerpasswords.h
new file mode 100644
index 0000000..e656659
--- /dev/null
+++ b/linden/indra/newview/controllerpasswords.h
@@ -0,0 +1,37 @@
+/*
+ *  controllerpasswords.h
+ *  SecondLife
+ *
+ *  Created by RMS on 8/5/08.
+ *
+ */
+
+#include <string>
+#include <list>
+#include "llscrolllistctrl.h"
+#include "llbutton.h"
+#include "authentication_model.h"
+
+#ifndef PL_controllerpasswords_H
+#define PL_controllerpasswords_H
+class PasswordsPrefPanel;
+
+class PasswordsController
+{
+public:
+        PasswordsController(PasswordsPrefPanel *panel);
+        virtual ~PasswordsController();
+        virtual void update();
+protected:
+        LLScrollListCtrl *accounts_list;
+        LLButton *remove_btn;
+private:
+        AuthenticationModel::connection_t mModelConnection;
+        
+        PasswordsPrefPanel *mPanel;
+        AuthenticationModel *mModel;
+        
+        std::list<std::string> mAccountData;
+};
+
+#endif // PL_controllerpasswords_H