diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
| commit | b2f77bee7ea98f5a4ff59e00095b5b3aff11e35b (patch) | |
| tree | 7695bb632502f24325f7044c69e30946e767abce /indra/newview/llfloaternotificationsconsole.cpp | |
| parent | 79f1cd0a73bd86ff545ad78b9b1878e350d77416 (diff) | |
| parent | ea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff) | |
merge changes for vmrg-217
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 29af81d64c..2681d4b34d 100644 --- a/indra/newview/llfloaternotificationsconsole.cpp +++ b/indra/newview/llfloaternotificationsconsole.cpp @@ -220,7 +220,7 @@ void LLFloaterNotificationConsole::addChannel(const std::string& name, bool open void LLFloaterNotificationConsole::removeChannel(const std::string& name) { LLPanel* panelp = getChild<LLPanel>(name); - getChildRef<LLLayoutStack>("notification_channels").removePanel(panelp); + getChildRef<LLView>("notification_channels").removeChild(panelp); delete panelp; updateResizeLimits(); |