diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-20 19:17:38 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-20 19:17:38 +0200 |
| commit | 13a6077b780117be0fa3a054426d139ca1d35df9 (patch) | |
| tree | 0597cfbf98db2787f75b3ec33fe2637c14f0ee7e /indra/newview/llviewerfloaterreg.cpp | |
| parent | 58439da4c696f8dd6002e6399e4563cbda251a1e (diff) | |
Implemented normal task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets.
Implemented LLDialog(LLScriptFloater) and Script Chiclets.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 7772f613f0..812107dd72 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -124,6 +124,7 @@ #include "llpreviewsound.h" #include "llpreviewtexture.h" #include "llsyswellwindow.h" +#include "llscriptfloater.h" // *NOTE: Please add files in alphabetical order to keep merges easy. @@ -171,6 +172,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("hud", "floater_hud.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHUD>); LLFloaterReg::add("impanel", "floater_im_session.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLIMFloater>); + LLFloaterReg::add("script_floater", "floater_script.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLScriptFloater>); LLFloaterReg::add("incoming_call", "floater_incoming_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLIncomingCallDialog>); LLFloaterReg::add("inventory", "floater_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterInventory>); LLFloaterReg::add("inspect", "floater_inspect.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterInspect>); |