diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
commit | ce0b04889d3d02d1d1eabe84a566a641db1e2d8e (patch) | |
tree | f9501fe5624d4a0a40ce6e87fe2fb87ae2d4f476 /indra/newview/llfloaterworldmap.h | |
parent | 4fb809eed5fbed458b5be883fba7196a5712aa48 (diff) | |
parent | b2ef0f99882db73680cc5dfb9570255414f7ba6d (diff) |
Merge.
Diffstat (limited to 'indra/newview/llfloaterworldmap.h')
-rw-r--r-- | indra/newview/llfloaterworldmap.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h index 783d9f4819..e3b83b2579 100644 --- a/indra/newview/llfloaterworldmap.h +++ b/indra/newview/llfloaterworldmap.h @@ -39,6 +39,7 @@ #include "lltracker.h" #include "llslurl.h" +class LLCtrlListInterface; class LLFriendObserver; class LLInventoryModel; class LLInventoryObserver; @@ -190,6 +191,10 @@ private: std::string mTrackedSimName; std::string mTrackedAvatarName; LLSLURL mSLURL; + + LLCtrlListInterface * mListFriendCombo; + LLCtrlListInterface * mListLandmarkCombo; + LLCtrlListInterface * mListSearchResults; }; extern LLFloaterWorldMap* gFloaterWorldMap; |