From fad53523aed2e1218c8fdcebffcbe7cb4c78cba9 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 8 Oct 2009 03:41:35 +0000 Subject: * EXT-1357 - Client gets stuck when invited to a voice call. Incorrect .xml file specified. (merged from viewer-2.0-qa-4) --- indra/newview/llimview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 556eb5ffd7..7a7b062b5d 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1194,7 +1194,7 @@ LLIMMgr::LLIMMgr() : static bool registered_dialog = false; if (!registered_dialog) { - LLFloaterReg::add("incoming_call", "floater_incoming_call.xml.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); + LLFloaterReg::add("incoming_call", "floater_incoming_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); registered_dialog = true; } @@ -1432,7 +1432,7 @@ LLUUID LLIMMgr::addP2PSession(const std::string& name, { LLUUID session_id = addSession(name, IM_NOTHING_SPECIAL, other_participant_id); - LLVoiceChannelP2P* voice_channel = (LLVoiceChannelP2P*) LLIMModel::getInstance()->getSpeakerManager(session_id); + LLVoiceChannelP2P* voice_channel = dynamic_cast(LLIMModel::getInstance()->getSpeakerManager(session_id)); if (voice_channel) { voice_channel->setSessionHandle(voice_session_handle, caller_uri); -- cgit v1.2.3