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/llimview.cpp | |
| parent | 2c87657659eb6cdd0a0f135b78d290ed180cc21d (diff) | |
| parent | ac17ec0c287246dbb00d21a6b4994949eac69737 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 0c88b9f3a1..fa8390f5ab 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -44,6 +44,7 @@ #include "llhttpclient.h" #include "llsdutil_math.h" #include "llstring.h" +#include "lltextutil.h" #include "lltrans.h" #include "lluictrlfactory.h" @@ -66,7 +67,6 @@ #include "llnearbychat.h" #include "llspeakers.h" //for LLIMSpeakerMgr #include "lltextbox.h" -#include "lltextutil.h" #include "llviewercontrol.h" #include "llviewerparcelmgr.h" |