diff options
author | McCabe Maxsted | 2011-04-13 19:39:59 -0700 |
---|---|---|
committer | McCabe Maxsted | 2011-04-13 19:39:59 -0700 |
commit | fcffe9e420207e6eb2ee43c6f22f985ed1ae347f (patch) | |
tree | 368e0115ddb81f5f82d237f1075920f2792ca647 /linden/indra/newview | |
parent | Use the mini-map radar prefs for the full radar window (diff) | |
download | meta-impy-fcffe9e420207e6eb2ee43c6f22f985ed1ae347f.zip meta-impy-fcffe9e420207e6eb2ee43c6f22f985ed1ae347f.tar.gz meta-impy-fcffe9e420207e6eb2ee43c6f22f985ed1ae347f.tar.bz2 meta-impy-fcffe9e420207e6eb2ee43c6f22f985ed1ae347f.tar.xz |
Added button for the full viewer to the minimap. Now need to think about the xui, hrm
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/panelradar.cpp | 9 | ||||
-rw-r--r-- | linden/indra/newview/panelradar.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp index a868ee2..c94c0d1 100644 --- a/linden/indra/newview/panelradar.cpp +++ b/linden/indra/newview/panelradar.cpp | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "llagent.h" | 32 | #include "llagent.h" |
33 | #include "llchat.h" | 33 | #include "llchat.h" |
34 | #include "llfloateravatarinfo.h" | 34 | #include "llfloateravatarinfo.h" |
35 | #include "llfloateravatarlist.h" | ||
35 | #include "llfloaterchat.h" | 36 | #include "llfloaterchat.h" |
36 | #include "llfloaterfriends.h" | 37 | #include "llfloaterfriends.h" |
37 | #include "llfloatergroupinvite.h" | 38 | #include "llfloatergroupinvite.h" |
@@ -95,6 +96,7 @@ BOOL PanelRadar::postBuild() | |||
95 | //childSetAction("estate_eject_btn", onClickEjectFromEstate, this); | 96 | //childSetAction("estate_eject_btn", onClickEjectFromEstate, this); |
96 | //childSetAction("estate_ban_btn", onClickBanFromEstate, this); | 97 | //childSetAction("estate_ban_btn", onClickBanFromEstate, this); |
97 | childSetAction("ban_btn", onClickBan, this); | 98 | childSetAction("ban_btn", onClickBan, this); |
99 | childSetAction("full_radar_btn", onClickFullRadar, this); | ||
98 | 100 | ||
99 | setDefaultBtn("im_btn"); | 101 | setDefaultBtn("im_btn"); |
100 | 102 | ||
@@ -1025,6 +1027,13 @@ void PanelRadar::onClickAR(void* user_data) | |||
1025 | } | 1027 | } |
1026 | 1028 | ||
1027 | 1029 | ||
1030 | // static | ||
1031 | void PanelRadar::onClickFullRadar(void* user_data) | ||
1032 | { | ||
1033 | LLFloaterAvatarList::toggle(NULL); | ||
1034 | } | ||
1035 | |||
1036 | |||
1028 | //static | 1037 | //static |
1029 | /* Don't use until the UI can be worked out | 1038 | /* Don't use until the UI can be worked out |
1030 | void PanelRadar::onClickBanFromEstate(void* user_data) | 1039 | void PanelRadar::onClickBanFromEstate(void* user_data) |
diff --git a/linden/indra/newview/panelradar.h b/linden/indra/newview/panelradar.h index 59e6aff..ff5912c 100644 --- a/linden/indra/newview/panelradar.h +++ b/linden/indra/newview/panelradar.h | |||
@@ -108,6 +108,7 @@ private: | |||
108 | static void onClickAR(void* user_data); | 108 | static void onClickAR(void* user_data); |
109 | //static void onClickEjectFromEstate(void* user_data); Not working yet | 109 | //static void onClickEjectFromEstate(void* user_data); Not working yet |
110 | //static void onClickBanFromEstate(void* user_data); | 110 | //static void onClickBanFromEstate(void* user_data); |
111 | static void onClickFullRadar(void* user_data); | ||
111 | 112 | ||
112 | static void callbackAR(void* user_data); | 113 | static void callbackAR(void* user_data); |
113 | static bool callbackFreeze(const LLSD& notification, const LLSD& response); | 114 | static bool callbackFreeze(const LLSD& notification, const LLSD& response); |