merge -r 78989:80279 Branch_1-19-0-Viewer-> release

Changes from 1.19.0.2 and 1.19.0.3

DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9226 - lock icon not appearing in properties window for no-modify inventory items
DEV-8771 Preferences > Web has truncated text in the Address: section, ported and tested minor xml change
DEV-9736 commit 1.19.0 second set of translated xui strings
DEV-9825 Make the region info message a passive notification
DEV-7714 - Korean viewer crashes on startup.
DEV-9759 - Stand up button etc dissapear offscreen after using mouselook
DEV-9938 client-readme-voice.txt missing from open source distribution
DEV-9436 Changed default SL window size to 1000x700, to allow buttons in UI to have proper labels (Communicate) and search to fit onscreen.
DEV-10031    	Clicking on another users classifieds ad then closing asks you to save changes
DEV-10066    	Checking to select a role does not enable the apply button
DEV-8809    	stray 'Done" on the Profile Web tab
DEV-8515 Debug settings overrides do not work for booleans.  svn merge -r77376:77377 sl-parcelmedia-3.  OK by cg.
DEV-10083: Preferences window docks at an offscreen position and cannot be moved vertically
DEV-10186 - LLIMPanel kills the framerate for group ims.
DEV-10108 Viewer freeze and delay in opening map
DEV-10115 Visible flashing of prim highlight when editing
DEV-10112 	Parcel audio play setting is not remembered when crossing over a parcel with no media
DEV-10109 	Alt and left/right arrow keys dont move you between tabs
DEV-10093 	Login Page > SL Release link overlaps Quit when viewer resized
DEV-10048 	Redocking the Contact list causes the communicate ui to get ugly
DEV-8131  	 Deutsch "System Default" is translated as "System Error" in language preferences
DEV-10209 - reverted floater_test.xml to empty floater.
DEV-10255 - Clicking on gestures button moves open windows
DEV-10046 	Pressing escape doesnt cause the chat history or inventory windows to lose focus
DEV-10399 -- Update required version of QuickTime library to 7.4.1 for 1.19.0 Viewer
DEV-10410 - Toggling voice causes layout problems in toolbar
DEV-8562 - Viewer crash just after login
DEV-10147 - "LLXmlTree parse failed" with settings_releasecandidate.xml
DEV-9874 - Land forsale icon in menubar overlaps pushobject restriction icon
DEV-9701 - Upload Animation window: Button missing in Stopped window state
DEV-10355 - Client crashes when viewing the proposals tab in group information
DEV-10521 My Landmarks dropdown list adds a repetition to EOF every time it's opened
DEV-10496 Groups>Proposals>Past Vote text gets chomped
DEV-10499 Defaulted buttons in floater dialogs remain highlighted when not in focus
DEV-5611 - Crash reporter appears in the background on mac (Changed launch to use open instead of direct binary call)
DEV-10704 - Crash reporter not initializing boolean, causing false exec_froze reporting (Added initilizer to constructor)

1 files changed, 41 insertions, 68 deletions

diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 6ca3e1e085..8034ed6f03 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -70,7 +70,7 @@ bool agentCanAddToRole(const LLUUID& group_id,
 	}
 
 	//make sure the agent is in the group
-	LLGroupMgrGroupData::member_iter mi = gdatap->mMembers.find(gAgent.getID());
+	LLGroupMgrGroupData::member_list_t::iterator mi = gdatap->mMembers.find(gAgent.getID());
 	if (mi == gdatap->mMembers.end())
 	{
 		return false;
@@ -998,8 +998,8 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 	// Build the assigned roles list.
 	//////////////////////////////////
 	// Add each role to the assigned roles list.
-	LLGroupMgrGroupData::role_iter iter = gdatap->mRoles.begin();
-	LLGroupMgrGroupData::role_iter end  = gdatap->mRoles.end();
+	LLGroupMgrGroupData::role_list_t::iterator iter = gdatap->mRoles.begin();
+	LLGroupMgrGroupData::role_list_t::iterator end  = gdatap->mRoles.end();
 
 	BOOL can_eject_members = gAgent.hasPowerInGroup(mGroupID,
 													GP_MEMBER_EJECT);
@@ -1040,7 +1040,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 					if ((*member_iter) == gAgent.getID()) continue;
 					
 					// Look up the member data.
-					LLGroupMgrGroupData::member_iter mi = 
+					LLGroupMgrGroupData::member_list_t::iterator mi = 
 									gdatap->mMembers.find((*member_iter));
 					if (mi == gdatap->mMembers.end()) continue;
 					LLGroupMemberData* member_data = (*mi).second;
@@ -1134,7 +1134,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 	if (!can_eject_members && !member_is_owner)
 	{
 		// Maybe we can eject them because we are an owner...
-		LLGroupMgrGroupData::member_iter mi = gdatap->mMembers.find(gAgent.getID());
+		LLGroupMgrGroupData::member_list_t::iterator mi = gdatap->mMembers.find(gAgent.getID());
 		if (mi != gdatap->mMembers.end())
 		{
 			LLGroupMemberData* member_data = (*mi).second;
@@ -1218,41 +1218,29 @@ void LLPanelGroupMembersSubTab::handleRoleCheck(const LLUUID& role_id,
 	LLUUID member_id;
 	
 
-	member_role_change_iter           member_end = mMemberRoleChangeData.end();
-	member_role_change_iter           member;
-	role_change_data_map_t           *role_change_datap;
-	role_change_data_map_t::iterator  role_end;
-	role_change_data_map_t::iterator  role;
-
 	std::vector<LLScrollListItem*> selection = mMembersList->getAllSelected();
-	if (selection.empty()) return;
-
-	std::vector<LLScrollListItem*>::iterator itor;
-	for (itor = selection.begin() ; 
+	if (selection.empty())
+	{
+		return;
+	}
+	
+	for (std::vector<LLScrollListItem*>::iterator itor = selection.begin() ; 
 		 itor != selection.end(); ++itor)
 	{
 		member_id = (*itor)->getUUID();
 
 		//see if we requested a change for this member before
-		member = mMemberRoleChangeData.find(member_id);
-		if ( member != member_end )
+		if ( mMemberRoleChangeData.find(member_id) == mMemberRoleChangeData.end() )
 		{
-			//this member had previously had their role data changed
-			//so grab it
-			role_change_datap = (*member).second;
-		}
-		else
-		{
-			role_change_datap = new role_change_data_map_t;
-			mMemberRoleChangeData[member_id] = role_change_datap;
+			mMemberRoleChangeData[member_id] = new role_change_data_map_t;
 		}
+		role_change_data_map_t* role_change_datap = mMemberRoleChangeData[member_id];
 
 		//now check to see if the selected group member
 		//had changed his association with the selected role before
-		role_end = role_change_datap->end();
-		role     = role_change_datap->find(role_id);
 
-		if ( role != role_end )
+		role_change_data_map_t::iterator  role = role_change_datap->find(role_id);
+		if ( role != role_change_datap->end() )
 		{
 			//see if the new change type cancels out the previous change
 			if (role->second != type)
@@ -1442,15 +1430,11 @@ void LLPanelGroupMembersSubTab::applyMemberChanges()
 
 	//we need to add all of the changed roles data
 	//for each member whose role changed
-	member_role_change_iter member_end = mMemberRoleChangeData.end();
-	member_role_change_iter member     = mMemberRoleChangeData.begin();
-
-	for (; member != member_end; member++)
+	for (member_role_changes_map_t::iterator member = mMemberRoleChangeData.begin();
+		 member != mMemberRoleChangeData.end(); ++member)
 	{
-		role_change_data_map_t::iterator role_end = member->second->end();
-		role_change_data_map_t::iterator role     = member->second->begin();
-
-		for (; role != role_end; role++)
+		for (role_change_data_map_t::iterator role = member->second->begin();
+			 role != member->second->end(); ++role)
 		{
 			gdatap->changeRoleMember(role->first, //role_id
 									 member->first, //member_id
@@ -1500,11 +1484,6 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag
 	//if we are removing a role, we store that role id away
 	//and then we have to build the powers up bases on the roles the agent
 	//is in
-	member_role_change_iter          member_end = mMemberRoleChangeData.end();
-	member_role_change_iter          member;
-	role_change_data_map_t          *role_change_datap = NULL;
-	role_change_data_map_t::iterator role_end;
-	role_change_data_map_t::iterator role;
 
 	LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
 	if (!gdatap) 
@@ -1521,8 +1500,9 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag
 	}
 
 	//see if there are unsaved role changes for this agent
-	member = mMemberRoleChangeData.find(agent_id);
-	if ( member != member_end )
+	role_change_data_map_t* role_change_datap = NULL;
+	member_role_changes_map_t::iterator member = mMemberRoleChangeData.find(agent_id);
+	if ( member != mMemberRoleChangeData.end() )
 	{
 		//this member has unsaved role changes
 		//so grab them
@@ -1535,13 +1515,13 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag
 	{
 		std::vector<LLUUID> roles_to_be_removed;
 
-		role_end = role_change_datap->end();
-		role     = role_change_datap->begin();
-
-		for (; role != role_end; role++)
+		for (role_change_data_map_t::iterator role = role_change_datap->begin();
+			 role != role_change_datap->end(); ++ role)
 		{
 			if ( role->second == RMC_ADD )
+			{
 				new_powers |= gdatap->getRolePowers(role->first);
+			}
 			else
 			{
 				roles_to_be_removed.push_back(role->first);
@@ -1550,12 +1530,8 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag
 
 		//loop over the member's current roles, summing up
 		//the powers (not including the role we are removing)
-		std::map<LLUUID,LLGroupRoleData*>::iterator current_role =
-			member_data->roleBegin();
-		std::map<LLUUID,LLGroupRoleData*>::iterator end_role = 
-			member_data->roleEnd();
-
-		for (; current_role != end_role; current_role++)
+		for (LLGroupMemberData::role_list_t::iterator current_role = member_data->roleBegin();
+			 current_role != member_data->roleEnd(); ++current_role)
 		{
 			bool role_in_remove_list =
 				(std::find(roles_to_be_removed.begin(),
@@ -1588,13 +1564,10 @@ bool LLPanelGroupMembersSubTab::getRoleChangeType(const LLUUID& member_id,
 												  const LLUUID& role_id,
 												  LLRoleMemberChangeType& type)
 {
-	member_role_change_iter           member_changes_iter;
-	role_change_data_map_t::iterator  role_changes_iter;
-
-	member_changes_iter = mMemberRoleChangeData.find(member_id);
+	member_role_changes_map_t::iterator member_changes_iter = mMemberRoleChangeData.find(member_id);
 	if ( member_changes_iter != mMemberRoleChangeData.end() )
 	{
-		role_changes_iter = member_changes_iter->second->find(role_id);
+		role_change_data_map_t::iterator role_changes_iter = member_changes_iter->second->find(role_id);
 		if ( role_changes_iter != member_changes_iter->second->end() )
 		{
 			type = role_changes_iter->second;
@@ -1692,7 +1665,7 @@ void LLPanelGroupMembersSubTab::updateMembers()
 		return;
 	}
 		
-	LLGroupMgrGroupData::member_iter end = gdatap->mMembers.end();
+	LLGroupMgrGroupData::member_list_t::iterator end = gdatap->mMembers.end();
 
 	S32 i = 0;
 	for( ; mMemberProgress != end && i<UPDATE_MEMBERS_PER_FRAME; 
@@ -1976,8 +1949,8 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
 
 		LLScrollListItem* item = NULL;
 
-		LLGroupMgrGroupData::role_iter rit = gdatap->mRoles.begin();
-		LLGroupMgrGroupData::role_iter end = gdatap->mRoles.end();
+		LLGroupMgrGroupData::role_list_t::iterator rit = gdatap->mRoles.begin();
+		LLGroupMgrGroupData::role_list_t::iterator end = gdatap->mRoles.end();
 
 		for ( ; rit != end; ++rit)
 		{
@@ -2160,8 +2133,8 @@ void LLPanelGroupRolesSubTab::buildMembersList()
 	if (item->getUUID().isNull())
 	{
 		// Special cased 'Everyone' role
-		LLGroupMgrGroupData::member_iter mit = gdatap->mMembers.begin();
-		LLGroupMgrGroupData::member_iter end = gdatap->mMembers.end();
+		LLGroupMgrGroupData::member_list_t::iterator mit = gdatap->mMembers.begin();
+		LLGroupMgrGroupData::member_list_t::iterator end = gdatap->mMembers.end();
 		for ( ; mit != end; ++mit)
 		{
 			mAssignedMembersList->addNameItem((*mit).first);
@@ -2169,7 +2142,7 @@ void LLPanelGroupRolesSubTab::buildMembersList()
 	}
 	else
 	{
-		LLGroupMgrGroupData::role_iter rit = gdatap->mRoles.find(item->getUUID());
+		LLGroupMgrGroupData::role_list_t::iterator rit = gdatap->mRoles.find(item->getUUID());
 		if (rit != gdatap->mRoles.end())
 		{
 			LLGroupRoleData* rdatap = (*rit).second;
@@ -2622,8 +2595,8 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
 
 	if (gdatap->isMemberDataComplete())
 	{
-		LLGroupMgrGroupData::member_iter it = gdatap->mMembers.begin();
-		LLGroupMgrGroupData::member_iter end = gdatap->mMembers.end();
+		LLGroupMgrGroupData::member_list_t::iterator it = gdatap->mMembers.begin();
+		LLGroupMgrGroupData::member_list_t::iterator end = gdatap->mMembers.end();
 		LLGroupMemberData* gmd;
 
 		for ( ; it != end; ++it)
@@ -2643,8 +2616,8 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
 
 	if (gdatap->isRoleDataComplete())
 	{
-		LLGroupMgrGroupData::role_iter it = gdatap->mRoles.begin();
-		LLGroupMgrGroupData::role_iter end = gdatap->mRoles.end();
+		LLGroupMgrGroupData::role_list_t::iterator it = gdatap->mRoles.begin();
+		LLGroupMgrGroupData::role_list_t::iterator end = gdatap->mRoles.end();
 		LLGroupRoleData* rmd;
 
 		for ( ; it != end; ++it)