Skip to content
Snippets Groups Projects
Commit e78db00d authored by Vadim Savchuk's avatar Vadim Savchuk
Browse files

merge

--HG--
branch : product-engine
parents 9fdae441 764afa89
No related branches found
No related tags found
No related merge requests found
...@@ -186,7 +186,6 @@ LLNavigationBar::LLNavigationBar() ...@@ -186,7 +186,6 @@ LLNavigationBar::LLNavigationBar()
LLNavigationBar::~LLNavigationBar() LLNavigationBar::~LLNavigationBar()
{ {
mTeleportFinishConnection.disconnect(); mTeleportFinishConnection.disconnect();
LLSearchHistory::getInstance()->save();
} }
BOOL LLNavigationBar::postBuild() BOOL LLNavigationBar::postBuild()
......
...@@ -34,12 +34,15 @@ ...@@ -34,12 +34,15 @@
#define LL_LLSEARCHHISTORY_H #define LL_LLSEARCHHISTORY_H
#include "llsingleton.h" #include "llsingleton.h"
#include "llui.h"
/** /**
* Search history container able to save and load history from file. * Search history container able to save and load history from file.
* History is stored in chronological order, most recent at the beginning. * History is stored in chronological order, most recent at the beginning.
*/ */
class LLSearchHistory : public LLSingleton<LLSearchHistory> class LLSearchHistory : public LLSingleton<LLSearchHistory>, private LLDestroyClass<LLSearchHistory>
{ {
friend class LLDestroyClass<LLSearchHistory>;
public: public:
// Forward declaration // Forward declaration
...@@ -130,6 +133,12 @@ class LLSearchHistory : public LLSingleton<LLSearchHistory> ...@@ -130,6 +133,12 @@ class LLSearchHistory : public LLSingleton<LLSearchHistory>
private: private:
// Implementation of LLDestroyClass<LLSearchHistory>
static void destroyClass()
{
LLSearchHistory::getInstance()->save();
}
search_history_list_t mSearchHistory; search_history_list_t mSearchHistory;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment