diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-28 21:21:20 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-28 21:21:20 +0300 |
| commit | 663a6dc2c30ba27cae17d589480cca29f54ef025 (patch) | |
| tree | 116df78eed529d230c41877642f96702710d1a5f /indra/newview/llviewermenu.cpp | |
| parent | 89839721eadf0b5379042530e01c9e5061ba6c35 (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merged master(DRTVWR-497) into DRTVWR-482
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index b6c7be2ed3..e6bd20b58f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -740,6 +740,10 @@ U32 render_type_from_string(std::string render_type) { return LLPipeline::RENDER_TYPE_AVATAR; } + else if ("controlAV" == render_type) // Animesh + { + return LLPipeline::RENDER_TYPE_CONTROL_AV; + } else if ("surfacePatch" == render_type) { return LLPipeline::RENDER_TYPE_TERRAIN; |