diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:37:51 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:37:51 -0400 |
| commit | d4018e22446904f25ec1363717df86ba7e48bbdf (patch) | |
| tree | 07599a378f7ca0997a25076fa495762456b61172 /indra/newview | |
| parent | 525de5554022b946641db446a5b5153f9e670e10 (diff) | |
Manual fix for merge compile errors.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 6f8f0381f1..b2e9564f7d 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -45,6 +45,7 @@ #include "llspeakers.h" #include "lltextutil.h" #include "lltransientfloatermgr.h" +#include "llviewercontrol.h" #include "llviewerdisplayname.h" #include "llviewerwindow.h" #include "llvoicechannel.h" |