diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 10:04:23 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 10:04:23 +0100 |
commit | 02fe5d60c0a6664bb86254347ce31467da2d90c3 (patch) | |
tree | fe1420806e453a14a63b4f16ad2d566a8c9a0d1a /indra/newview/llimview.cpp | |
parent | cd0ab5b41eda85b9cb4855f61c3f7e4ca5150797 (diff) | |
parent | b550bb0f09197c35b80d18d540761a7831c3e89b (diff) |
merge from 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 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" |