diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-14 11:19:33 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-14 11:19:33 -0800 |
| commit | 1d022e86c84039f88c531e91ce857666acd224a1 (patch) | |
| tree | 9a8ba45529cb125a2ae5cd4672b3fd093af9b45c /indra/newview/llviewermenu.h | |
| parent | 18eb4b497fd890118e7da78dcc2eda4bd84c4ede (diff) | |
| parent | 34770cbf2ef34b7901552057a0823e502d42be1d (diff) | |
Merge
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 { |