diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-27 19:45:38 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-27 19:45:38 -0700 |
| commit | 1bdfe7ec471efb94acc4a8f98e8084c08199c9da (patch) | |
| tree | 93f844ff1083d18bd076b6f884ab0a22cbf530ae /indra/newview/llviewerfloaterreg.cpp | |
| parent | 3a473bd8ca301a5cd7e0284e40da890d598d394d (diff) | |
| parent | 9eef4b6c569b48975cd74ef80b1393febe1387d8 (diff) | |
EXP-1202 : pull from richard/viewer-experience-fui
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 09a50300d0..0b3b8e23a5 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -182,7 +182,6 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("bumps", "floater_bumps.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBump>); LLFloaterReg::add("camera", "floater_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>); - LLFloaterReg::add("nearby_chat", "floater_nearby_chat.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNearbyChat>); LLFloaterReg::add("chat_bar", "floater_chat_bar.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNearbyChatBar>); LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>); |