diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
| commit | 73a97010e6c8c7874fdc1778ab46e492f77d9394 (patch) | |
| tree | f0c8efb1cebcc6157c8e6678cf0eb39b5792a1d7 /indra/newview/llfloaterproperties.cpp | |
| parent | dedb5be906b53d1ea8601ff6b9c4b726fda02da8 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llfloaterproperties.cpp')
| -rw-r--r-- | indra/newview/llfloaterproperties.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp index dc72b66949..efc273c6e5 100644 --- a/indra/newview/llfloaterproperties.cpp +++ b/indra/newview/llfloaterproperties.cpp @@ -44,7 +44,7 @@ #include "llbutton.h" #include "llcheckboxctrl.h" #include "llfloatergroupinfo.h" -#include "llfriendactions.h" +#include "llavataractions.h" #include "llinventorymodel.h" #include "lllineeditor.h" #include "llradiogroup.h" @@ -611,7 +611,7 @@ void LLFloaterProperties::onClickCreator(void* data) if(!item) return; if(!item->getCreatorUUID().isNull()) { - LLFriendActions::showProfile(item->getCreatorUUID()); + LLAvatarActions::showProfile(item->getCreatorUUID()); } } @@ -628,7 +628,7 @@ void LLFloaterProperties::onClickOwner(void* data) } else { - LLFriendActions::showProfile(item->getPermissions().getOwner()); + LLAvatarActions::showProfile(item->getPermissions().getOwner()); } } |