diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-18 10:19:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-18 10:19:18 -0400 |
| commit | c86f61fd313a9f64dd0f1c5d100f39d6a3cb8eb0 (patch) | |
| tree | bd2064d723a9596b45ce2df3c33f0556cf01a681 /indra/newview/llworld.cpp | |
| parent | 896b88063ed0e08362c9e277e7ef8aba5afef0db (diff) | |
| parent | a3a4235a8904cf4d6e565c82d5d90d8a64c15180 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index d7e5b464a6..19f303ab88 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -45,6 +45,7 @@ #include "llhttpnode.h" #include "llregionhandle.h" #include "llsurface.h" +#include "lltrans.h" #include "llviewercamera.h" #include "llviewertexture.h" #include "llviewertexturelist.h" @@ -258,7 +259,7 @@ void LLWorld::removeRegion(const LLHost &host) llwarns << "gFrameTimeSeconds " << gFrameTimeSeconds << llendl; llwarns << "Disabling region " << regionp->getName() << " that agent is in!" << llendl; - LLAppViewer::instance()->forceDisconnect("You have been disconnected from the region you were in."); + LLAppViewer::instance()->forceDisconnect(LLTrans::getString("YouHaveBeenDisconnected")); return; } |