diff options
| author | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
| commit | b215c724c1394e7c27a0309341ffc3b4f2154b25 (patch) | |
| tree | c9a5eba93a0d333285bc2e87e15ed40e546f7d28 /indra/newview/llfloaterworldmap.h | |
| parent | c7b6a25728cd360348d1c3da5ace0971767206a4 (diff) | |
| parent | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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; |