diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
| commit | baa73fddd9287ddafd2d31551cb253b355ed910a (patch) | |
| tree | e3f0986617fe6c0ee0a14df6aac13c6bb6f92507 /indra/newview/llpanelpermissions.cpp | |
| parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
| parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) | |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
| -rw-r--r-- | indra/newview/llpanelpermissions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index b4e33fec76..9fdde9e757 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -55,11 +55,11 @@ #include "lllineeditor.h" #include "llradiogroup.h" #include "llcombobox.h" -#include "llfloateravatarinfo.h" #include "lluiconstants.h" #include "lldbstrings.h" #include "llfloatergroupinfo.h" #include "llfloatergroups.h" +#include "llfriendactions.h" #include "llnamebox.h" #include "llviewercontrol.h" #include "lluictrlfactory.h" @@ -811,7 +811,7 @@ void LLPanelPermissions::onClickCreator(void *data) { LLPanelPermissions *self = (LLPanelPermissions *)data; - LLFloaterAvatarInfo::showFromObject(self->mCreatorID); + LLFriendActions::showProfile(self->mCreatorID); } // static @@ -827,7 +827,7 @@ void LLPanelPermissions::onClickOwner(void *data) } else { - LLFloaterAvatarInfo::showFromObject(self->mOwnerID); + LLFriendActions::showProfile(self->mOwnerID); } } |