From 1b550aaec246063090fe7143145d69eebfbd4680 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 11 Oct 2007 00:28:42 +0000 Subject: EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release --- indra/newview/llpanelgroup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelgroup.cpp') diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp index f3e9eaf2fe..a96b66984b 100644 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -168,11 +168,11 @@ LLPanelGroup::LLPanelGroup(const std::string& filename, mFactoryMap["roles_sub_tab"] = LLCallbackMap(LLPanelGroupRolesSubTab::createTab, &mID); mFactoryMap["actions_sub_tab"] = LLCallbackMap(LLPanelGroupActionsSubTab::createTab, &mID); + gGroupMgr->addObserver(this); + // Pass on construction of this panel to the control factory. gUICtrlFactory->buildPanel(this, filename, &getFactoryMap()); mFilename = filename; - - gGroupMgr->addObserver(this); } LLPanelGroup::~LLPanelGroup() -- cgit v1.3