diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-02-03 17:56:36 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-02-03 17:56:36 -0500 |
commit | d49e5bcbe26a4b148ce1d20a60d16581f41134c0 (patch) | |
tree | bd8caf39e789437574119304688ba3c71b7940cf /indra/newview/llviewerfloaterreg.cpp | |
parent | 1e47e5b42d352d5d838eeb96984dbf6497020e32 (diff) | |
parent | 9d71aae8273fd44dada82b1005c121255dc14dda (diff) |
automated merge viewer2.0->viewer2.0
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(); |