From bbf4bc88b827b1a4f51e032cecca892430236d97 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Tue, 17 Aug 2010 17:09:23 +0300
Subject: [PATCH] EXT-7083 FIXED initializing the viewer preferred maturity
with the value received from the server on login.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/863/.
--HG--
branch : product-engine
---
indra/newview/llstartup.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 96088fed9cc..3aad39bcbfc 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2933,9 +2933,8 @@ bool process_login_success_response()
text = response["agent_region_access"].asString();
if (!text.empty())
{
- U32 preferredMaturity =
- llmin((U32)LLAgent::convertTextToMaturity(text[0]),
- gSavedSettings.getU32("PreferredMaturity"));
+ U32 preferredMaturity = (U32)LLAgent::convertTextToMaturity(text[0]);
+
gSavedSettings.setU32("PreferredMaturity", preferredMaturity);
}
// During the AO transition, this flag will be true. Then the flag will
--
GitLab