diff options
| author | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 15:58:35 -0800 |
|---|---|---|
| committer | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 15:58:35 -0800 |
| commit | d92608f1dc0a4319f5452ef7ac3121f2ef87289f (patch) | |
| tree | 25d3e52103132dd33deaa9fc39ca9d084abba002 /indra/newview/llstartup.cpp | |
| parent | 9d3174c0386e6eefba1949075971ce7f75571394 (diff) | |
| parent | 066d8c39cae11d25dcf72f98bfccd4339973ed42 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 5ee4599200..80cf7e3cd0 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -198,6 +198,7 @@ // exported globals // bool gAgentMovementCompleted = false; +S32 gMaxAgentGroups; std::string SCREEN_HOME_FILENAME = "screen_home.bmp"; std::string SCREEN_LAST_FILENAME = "screen_last.bmp"; @@ -3151,6 +3152,18 @@ bool process_login_success_response() LLViewerMedia::openIDSetup(openid_url, openid_token); } + if(response.has("max-agent-groups")) { + std::string max_agent_groups(response["max-agent-groups"]); + gMaxAgentGroups = atoi(max_agent_groups.c_str()); + LL_INFOS("LLStartup") << "gMaxAgentGroups read from login.cgi: " + << gMaxAgentGroups << LL_ENDL; + } + else { + gMaxAgentGroups = DEFAULT_MAX_AGENT_GROUPS; + LL_INFOS("LLStartup") << "using gMaxAgentGroups default: " + << gMaxAgentGroups << LL_ENDL; + } + bool success = false; // JC: gesture loading done below, when we have an asset system // in place. Don't delete/clear gUserCredentials until then. |