diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-10-29 12:49:06 -0400 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-10-29 12:49:06 -0400 |
| commit | fb4e95f7ea0a1f6e900f6ee1de73ec02860ff815 (patch) | |
| tree | 96be2590ce94939aaae841c8a36429102f2afca9 /indra/newview/llfloatervoicedevicesettings.cpp | |
| parent | 1f0896c72a71797fcd924de1aab63ab5a5c893f9 (diff) | |
| parent | 64c2cb6ba1c089c15df6c8ef5ec5313ed5f1897f (diff) | |
Merge after pull from viewer 2.0 changes
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" |