diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
commit | ac17ec0c287246dbb00d21a6b4994949eac69737 (patch) | |
tree | 3da999db2b63dbaa74a8c7ce2572e3f17df454dd /indra/newview/llgrouplist.cpp | |
parent | 77f795cae59f7fa52d57ba30469cb0ddb744ac4d (diff) | |
parent | 61cb3d31137f30f3766dbe3c22d700fbdf517d80 (diff) |
Merge pull from dessie/viewer-public
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
-rw-r--r-- | indra/newview/llgrouplist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index 5efd99b939..da5196df45 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -39,13 +39,13 @@ #include "lliconctrl.h" #include "llmenugl.h" #include "lltextbox.h" +#include "lltextutil.h" #include "lltrans.h" // newview #include "llagent.h" #include "llgroupactions.h" #include "llfloaterreg.h" -#include "lltextutil.h" #include "llviewercontrol.h" // for gSavedSettings #include "llviewermenu.h" // for gMenuHolder #include "llvoiceclient.h" |