diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
commit | 21bfcbde7ec6e6b3e8a92237b7c33879216c4e82 (patch) | |
tree | 5346bb05d7f74d2f2021883ff0ee4f32bbb56f4a /indra/newview/llchiclet.cpp | |
parent | 2da8eb43d57ae6876f9955386f604f2c56849211 (diff) | |
parent | aff85ed92c5aad3a9445cf4ec5447cc56c44dfc0 (diff) |
Merge changes
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rw-r--r-- | indra/newview/llchiclet.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 3b88bcfe20..80e27bd366 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -39,7 +39,6 @@ #include "lliconctrl.h" #include "llimpanel.h" // LLFloaterIMPanel #include "llimview.h" -#include "llfloatergroupinfo.h" #include "llfloaterreg.h" #include "llmenugl.h" #include "lloutputmonitorctrl.h" @@ -78,6 +77,7 @@ LLNotificationChiclet::LLNotificationChiclet(const Params& p) : LLChiclet(p) , mButton(NULL) , mCounterCtrl(NULL) +, mNotificationChicletWindow(NULL) { LLButton::Params button_params = p.button; button_params.rect(p.rect()); @@ -403,9 +403,7 @@ void LLIMChiclet::onMenuItemClicked(const LLSD& user_data) } else if("add" == level) { - std::string name; - gCacheName->getFullName(other_participant_id,name); - LLAvatarActions::requestFriendshipDialog(other_participant_id,name); + LLAvatarActions::requestFriendshipDialog(other_participant_id); } else if("remove" == level) { @@ -417,7 +415,7 @@ void LLIMChiclet::onMenuItemClicked(const LLSD& user_data) } else if("info" == level) { - LLFloaterGroupInfo::showFromUUID(other_participant_id); + LLGroupActions::show(other_participant_id); } } |