diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/llpanelgroupnotices.h | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/llpanelgroupnotices.h')
| -rw-r--r-- | indra/newview/llpanelgroupnotices.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupnotices.h b/indra/newview/llpanelgroupnotices.h index 916032c1b6..a0712f1770 100644 --- a/indra/newview/llpanelgroupnotices.h +++ b/indra/newview/llpanelgroupnotices.h @@ -34,7 +34,7 @@ #define LL_LLPANELGROUPNOTICES_H #include "llpanelgroup.h" -#include "llmemory.h" +#include "llpointer.h" #include "llinventory.h" class LLLineEditor; @@ -47,7 +47,7 @@ class LLScrollListCtrl; class LLPanelGroupNotices : public LLPanelGroupTab { public: - LLPanelGroupNotices(const std::string& name, const LLUUID& group_id); + LLPanelGroupNotices(const LLUUID& group_id); virtual ~LLPanelGroupNotices(); // LLPanelGroupTab |