summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicechannel.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-21 10:34:33 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-21 10:34:33 +0100
commit57602c9c77cb594a81a5f803382c1786435e38ab (patch)
tree83475cd13d1dae8ccc4595f11ce1ae1d47f3fa94 /indra/newview/llvoicechannel.cpp
parentf9eb0588436ca79b0286051f2bcfba0c9785ffef (diff)
parent9eaf8eaf729193542f2b766eba5cbc624806a53f (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
-rw-r--r--indra/newview/llvoicechannel.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 25b46f8e55..1b4471a9fe 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -791,6 +791,12 @@ void LLVoiceChannelP2P::handleStatusChange(EStatusType type)
}
mIgnoreNextSessionLeave = FALSE;
return;
+ case STATUS_JOINING:
+ // because we join session we expect to process session leave event in the future. EXT-7371
+ // may be this should be done in the LLVoiceChannel::handleStatusChange.
+ mIgnoreNextSessionLeave = FALSE;
+ break;
+
default:
break;
}