From d012628c8c1a41a4ffeb7e533c8f24db6d6c54cb Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 7 Jan 2020 01:13:36 +0200
Subject: SL-12486 Grids share folders and some data, so don't compare grids.
---
indra/newview/llfloaterforgetuser.cpp | 2 +-
indra/newview/skins/default/xui/en/floater_forget_user.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp
index 6271ccfa18..79aa0d31cc 100644
--- a/indra/newview/llfloaterforgetuser.cpp
+++ b/indra/newview/llfloaterforgetuser.cpp
@@ -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));
diff --git a/indra/newview/skins/default/xui/en/floater_forget_user.xml b/indra/newview/skins/default/xui/en/floater_forget_user.xml
index 86228d49ee..a9ec1b74a3 100644
--- a/indra/newview/skins/default/xui/en/floater_forget_user.xml
+++ b/indra/newview/skins/default/xui/en/floater_forget_user.xml
@@ -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>
--
cgit v1.2.3