diff options
author | Merov Linden <merov@lindenlab.com> | 2012-08-27 09:50:23 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-08-27 09:50:23 -0700 |
commit | 99e0c35c40354a3ad4d9e6e0d92a73c15c844441 (patch) | |
tree | a8f2f50548185f72893256258f1d28dd82bd5efb /indra/newview/llstartup.cpp | |
parent | fd62242dd6e5fa464db07e0b8ebf3ab54a6067a2 (diff) | |
parent | 0804ecb3551514d3321dfd4e3b17c3dab9693444 (diff) |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index ab72b4e512..c827b39d0e 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -64,6 +64,7 @@ #include "llmessageconfig.h" #include "llmoveview.h" #include "llimfloatercontainer.h" +#include "llnearbychat.h" #include "llnotifications.h" #include "llnotificationsutil.h" #include "llteleporthistory.h" |