diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-16 10:47:58 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-16 10:47:58 -0500 |
| commit | 211c18d3b7de319570bb3be7f3607654d7ec98ac (patch) | |
| tree | 8d33bdd7e5bc94e7e8bb5abfc78da8f1e724c8a2 | |
| parent | 6539fe4a671ae73badc3aea6e00d497daafc7733 (diff) | |
linux build fix
| -rwxr-xr-x | indra/newview/app_settings/logcontrol.xml | 1 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index de3732f339..6a798e1d42 100755 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -42,6 +42,7 @@ </array> <key>tags</key> <array> + <string>Avatar</string> <!-- sample entry for debugging specific items <string>Avatar</string> <string>Inventory</string> diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 765220cdd4..25c7120a19 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3225,7 +3225,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) debug_line += llformat(" hov_z: %f", mHoverOffset[2]); } F32 elapsed = mLastAppearanceMessageTimer.getElapsedTimeF32(); - static char *elapsed_chars = "Xx*..."; + static const char *elapsed_chars = "Xx*..."; U32 bucket = U32(elapsed*2); if (bucket < strlen(elapsed_chars)) { |