diff options
| author | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
| commit | 864dd45b2b8dec32552112ed76246c9b0b3f7f0b (patch) | |
| tree | de5ce187a9b26f67d2515fa140aa8d313e64a51d /indra/newview/llviewerfloaterreg.cpp | |
| parent | 5d4959e3a107a6a40014528dd8e17e46bf128540 (diff) | |
| parent | 7ff7709f9fd07de5cc9b039562d0fe3794f6ce36 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 7bff92fe98..158c857031 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -255,7 +255,6 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("upload_sound", "floater_sound_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSoundPreview>, "upload"); LLFloaterReg::add("volume_pulldown", "floater_volume_pulldown.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterVolumePulldown>); - LLFloaterReg::add("voice_call", "floater_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCall>); LLFloaterReg::add("voice_controls", "floater_voice_controls.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLCallFloater>); LLFloaterReg::add("whitelist_entry", "floater_whitelist_entry.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWhiteListEntry>); |