From ca51e8f33dfa0cd455438f11902fb1d839bf6206 Mon Sep 17 00:00:00 2001 From: James Cook Date: Mon, 27 Jul 2009 16:50:01 +0000 Subject: Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes. svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8 --- indra/newview/lllocationhistory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/lllocationhistory.h') diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h index d2a959ae62..b6552c12ca 100644 --- a/indra/newview/lllocationhistory.h +++ b/indra/newview/lllocationhistory.h @@ -50,6 +50,7 @@ public: LLLocationHistory(); void addItem(std::string item); + void removeItems(); size_t getItemCount() const { return mItems.size(); } const location_list_t& getItems() const { return mItems; } bool getMatchingItems(std::string substring, location_list_t& result) const; -- cgit v1.2.3 From e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 30 Jul 2009 23:22:41 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 --- indra/newview/lllocationhistory.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/lllocationhistory.h') diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h index b6552c12ca..19032686c1 100644 --- a/indra/newview/lllocationhistory.h +++ b/indra/newview/lllocationhistory.h @@ -46,6 +46,7 @@ class LLLocationHistory: public LLSingleton public: typedef std::vector location_list_t; typedef boost::function loaded_callback_t; + typedef boost::signals2::signal loaded_signal_t; LLLocationHistory(); @@ -54,7 +55,7 @@ public: size_t getItemCount() const { return mItems.size(); } const location_list_t& getItems() const { return mItems; } bool getMatchingItems(std::string substring, location_list_t& result) const; - void setLoadedCallback(loaded_callback_t cb) { mLoadedCallback = cb; } + boost::signals2::connection setLoadedCallback(loaded_callback_t cb) { return mLoadedSignal.connect(cb); } void save() const; void load(); @@ -63,7 +64,7 @@ public: private: std::vector mItems; std::string mFilename; /// File to store the history to. - loaded_callback_t mLoadedCallback; + loaded_signal_t mLoadedSignal; }; #endif -- cgit v1.2.3