diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 15:52:44 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 15:52:44 +0000 |
| commit | fc70ca5403acdd99b2235dbf4e513a4dd806c850 (patch) | |
| tree | d6889a962571a892f4bb1c0edfa12e188a3a96a7 /indra/newview/llviewerfloaterreg.cpp | |
| parent | 8cbea388eaad8b40faa604f9d7fa2a64570548e2 (diff) | |
| parent | f7594c713d93f397440c4af2f566a33f1b6af099 (diff) | |
PE 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 658d1c9ddd..29114c33c5 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -200,7 +200,6 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("openobject", "floater_openobject.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterOpenObject>); LLFloaterReg::add("outgoing_call", "floater_outgoing_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLOutgoingCallDialog>); - LLFloaterReg::add("call_info", "floater_call_info.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLCallInfoDialog>); LLFloaterReg::add("parcel_info", "floater_preview_url.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterParcelInfo>); LLFloaterPayUtil::registerFloater(); |