diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-08 03:41:35 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-08 03:41:35 +0000 |
| commit | fad53523aed2e1218c8fdcebffcbe7cb4c78cba9 (patch) | |
| tree | 8290ff8d34f0e8740d73e2c3330b12892371ddd0 /indra/newview | |
| parent | 084413bb093bae3677489033b37bb02182fdac0e (diff) | |
* EXT-1357 - Client gets stuck when invited to a voice call. Incorrect .xml file specified.
(merged from viewer-2.0-qa-4)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<LLIncomingCallDialog>); + LLFloaterReg::add("incoming_call", "floater_incoming_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLIncomingCallDialog>); 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<LLVoiceChannelP2P*>(LLIMModel::getInstance()->getSpeakerManager(session_id)); if (voice_channel) { voice_channel->setSessionHandle(voice_session_handle, caller_uri); |