diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 15:30:16 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 15:30:16 +0100 |
| commit | 0a74d1593513dc3209fdb29a8dc56b2794b36a29 (patch) | |
| tree | 1af644fe9ad3c62999c177ae37cbeff2ffe19d62 /indra/newview/llviewerobjectlist.cpp | |
| parent | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff) | |
| parent | 54b9992eaefe2b68d16a6264c1901f12612e99dc (diff) | |
Merge between james/viewer-identity-evolution and dessie/viewer-public
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index fc94fbafac..7e5fa2f84d 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -53,7 +53,7 @@ #include "lltooltip.h" #include "llworld.h" #include "llstring.h" -#include "llhudtext.h" +#include "llhudnametag.h" #include "lldrawable.h" #include "xform.h" #include "llsky.h" @@ -1201,7 +1201,7 @@ void LLViewerObjectList::generatePickList(LLCamera &camera) } } - LLHUDText::addPickable(mSelectPickList); + LLHUDNameTag::addPickable(mSelectPickList); for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin(); iter != LLCharacter::sInstances.end(); ++iter) |