diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 4 | 
3 files changed, 5 insertions, 11 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index d29e0314b4..e6845127e3 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -521,8 +521,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,                      dialog,                      parent_estate_id,                      region_id, -                    position, -                    true); +                    position);                  if (!gIMMgr->isDNDMessageSend(session_id))                  { @@ -1112,8 +1111,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,                      IM_SESSION_INVITE,                      parent_estate_id,                      region_id, -                    position, -                    true); +                    position);              }              else              { @@ -1138,8 +1136,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,                      IM_SESSION_INVITE,                      parent_estate_id,                      region_id, -                    position, -                    true); +                    position);              }              break; diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index c3131a513a..0dea11ce66 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3725,8 +3725,7 @@ public:  				IM_SESSION_INVITE,  				message_params["parent_estate_id"].asInteger(),  				message_params["region_id"].asUUID(), -				ll_vector3_from_sd(message_params["position"]), -				true); +				ll_vector3_from_sd(message_params["position"]));  			if (LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat))  			{ diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index cfe927ecc0..c3115e2b45 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -4527,9 +4527,7 @@ void LLVivoxVoiceClient::messageEvent(  						IM_NOTHING_SPECIAL,		// default arg  						0,						// default arg  						LLUUID::null,			// default arg -						LLVector3::zero,		// default arg -						true);					// prepend name and make it a link to the user's profile - +						LLVector3::zero);		// default arg  			}  		}		  	}  | 
