Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Actually fix the removal of Starting session

Browse Source 
Thanks for the assistance and testing, Router~!
This commit is contained in:
Lirusaito
2019-04-17 15:01:48 -04:00
parent 41c56f706a
commit 68a4975fe1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llimpanel.cpp
View File

@@ -288,7 +288,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
mInputEditor(NULL),
mHistoryEditor(NULL),
mSessionInitialized(false),
mSessionStartMsgPos(0),
mSessionStartMsgPos({0, 0}),
mSessionType(P2P_SESSION),
mSessionUUID(session_id),
mLogLabel(log_label),
@@ -396,12 +396,14 @@ LLFloaterIMPanel::LLFloaterIMPanel(
LLUIString session_start = sSessionStartString;
session_start.setArg("[NAME]", getTitle());
mSessionStartMsgPos = mHistoryEditor->getWText().length();
mSessionStartMsgPos.first = mHistoryEditor->getLength();
addHistoryLine(
session_start,
gSavedSettings.getColor4("SystemChatColor"),
false);
mSessionStartMsgPos.second = mHistoryEditor->getLength() - mSessionStartMsgPos.first;
}
}
}
@@ -1490,7 +1492,7 @@ void LLFloaterIMPanel::sessionInitReplyReceived(const LLUUID& session_id)
mVoiceChannel->updateSessionID(session_id);
mSessionInitialized = true;
mHistoryEditor->remove(mSessionStartMsgPos, sSessionStartString.size(), true);
mHistoryEditor->remove(mSessionStartMsgPos.first, mSessionStartMsgPos.second, true);
//and now, send the queued msg
for (LLSD::array_iterator iter = mQueuedMsgsForInit.beginArray();

4
indra/newview/llimpanel.h
View File

@@ -191,8 +191,8 @@ private:
bool mSessionInitialized;
// Where does the "Starting session..." line start?
S32 mSessionStartMsgPos;
// Where does the "Starting session..." line start and how long is it?
std::pair<S32, S32> mSessionStartMsgPos;
SType mSessionType;