diff options
| author | elektrahesse | 2010-09-27 15:58:52 +0200 |
|---|---|---|
| committer | elektrahesse | 2010-09-27 15:58:52 +0200 |
| commit | 8f02b5479577b1e623b46894963d4c17329e53a9 (patch) | |
| tree | e65486cf85817079bb9e246ef466f897e481bc16 /linden/indra/newview | |
| parent | Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly (diff) | |
| download | meta-impy-8f02b5479577b1e623b46894963d4c17329e53a9.zip meta-impy-8f02b5479577b1e623b46894963d4c17329e53a9.tar.gz meta-impy-8f02b5479577b1e623b46894963d4c17329e53a9.tar.bz2 meta-impy-8f02b5479577b1e623b46894963d4c17329e53a9.tar.xz | |
Fixed a mismatch in control naming causing the viewer to crash at startup
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llhudeffectlookat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp index 23fc947..2c0431b 100644 --- a/linden/indra/newview/llhudeffectlookat.cpp +++ b/linden/indra/newview/llhudeffectlookat.cpp | |||
| @@ -574,7 +574,7 @@ void LLHUDEffectLookAt::render() | |||
| 574 | } gGL.end(); | 574 | } gGL.end(); |
| 575 | gGL.popMatrix(); | 575 | gGL.popMatrix(); |
| 576 | 576 | ||
| 577 | static BOOL *sEmeraldShowLookAtNames = rebind_llcontrol<BOOL>("EmeraldShowLookAtNames", &gSavedSettings, true); | 577 | static BOOL *sEmeraldShowLookAtNames = rebind_llcontrol<BOOL>("ShowLookAtNames", &gSavedSettings, true); |
| 578 | if (*sEmeraldShowLookAtNames) | 578 | if (*sEmeraldShowLookAtNames) |
| 579 | { | 579 | { |
| 580 | const LLFontGL* fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ); | 580 | const LLFontGL* fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ); |