summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorBill Curtis <bill.curtis@gmail.com>2010-11-08 10:54:58 -0800
committerBill Curtis <bill.curtis@gmail.com>2010-11-08 10:54:58 -0800
commit3fa059409aad9d7b5aedb4ed112cb52da6990ac4 (patch)
tree533d4ea13d515f9ab1c045139b159ea89723d815 /indra/newview/llstartup.cpp
parent65d847de38614a67ed1bdd86445c1c80f4638cc3 (diff)
changes to read max-agent-groups from login.cgi response
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 975d1f9f32..5781398faa 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";
@@ -2944,7 +2945,7 @@ bool process_login_success_response()
text = response["circuit_code"].asString();
if(!text.empty())
{
- gMessageSystem->mOurCircuitCode = strtoul(text.c_str(), NULL, 10);
+ gMessageSystem->mOurCircuitCode = strtoult(ext.c_str(), NULL, 10);
}
std::string sim_ip_str = response["sim_ip"];
std::string sim_port_str = response["sim_port"];
@@ -3148,6 +3149,9 @@ bool process_login_success_response()
LLViewerMedia::openIDSetup(openid_url, openid_token);
}
+ std::string max_agent_groups(response["max-agent-groups"]);
+ gMaxAgentGroups = atoi(max_agent_groups.c_str());
+
bool success = false;
// JC: gesture loading done below, when we have an asset system
// in place. Don't delete/clear gUserCredentials until then.