diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-07-15 22:59:59 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-07-15 22:59:59 +0300 |
| commit | 9131f7705974c84127bcc3109d2ab1c56cb1f009 (patch) | |
| tree | 59b7494d361a9ad570ed3bcec9efdb6a5dff6166 /indra/newview/llviewerfloaterreg.cpp | |
| parent | 02441157a0d22619ccf2a2ee735c8f5251b54fdb (diff) | |
| parent | 3d4433de504c0ac17f2d3d98d3cbc43955cc1dda (diff) | |
merge changes for MAINT-4734
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rwxr-xr-x | indra/newview/llviewerfloaterreg.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 1dad9dd506..028fd4915b 100755 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -89,6 +89,7 @@ #include "llfloatermodelpreview.h" #include "llfloaternamedesc.h" #include "llfloaternotificationsconsole.h" +#include "llfloaternotificationstabbed.h" #include "llfloaterobjectweights.h" #include "llfloateropenobject.h" #include "llfloateroutbox.h" @@ -263,7 +264,8 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("mini_map", "floater_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMap>); LLFloaterReg::add("notifications_console", "floater_notifications_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationConsole>); - LLFloaterReg::add("notification_well_window", "floater_sys_well.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNotificationWellWindow>); + + LLFloaterReg::add("notification_well_window", "floater_notifications_tabbed.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationsTabbed>); LLFloaterReg::add("object_weights", "floater_object_weights.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterObjectWeights>); LLFloaterReg::add("openobject", "floater_openobject.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterOpenObject>); |