Sync with Upstream Alchemy
Changes LLEnvManagerNew::setRegionChangeCallback to LLAgent::addRegionChangedCallback Cleans up some of the timeout policies that aren't necessary any longer. Modernizes parts of LLViewerKeyboard, updates llregistry.h Begins changeover from LLDynamicArray to std::vector Minor merge of newer, trivial SSA functions. Introduces LLAgent functions: addParcelChangedCallback and canJoinGroups Support for secondlife:///app/appearance SLapps. Cleans up older functions.
This commit is contained in:
@@ -657,13 +657,14 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
|
||||
LLNotificationsUtil::add("JoinGroup", args, notification["payload"]);
|
||||
return false;
|
||||
}
|
||||
|
||||
if(option == 0 && !group_id.isNull())
|
||||
{
|
||||
// check for promotion or demotion.
|
||||
S32 max_groups = gHippoLimits->getMaxAgentGroups();
|
||||
if(gAgent.isInGroup(group_id)) ++max_groups;
|
||||
|
||||
if(gAgent.mGroups.count() < max_groups)
|
||||
if((S32)gAgent.mGroups.size() < max_groups)
|
||||
{
|
||||
accept_invite = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user