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/llimview.cpp | |
| parent | 77f795cae59f7fa52d57ba30469cb0ddb744ac4d (diff) | |
| parent | 61cb3d31137f30f3766dbe3c22d700fbdf517d80 (diff) | |
Merge pull from dessie/viewer-public
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" |