diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
| commit | 7d87e55c547a537526ee121dc68df6513d513f05 (patch) | |
| tree | 3a62fbf7d145ca686945f89119ace8089d3d59b1 /indra/newview/llfloatervoicedevicesettings.cpp | |
| parent | 59407cdb9c40d96cf0c4fb13ee5f3a59934ef655 (diff) | |
| parent | 07c04df983123d5fcf1c45f3900e66e1fd8542bc (diff) | |
Merge PE revisions 3765-3786 from https://hg.aws.productengine.com/secondlife/viewer-2-0/
Diffstat (limited to 'indra/newview/llfloatervoicedevicesettings.cpp')
| -rw-r--r-- | indra/newview/llfloatervoicedevicesettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp index b64257b11d..aca9198f59 100644 --- a/indra/newview/llfloatervoicedevicesettings.cpp +++ b/indra/newview/llfloatervoicedevicesettings.cpp @@ -43,7 +43,7 @@ #include "llsliderctrl.h" #include "llviewercontrol.h" #include "llvoiceclient.h" -#include "llimpanel.h" +#include "llvoicechannel.h" // Library includes (after viewer) #include "lluictrlfactory.h" |