diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 22:47:31 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 22:47:31 +0200 |
| commit | c21396181b090b626d7a9f989bcead2e517bb75f (patch) | |
| tree | c543941ee817a5b5952ff670d8ae03cd4663bd88 /indra/newview/llviewermenu.h | |
| parent | 62085f9f7904aa20406aa4f0122065aec3a786ee (diff) | |
| parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewermenu.h')
| -rw-r--r-- | indra/newview/llviewermenu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index 7abb0c8e74..6882405407 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -143,7 +143,7 @@ void handle_export_selected( void * ); // Convert strings to internal types U32 render_type_from_string(std::string render_type); U32 feature_from_string(std::string feature); -U32 info_display_from_string(std::string info_display); +U64 info_display_from_string(std::string info_display); class LLViewerMenuHolderGL : public LLMenuHolderGL { |