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

SL-12486 Grids share folders and some data, so don't compare grids.

master
andreykproductengine 2020-01-07 01:13:36 +02:00
parent 19caca91e9
commit d012628c8c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterforgetuser.cpp
View File

@ -138,7 +138,7 @@ void LLFloaterForgetUser::onForgetClicked()
const std::string grid = user_data["grid"];
const std::string user_name = user_data["label"]; // for favorites
if (delete_data && user_id == LLStartUp::getUserId() && grid == LLGridManager::getInstance()->getGrid())
if (delete_data && user_id == LLStartUp::getUserId())
{
// we can't delete data for user that is currently logged in
LLNotificationsUtil::add("LoginCantRemoveCurUsername", LLSD(), LLSD(), boost::bind(onConfirmLogout, _1, _2, user_name));

2
indra/newview/skins/default/xui/en/floater_forget_user.xml
View File

@ -35,5 +35,5 @@
name="delete_data"
top_pad="5"
width="260"
tool_tip="Deletes local files: chat history, last session screenshot, browser cookies, teleport history, toolbar settings, e t c"/>
tool_tip="Deletes local files: chat history, last session screenshot, browser cookies, teleport history, toolbar settings, e t c. Some of local files are shared between grids."/>
</floater>