diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 09:56:48 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 09:56:48 +0100 |
| commit | b550bb0f09197c35b80d18d540761a7831c3e89b (patch) | |
| tree | d86f5574202c7415c93fc45c7a5cd1f7fe892d06 /indra/newview/llimview.cpp | |
| parent | 8e474b095a9d228d62101540433937abdf623842 (diff) | |
| parent | a4fc76a0f749e07d703ddb7ed923d7c4ea94ab7e (diff) | |
merge from PE's viewer-trunk
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 c143ac9dea..039df69454 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -43,6 +43,7 @@ #include "llhttpclient.h" #include "llsdutil_math.h" #include "llstring.h" +#include "lltextutil.h" #include "lltrans.h" #include "lluictrlfactory.h" @@ -65,7 +66,6 @@ #include "llnearbychat.h" #include "llspeakers.h" //for LLIMSpeakerMgr #include "lltextbox.h" -#include "lltextutil.h" #include "llviewercontrol.h" #include "llviewerparcelmgr.h" |