summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroup.cpp
diff options
context:
space:
mode:
authorMonroe Williams <monroe@lindenlab.com>2007-08-02 01:18:34 +0000
committerMonroe Williams <monroe@lindenlab.com>2007-08-02 01:18:34 +0000
commit7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch)
tree3c34a3a180b5275bd4166b0056765c5868f56447 /indra/newview/llpanelgroup.cpp
parentf6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff)
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
-rw-r--r--indra/newview/llpanelgroup.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 23f7a4aba6..7a288a1730 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -105,16 +105,7 @@ void LLPanelGroupTab::handleClickHelp()
LLAlertDialog* dialogp = gViewerWindow->alertXml("GenericAlert", args);
if (dialogp)
{
- LLView* viewp = this;
- LLFloater* root_floater = NULL;
- while(viewp)
- {
- if(viewp->getWidgetType() == WIDGET_TYPE_FLOATER)
- {
- root_floater = (LLFloater*)viewp;
- }
- viewp = viewp->getParent();
- }
+ LLFloater* root_floater = gFloaterView->getParentFloater(this);;
if (root_floater)
{
root_floater->addDependentFloater(dialogp);