summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-17 17:44:49 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-17 17:44:49 +0000
commit087d4b7bc831ba3611c023fdc9feb37b0481b0d5 (patch)
tree1b856e59be8fb196e51eb128d4ac82a016d449db /indra/newview
parent818a6038ebfd23beddb4d64ea8f730da6acf0b9a (diff)
fix casts.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llstartup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index cd8051a0a9..fa07278cb9 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2899,8 +2899,8 @@ bool process_login_success_response()
text = response["agent_region_access"].asString();
if (!text.empty())
{
- int preferredMaturity =
- llmin(LLAgent::convertTextToMaturity(text[0]),
+ U32 preferredMaturity =
+ llmin((U32)LLAgent::convertTextToMaturity(text[0]),
gSavedSettings.getU32("PreferredMaturity"));
gSavedSettings.setU32("PreferredMaturity", preferredMaturity);
}