diff options
Diffstat (limited to 'linden/indra/newview/lldrawable.cpp')
-rw-r--r-- | linden/indra/newview/lldrawable.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp index 4b6bd7c..228049f 100644 --- a/linden/indra/newview/lldrawable.cpp +++ b/linden/indra/newview/lldrawable.cpp | |||
@@ -409,14 +409,14 @@ void LLDrawable::makeActive() | |||
409 | } | 409 | } |
410 | 410 | ||
411 | 411 | ||
412 | void LLDrawable::makeStatic() | 412 | void LLDrawable::makeStatic(BOOL warning_enabled) |
413 | { | 413 | { |
414 | if (isState(ACTIVE)) | 414 | if (isState(ACTIVE)) |
415 | { | 415 | { |
416 | clearState(ACTIVE); | 416 | clearState(ACTIVE); |
417 | gPipeline.setActive(this, FALSE); | 417 | gPipeline.setActive(this, FALSE); |
418 | 418 | ||
419 | if (mParent.notNull() && mParent->isActive()) | 419 | if (mParent.notNull() && mParent->isActive() && warning_enabled) |
420 | { | 420 | { |
421 | llwarns << "Drawable becamse static with active parent!" << llendl; | 421 | llwarns << "Drawable becamse static with active parent!" << llendl; |
422 | } | 422 | } |
@@ -431,7 +431,7 @@ void LLDrawable::makeStatic() | |||
431 | { | 431 | { |
432 | llwarns << "Child drawable has unknown parent." << llendl; | 432 | llwarns << "Child drawable has unknown parent." << llendl; |
433 | } | 433 | } |
434 | child_drawable->makeStatic(); | 434 | child_drawable->makeStatic(warning_enabled); |
435 | } | 435 | } |
436 | } | 436 | } |
437 | 437 | ||