From d012628c8c1a41a4ffeb7e533c8f24db6d6c54cb Mon Sep 17 00:00:00 2001 From: andreykproductengine 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterforgetuser.cpp') 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)); -- cgit v1.3