Commits

Vadim Savchuk committed 526d86e

STORM-1543 WIP Removed invalid IOR_BUSY response option.

Addressing review feedback.

Comments (0)

Files changed (2)

indra/newview/llviewermessage.cpp

 	std::string log_message;
 	S32 button = LLNotificationsUtil::getSelectedOption(notification, response);
 
-	// The offer notification has no Busy button,
-	// so if we're in busy mode, assume busy response (STORM-1543).
-	if (gAgent.getBusy())
-	{
-		button = IOR_BUSY;
-	}
-	
 	LLInventoryObserver* opener = NULL;
 	LLViewerInventoryCategory* catp = NULL;
 	catp = (LLViewerInventoryCategory*)gInventory.getCategory(mObjectID);
 	// TODO: when task inventory offers can also be handled the new way, migrate the code that sets these strings here:
 	from_string = chatHistory_string = mFromName;
 	
-	bool busy=FALSE;
+	bool busy = gAgent.getBusy();
 	
 	switch(button)
 	{
 		}
 		break;
 
-	case IOR_BUSY:
-		//Busy falls through to decline.  Says to make busy message.
-		busy=TRUE;
 	case IOR_MUTE:
 		// MUTE falls through to decline
 	case IOR_DECLINE:
 		from_string = chatHistory_string = mFromName;
 	}
 	
-	bool busy=FALSE;
+	bool busy = gAgent.getBusy();
 	
 	switch(button)
 	{
 		}	// end switch (mIM)
 			break;
 			
-		case IOR_BUSY:
-			//Busy falls through to decline.  Says to make busy message.
-			busy=TRUE;
 		case IOR_MUTE:
 			// MUTE falls through to decline
 		case IOR_DECLINE:

indra/newview/llviewermessage.h

 	IOR_ACCEPT,
 	IOR_DECLINE,
 	IOR_MUTE,
-	IOR_BUSY,
 	IOR_SHOW
 };