aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llimpanel.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:45 -0500
committerJacek Antonelli2008-08-15 23:45:45 -0500
commitb1831d23bfdd0c876ac8cf687d6d3cf02345e28e (patch)
treee977d6563859940ad05af08b7bc150f57a7cb548 /linden/indra/newview/llimpanel.cpp
parentSecond Life viewer sources 1.20.3 (diff)
downloadmeta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.zip
meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.tar.gz
meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.tar.bz2
meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.tar.xz
Second Life viewer sources 1.20.4
Diffstat (limited to 'linden/indra/newview/llimpanel.cpp')
-rw-r--r--linden/indra/newview/llimpanel.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 6f06117..3cb9dfb 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1061,7 +1061,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
1061 mSessionUUID(session_id), 1061 mSessionUUID(session_id),
1062 mVoiceChannel(NULL), 1062 mVoiceChannel(NULL),
1063 mSessionInitialized(FALSE), 1063 mSessionInitialized(FALSE),
1064 1064 mSessionStartMsgPos(0),
1065 mOtherParticipantUUID(other_participant_id), 1065 mOtherParticipantUUID(other_participant_id),
1066 mDialog(dialog), 1066 mDialog(dialog),
1067 mTyping(FALSE), 1067 mTyping(FALSE),
@@ -1090,6 +1090,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
1090 mSessionUUID(session_id), 1090 mSessionUUID(session_id),
1091 mVoiceChannel(NULL), 1091 mVoiceChannel(NULL),
1092 mSessionInitialized(FALSE), 1092 mSessionInitialized(FALSE),
1093 mSessionStartMsgPos(0),
1093 mOtherParticipantUUID(other_participant_id), 1094 mOtherParticipantUUID(other_participant_id),
1094 mDialog(dialog), 1095 mDialog(dialog),
1095 mTyping(FALSE), 1096 mTyping(FALSE),
@@ -1182,6 +1183,7 @@ void LLFloaterIMPanel::init(const LLString& session_label)
1182 //we don't need to need to wait for any responses 1183 //we don't need to need to wait for any responses
1183 //so we're already initialized 1184 //so we're already initialized
1184 mSessionInitialized = TRUE; 1185 mSessionInitialized = TRUE;
1186 mSessionStartMsgPos = 0;
1185 } 1187 }
1186 else 1188 else
1187 { 1189 {