diff options
author | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
commit | 6bbd490107abe162c114ccd990636ae6b16f46f8 (patch) | |
tree | 13d7f4c1da1f28fe7ed8b73bcea82cea35ba9526 /indra/newview/llfloaternotificationsconsole.cpp | |
parent | 48e0087ce3096e3ebe778124cdb21b87eedcc07c (diff) | |
parent | 02d8197019dcecec7aee80a104c4644ddb4807ca (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaternotificationsconsole.cpp')
-rw-r--r-- | indra/newview/llfloaternotificationsconsole.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp index b7bca5c6cd..3d37c878ad 100644 --- a/indra/newview/llfloaternotificationsconsole.cpp +++ b/indra/newview/llfloaternotificationsconsole.cpp @@ -65,7 +65,7 @@ LLNotificationChannelPanel::LLNotificationChannelPanel(const std::string& channe mChannelRejectsPtr = LLNotificationChannelPtr( LLNotificationChannel::buildChannel(channel_name + "rejects", mChannelPtr->getParentChannelName(), !boost::bind(mChannelPtr->getFilter(), _1))); - buildPanel(this, "panel_notifications_channel.xml"); + buildFromFile( "panel_notifications_channel.xml"); } BOOL LLNotificationChannelPanel::postBuild() |