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

Make sure to set CURRENT_GRID default arg as soon as login process starts and remove cruft to set CURRENT_GRID all over the place

meow-7.2.2
Ansariel 2016-01-13 15:20:07 +01:00
parent 0b72c66ce1
commit fe164b57ce
8 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/fschathistory.cpp
View File

@ -417,9 +417,7 @@ public:
|| (mSourceType == CHAT_SOURCE_SYSTEM && mType != CHAT_TYPE_RADAR)
|| mAvatarID.isNull())
{
//mFrom = LLTrans::getString("SECOND_LIFE");
//[FIX FIRE-2852] Changed function to find the right Gridname
mFrom = LLGridManager::getInstance()->getGridLabel();
mFrom = LLTrans::getString("CURRENT_GRID");
if(!chat.mFromName.empty() && (mFrom != chat.mFromName))
{
mFrom += " (" + chat.mFromName + ")";

1
indra/newview/fspanellogin.cpp
View File

@ -871,7 +871,6 @@ void FSPanelLogin::onClickConnect(void *)
{
// user must type in something into the username field
LLSD args;
args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel();
LLNotificationsUtil::add("MustHaveAccountToLogIn", args);
}
else

8
indra/newview/llappviewer.cpp
View File

@ -3282,12 +3282,8 @@ bool LLAppViewer::initConfiguration()
LLStringUtil::format_map_t args;
//<FS:AW set the APP_NAME to Firestorm instead of the grid connected to>
// //args["[APP_NAME]"] = LLTrans::getString("SECOND_LIFE");
// //[FIX FIRE-2852] Changed function to find the right Gridname
// args["[APP_NAME]"] = LLGridManager::getInstance()->getGridLabel();
// //[FIX FIRE-2919] Making sure Current_grid has the right value
args["[APP_NAME]"] = LLTrans::getString("APP_NAME");
//<FS:AW set the APP_NAME to Firestorm instead of the grid connected to>
args["[CURRENT_GRID]"] = LLGridManager::getInstance()->getGridLabel();
splash_msg = LLTrans::getString("StartupLoading", args);
LLSplashScreen::show();
LLSplashScreen::update(splash_msg);
@ -5420,15 +5416,11 @@ void LLAppViewer::forceDisconnect(const std::string& mesg)
{
// Tell users what happened
args["ERROR_MESSAGE"] = big_reason;
//[FIX FIRE-2919] Making sure Current_grid has the right value
args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel();
LLNotificationsUtil::add("ErrorMessage", args, LLSD(), &finish_forced_disconnect);
}
else
{
args["MESSAGE"] = big_reason;
//[FIX FIRE-2919] Making sure Current_grid has the right value
args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel();
LLNotificationsUtil::add("YouHaveBeenLoggedOut", args, LLSD(), &finish_disconnect );
}
}

2
indra/newview/llfloaterauction.cpp
View File

@ -437,8 +437,6 @@ void LLFloaterAuction::onClickSellToAnyone(void* data)
args["LAND_SIZE"] = llformat("%d", area);
args["SALE_PRICE"] = llformat("%d", sale_price);
args["NAME"] = LLTrans::getString("Anyone");
// <FS:Ansariel> Fill [CURRENT_GRID] placeholder (FIRE-6777)
args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel();
LLNotification::Params params("ConfirmLandSaleChange"); // Re-use existing dialog
params.substitutions(args)

2
indra/newview/llfloatersellland.cpp
View File

@ -491,8 +491,6 @@ void LLFloaterSellLandUI::doSellLand(void *userdata)
args["LAND_SIZE"] = llformat("%d",area);
args["SALE_PRICE"] = llformat("%d",sale_price);
args["NAME"] = authorizedBuyerName;
// <FS:Ansariel> Fill [CURRENT_GRID] placeholder (FIRE-6777)
args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel();
LLNotification::Params params("ConfirmLandSaleChange");
params.substitutions(args)

2
indra/newview/llfloatertos.cpp
View File

@ -307,8 +307,6 @@ void LLFloaterTOS::onCancel( void* userdata )
LLSD args;
LLFloaterTOS* self = (LLFloaterTOS*) userdata;
LL_INFOS("TOS") << "User disagrees with TOS." << LL_ENDL;
//[FIX FIRE-3143 SJ] Making sure Current_grid has the right value
args["[CURRENT_GRID]"] = LLGridManager::getInstance()->getGridLabel();
LLNotificationsUtil::add("MustAgreeToLogIn", args, LLSD(), login_alert_done);
if(self->mReplyPumpName != "")

11
indra/newview/llstartup.cpp
View File

@ -1476,7 +1476,7 @@ bool idle_startup()
// <AW: crash report grid correctness>
eLastExecEvent last_exec_event = gLastExecEvent;
const std::string current_grid =LLGridManager::getInstance()->getGrid();
const std::string current_grid = LLGridManager::getInstance()->getGrid();
const std::string last_grid = gSavedSettings.getString("LastConnectedGrid");
if (!last_grid.empty() && last_grid != current_grid)
{
@ -1484,6 +1484,7 @@ bool idle_startup()
// since a bad OpenSim setup can crash the viewer a lot
last_exec_event = LAST_EXEC_NORMAL;
}
LLTrans::setDefaultArg("CURRENT_GRID", LLGridManager::getInstance()->getGridLabel());
// </AW: crash report grid correctness>
// Setting initial values...
@ -2751,14 +2752,8 @@ bool idle_startup()
// initial outfit, but if the load hasn't started
// already then something is wrong so fall back
// to generic outfits. JC
// <FS:Ansariel> Set CURRENT_GRID parameter
//LLNotificationsUtil::add("WelcomeChooseSex", LLSD(), LLSD(),
// callback_choose_gender);
LLSD args;
args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel();
LLNotificationsUtil::add("WelcomeChooseSex", args, LLSD(),
LLNotificationsUtil::add("WelcomeChooseSex", LLSD(), LLSD(),
callback_choose_gender);
// </FS:Ansariel> Set CURRENT_GRID parameter
LLStartUp::setStartupState( STATE_CLEANUP );
}

1
indra/newview/llurldispatcher.cpp
View File

@ -272,7 +272,6 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const LLSLURL&
{
LLSD args;
args["SLURL"] = slurl.getLocationString();
args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel();
args["GRID"] = LLGridManager::getInstance()->getGridLabel(slurl.getGrid());
LLNotificationsUtil::add("CantTeleportToGrid", args);
return;