diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-21 17:54:53 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-21 17:54:53 +0200 |
| commit | d08ff06230ecc723eb872117c3c0b1031c08d9fe (patch) | |
| tree | fbac1ee8ff1fa46494fa3802b802eaecdb11c63f /indra/newview/llavatarlist.cpp | |
| parent | eb4f026181c83dfd2106cce3ab1fde6a3fe60ec3 (diff) | |
| parent | c353e640fa80a335be741dd0edfdc9952ea3cdea (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llavatarlist.cpp')
| -rw-r--r-- | indra/newview/llavatarlist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index 71b23e1383..5865df3e26 100644 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -33,7 +33,7 @@ #include "llviewerprecompiledheaders.h" #include "llavatarlist.h" -#include "llagent.h" // for comparator +#include "llagentdata.h" // for comparator // newview #include "llcallingcard.h" // for LLAvatarTracker @@ -425,11 +425,11 @@ bool LLAvatarItemAgentOnTopComparator::doCompare(const LLAvatarListItem* avatar_ { //keep agent on top, if first is agent, //then we need to return true to elevate this id, otherwise false. - if(avatar_item1->getAvatarId() == gAgent.getID()) + if(avatar_item1->getAvatarId() == gAgentID) { return true; } - else if (avatar_item2->getAvatarId() == gAgent.getID()) + else if (avatar_item2->getAvatarId() == gAgentID) { return false; } |