diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
| commit | e271c47994fc9dd86bda9d6ad7e79799229e52aa (patch) | |
| tree | 39a95ca75541cab5952708b6cfed741394bf9e9c /indra/llui | |
| parent | 8cd5d361600f34a0a7fa504a721bea3301191644 (diff) | |
| parent | d41202336b7c797bc3fe4feffa8be2164518e845 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 8145d6d347..52812dc050 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -713,6 +713,13 @@ void LLFloater::closeFloater(bool app_quitting) make_ui_sound("UISndWindowClose"); } + //If floater is a dependent, remove it from parent (dependee) + LLFloater* dependee = mDependeeHandle.get(); + if (dependee) + { + dependee->removeDependentFloater(this); + } + // now close dependent floater for(handle_set_iter_t dependent_it = mDependents.begin(); dependent_it != mDependents.end(); ) |