livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed line endings to unix for my last comit

meow-7.2.2
TankMaster 2011-01-04 15:21:59 -08:00
parent c6db4dce2b
commit da14ac38f8
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llcommon/indra_constants.h
View File

@ -297,12 +297,12 @@ const U32 START_LOCATION_ID_COUNT = 6;
// group constants
const U32 GROUP_MIN_SIZE = 2;
// gMaxAgentGroups is now sent by login.cgi, which
// looks it up from globals.xml.
//
// For now we need an old default value however,
// so the viewer can be deployed ahead of login.cgi.
//
// gMaxAgentGroups is now sent by login.cgi, which
// looks it up from globals.xml.
//
// For now we need an old default value however,
// so the viewer can be deployed ahead of login.cgi.
//
const S32 DEFAULT_MAX_AGENT_GROUPS = 25;
// radius within which a chat message is fully audible

22
indra/newview/llstartup.cpp
View File

@ -3186,17 +3186,17 @@ 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;
}
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