diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-14 10:22:24 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-14 10:22:24 +0100 |
| commit | a5f365c331149b03366be421aa1597dfbcb1bb33 (patch) | |
| tree | d792c599804e87f892cfcca12e8260e68be3855a /indra/newview/llgrouplist.cpp | |
| parent | 3ce4cecd681f3f95c7b1fe04db75c384d0b0854e (diff) | |
| parent | 07678ad2db9ffca1cacdab4f28c63e01e8e6f514 (diff) | |
merge from PE's viewer-trunk
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..3224ac6d9b 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -40,12 +40,12 @@ #include "llmenugl.h" #include "lltextbox.h" #include "lltrans.h" +#include "lluitextutil.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" |