diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-07 09:40:03 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-07 09:40:03 -0800 |
commit | f76dab71d6db763cf87bc62d382809114c38d93d (patch) | |
tree | 48a2cd54af08b90a6a8682f3deb6f21ebd8d4050 /indra/newview/llviewerfloaterreg.cpp | |
parent | 5fba55f58e35e52485f161d069f323120ec68b6d (diff) | |
parent | 86314438477815eeac17de17799a5e0c0b7d874e (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
-rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 9ca2d3f61d..edbac69e1b 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -170,6 +170,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("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>); LLInspectAvatarUtil::registerFloater(); |