diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-17 11:51:04 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-17 11:51:04 +0000 |
| commit | 8331c1a83776abcfeeec4629d9dfbdd2c689d14f (patch) | |
| tree | 1654d69e483252c9c4d12e1012800de4740510e2 /indra/newview/llworld.cpp | |
| parent | 59e4b000a3ed41a3c83ae99501adc3eccf64367e (diff) | |
| parent | 5cae8140f4dfbdd9c4b3237a0d47248753180913 (diff) | |
PE merge
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; } |