diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfeaturemanager.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp index 947e6ad..56e0469 100644 --- a/linden/indra/newview/llfeaturemanager.cpp +++ b/linden/indra/newview/llfeaturemanager.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -372,10 +372,14 @@ void LLFeatureManager::loadGPUClass() | |||
372 | 372 | ||
373 | char* ex = strtok(expr, ".*"); | 373 | char* ex = strtok(expr, ".*"); |
374 | char* rnd = (char*) renderer.c_str(); | 374 | char* rnd = (char*) renderer.c_str(); |
375 | 375 | ||
376 | while (ex != NULL && rnd != NULL) | 376 | while (ex != NULL && rnd != NULL) |
377 | { | 377 | { |
378 | rnd = strstr(rnd, ex); | 378 | rnd = strstr(rnd, ex); |
379 | if (rnd != NULL) | ||
380 | { | ||
381 | rnd += strlen(ex); | ||
382 | } | ||
379 | ex = strtok(NULL, ".*"); | 383 | ex = strtok(NULL, ".*"); |
380 | } | 384 | } |
381 | 385 | ||