diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-07 23:41:29 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-07 23:41:29 +0000 |
| commit | 9828faf565d0146739495cb14270c400c9249c8d (patch) | |
| tree | 65485957eb21f5829c754bcd11f3c5bdc721578f /indra/newview/lllocationhistory.h | |
| parent | e3d84d5e88751633eac27723bc775a5ad0248906 (diff) | |
Command: Merging from https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra, revision 1245 to https://svn.aws.productengine.com/secondlife/pe/stable-1/indra, revision 1246 into P:\svn\viewer-2-0\latest\indra, ignoring ancestry
* EXT-277 - Modifications to the Location Bar Context Menu
* EXT-252 - /whisper, /shout
* EXT-254 - IM chiclet counter
* EXT-267 - 'Status' drop-down menu doesn't drop in the Side tray / Me panel
* EXT-298 - Update Places Panel Spec to reflect latest Create Landmark format
* EXT-278 - Input Field History should display human readable names
* EXT-317 - Avatar profile isn't opened in the sidetray as Profile Info panel when selecting an avatar in the search
* Changes to notification tips
* Changes to movement and camera controls
* Side Tray functionality additions and code cleanup
Diffstat (limited to 'indra/newview/lllocationhistory.h')
| -rw-r--r-- | indra/newview/lllocationhistory.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h index 19032686c1..67eabcdaca 100644 --- a/indra/newview/lllocationhistory.h +++ b/indra/newview/lllocationhistory.h @@ -37,6 +37,7 @@ #include <vector> #include <string> +#include <map> #include <boost/function.hpp> class LLLocationHistory: public LLSingleton<LLLocationHistory> @@ -50,8 +51,10 @@ public: LLLocationHistory(); - void addItem(std::string item); + void addItem(const std::string & item, const std::string & tooltip); + bool touchItem(const std::string & item); void removeItems(); + std::string getToolTip(const std::string & item) const; 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; @@ -62,9 +65,11 @@ public: void dump() const; private: - std::vector<std::string> mItems; - std::string mFilename; /// File to store the history to. - loaded_signal_t mLoadedSignal; + const static char delimiter; + std::vector<std::string> mItems; + std::map<std::string, std::string> mToolTips; + std::string mFilename; /// File to store the history to. + loaded_signal_t mLoadedSignal; }; #endif |