diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
commit | 42e397e155239932a75fa694dc77d9dd952e3c09 (patch) | |
tree | 1d3cb00d99a585879facf6dce5b7133dbd8ad6da /indra/newview/llfloatertools.cpp | |
parent | a63b83775120f7ebe3bafb897da70e4e41bda6a4 (diff) | |
parent | c683151587067cb2758206432610d4ff4884036e (diff) |
Merged from 2.3.0-beta1 tag in viewer-development
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
-rw-r--r-- | indra/newview/llfloatertools.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 58a0d08c7d..370bf05bf7 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -350,7 +350,6 @@ LLFloaterTools::LLFloaterTools(const LLSD& key) mFactoryMap["Contents"] = LLCallbackMap(createPanelContents, this);//LLPanelContents mFactoryMap["land info panel"] = LLCallbackMap(createPanelLandInfo, this);//LLPanelLandInfo - //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_tools.xml",FALSE); mCommitCallbackRegistrar.add("BuildTool.setTool", boost::bind(&LLFloaterTools::setTool,this, _2)); mCommitCallbackRegistrar.add("BuildTool.commitZoom", boost::bind(&commit_slider_zoom, _1)); mCommitCallbackRegistrar.add("BuildTool.commitRadioFocus", boost::bind(&commit_radio_group_focus, _1)); |