diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-22 17:39:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-22 17:39:03 -0700 |
| commit | a0714f01804a2a2220bd72c3adf06f097ad21b73 (patch) | |
| tree | db304a8eca349020b48ae927fd8a534264a6ed83 /indra/newview/llviewerobjectlist.cpp | |
| parent | e3ecffc180ae50a0e8b726a061ec39cbe591326e (diff) | |
| parent | de6f7e19c44d267d3224c56941c2ab27677c406f (diff) | |
Merge with viewer-development
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 05695193a5..b597e6148e 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -47,7 +47,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" @@ -1195,7 +1195,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) |