Merge

1 files changed, 11 insertions, 42 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index db6b2041f8..b6032f4dfa 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1610,6 +1610,13 @@ void LLOutgoingCallDialog::show(const LLSD& key)
 		}
 		childSetTextArg("nearby", "[VOICE_CHANNEL_NAME]", channel_name);
 		childSetTextArg("nearby_P2P", "[VOICE_CHANNEL_NAME]", mPayload["disconnected_channel_name"].asString());
+
+		// skipping "You will now be reconnected to nearby" in notification when call is ended by disabling voice,
+		// so no reconnection to nearby chat happens (EXT-4397)
+		bool voice_works = LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking();
+		std::string reconnect_nearby = voice_works ? LLTrans::getString("reconnect_nearby") : std::string();
+		childSetTextArg("nearby", "[RECONNECT_NEARBY]", reconnect_nearby);
+		childSetTextArg("nearby_P2P", "[RECONNECT_NEARBY]", reconnect_nearby);
 	}
 
 	std::string callee_name = mPayload["session_name"].asString();
@@ -1709,6 +1716,8 @@ BOOL LLOutgoingCallDialog::postBuild()
 
 	childSetAction("Cancel", onCancel, this);
 
+	setCanDrag(FALSE);
+
 	return success;
 }
 
@@ -1808,6 +1817,8 @@ BOOL LLIncomingCallDialog::postBuild()
 		mLifetimeTimer.stop();
 	}
 
+	setCanDrag(FALSE);
+
 	return TRUE;
 }
 
@@ -2985,48 +2996,6 @@ public:
 	}
 };
 
-LLCallInfoDialog::LLCallInfoDialog(const LLSD& payload) : LLCallDialog(payload)
-{
-}
-
-BOOL LLCallInfoDialog::postBuild()
-{
-	// init notification's lifetime
-	std::istringstream ss( getString("lifetime") );
-	if (!(ss >> mLifetime))
-	{
-		mLifetime = DEFAULT_LIFETIME;
-	}
-	return LLCallDialog::postBuild();
-}
-
-void LLCallInfoDialog::onOpen(const LLSD& key)
-{
-	if(key.has("msg"))
-	{
-		std::string msg = key["msg"];
-		getChild<LLTextBox>("msg")->setValue(msg);
-	}
-
-	mLifetimeTimer.start();
-}
-
-void LLCallInfoDialog::show(const std::string& status_name, const LLSD& args)
-{
-	LLUIString message = LLTrans::getString(status_name);
-	message.setArgs(args);
-
-	LLSD payload;
-	payload["msg"] = message;
-	LLFloater* inst = LLFloaterReg::findInstance("call_info");
-
-	// avoid recreate instance with the same message
-	if (inst == NULL || message.getString() != inst->getChild<LLTextBox>("msg")->getValue())
-	{
-		LLFloaterReg::showInstance("call_info", payload);
-	}
-}
-
 LLHTTPRegistration<LLViewerChatterBoxSessionStartReply>
    gHTTPRegistrationMessageChatterboxsessionstartreply(
 	   "/message/ChatterBoxSessionStartReply");