livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed EXT-6350 [HARD CODED] - System message when loosing connectivity needs to be localized 

extracted strings used in LLAppViewer::forceDisconnect(...) calls

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/41/

--HG--
branch : product-engine
meow-7.2.2
Igor Borovkov 2010-03-17 13:22:29 +02:00
parent 24d95dc0ba
commit 8bf0509959
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewermenu.cpp
View File

@ -86,6 +86,7 @@
#include "lltoolmgr.h"
#include "lltoolpie.h"
#include "lltoolselectland.h"
#include "lltrans.h"
#include "llviewergenericmessage.h"
#include "llviewerhelp.h"
#include "llviewermenufile.h" // init_menu_file()
@ -7047,7 +7048,7 @@ LLVOAvatar* find_avatar_from_object( const LLUUID& object_id )
void handle_disconnect_viewer(void *)
{
LLAppViewer::instance()->forceDisconnect("Testing viewer disconnect");
LLAppViewer::instance()->forceDisconnect(LLTrans::getString("TestingDisconnect"));
}
void force_error_breakpoint(void *)

2
indra/newview/llviewermessage.cpp
View File

@ -3080,7 +3080,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
<< x << ":" << y
<< " current pos " << gAgent.getPositionGlobal()
<< LL_ENDL;
LLAppViewer::instance()->forceDisconnect("You were sent to an invalid region.");
LLAppViewer::instance()->forceDisconnect(LLTrans::getString("SentToInvalidRegion"));
return;
}

3
indra/newview/llworld.cpp
View File

@ -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;
}

4
indra/newview/skins/default/xui/en/strings.xml
View File

@ -56,7 +56,9 @@
<string name="SavingSettings">Saving your settings...</string>
<string name="LoggingOut">Logging out...</string>
<string name="ShuttingDown">Shutting down...</string>
<string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string>
<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
<string name="TestingDisconnect">Testing viewer disconnect</string>
<!-- Tooltip, lltooltipview.cpp -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->