diff options
| author | skolb <none@none> | 2009-12-03 14:33:38 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-03 14:33:38 -0800 |
| commit | faa188322a72b86b6a167834a4d2cd664da112bc (patch) | |
| tree | d498ee9f8642cf17d0b4555b0ad02db42ec73bb2 /indra/newview/llviewerfloaterreg.cpp | |
| parent | ec34503e0193514ffbb1ccb1249013adb0a9e320 (diff) | |
| parent | 4535fd64fbee1ee0dd3bfe54c090cfa9c56a11b6 (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 b5454e7298..7c9bd582dd 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -250,7 +250,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>); |