diff options
author | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
commit | 1911993cc7761216c70b95e77b49da383c9e162d (patch) | |
tree | 23ec59769bcaf192324e48141c94affe0ebf2ea0 /indra/newview/llfloatervoicedevicesettings.cpp | |
parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) | |
parent | 83c01b041d5b6527b3741b73d075afc4b7ad134c (diff) |
merge
Diffstat (limited to 'indra/newview/llfloatervoicedevicesettings.cpp')
-rw-r--r-- | indra/newview/llfloatervoicedevicesettings.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp index 34277001ee..fa863653b4 100644 --- a/indra/newview/llfloatervoicedevicesettings.cpp +++ b/indra/newview/llfloatervoicedevicesettings.cpp @@ -332,7 +332,6 @@ LLFloaterVoiceDeviceSettings::LLFloaterVoiceDeviceSettings(const LLSD& seed) mFactoryMap["device_settings"] = LLCallbackMap(createPanelVoiceDeviceSettings, this); // do not automatically open singleton floaters (as result of getInstance()) // BOOL no_open = FALSE; -// Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_device_settings.xml", no_open); } BOOL LLFloaterVoiceDeviceSettings::postBuild() { |