diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
| commit | 56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (patch) | |
| tree | c1b61940e39d615201e18259bcab1762c5a8c655 /indra/newview/llviewermenu.h | |
| parent | f684d897f532bcba87cda1f72bd19efac82f6cb6 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llviewermenu.h')
| -rw-r--r-- | indra/newview/llviewermenu.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index 01534503f3..143420e227 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -138,6 +138,11 @@ bool handle_go_to(); // Export to XML or Collada 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); + class LLViewerMenuHolderGL : public LLMenuHolderGL { public: |