diff options
author | James Cook <james@lindenlab.com> | 2010-05-19 16:41:13 -0700 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-05-19 16:41:13 -0700 |
commit | 6e22cb75b434aa551d5b6133f505a629c397a93e (patch) | |
tree | 876f54b4ef5e4a886e16970a13644a066da34316 /indra/newview/llgrouplist.cpp | |
parent | 2c87657659eb6cdd0a0f135b78d290ed180cc21d (diff) | |
parent | ac17ec0c287246dbb00d21a6b4994949eac69737 (diff) |
Merge
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" |