Fix line endlings

1 files changed, 274 insertions, 274 deletions

diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
index df08755b35..d6bf410c55 100644
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@@ -1,274 +1,274 @@
-/**

- * @file llfloaterconversationpreview.cpp

- *

- * $LicenseInfo:firstyear=2012&license=viewerlgpl$

- * Second Life Viewer Source Code

- * Copyright (C) 2012, Linden Research, Inc.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation;

- * version 2.1 of the License only.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- *

- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

- * $/LicenseInfo$

- */

-

-#include "llviewerprecompiledheaders.h"

-

-#include "llavatarnamecache.h"

-#include "llconversationlog.h"

-#include "llfloaterconversationpreview.h"

-#include "llimview.h"

-#include "lllineeditor.h"

-#include "llfloaterimnearbychat.h"

-#include "llspinctrl.h"

-#include "lltrans.h"

-#include "llnotificationsutil.h"

-

-const std::string LL_FCP_COMPLETE_NAME("complete_name");

-const std::string LL_FCP_ACCOUNT_NAME("user_name");

-const S32 CONVERSATION_HISTORY_PAGE_SIZE = 100;

-

-LLFloaterConversationPreview::LLFloaterConversationPreview(const LLSD& session_id)

-:   LLFloater(session_id),

-    mChatHistory(NULL),

-    mSessionID(session_id.asUUID()),

-    mCurrentPage(0),

-    mPageSize(CONVERSATION_HISTORY_PAGE_SIZE),

-    mAccountName(session_id[LL_FCP_ACCOUNT_NAME]),

-    mCompleteName(session_id[LL_FCP_COMPLETE_NAME]),

-    mMutex(),

-    mShowHistory(false),

-    mMessages(NULL),

-    mHistoryThreadsBusy(false),

-    mIsGroup(false),

-    mOpened(false)

-{

-}

-

-LLFloaterConversationPreview::~LLFloaterConversationPreview()

-{

-}

-

-bool LLFloaterConversationPreview::postBuild()

-{

-    mChatHistory = getChild<LLChatHistory>("chat_history");

-

-    const LLConversation* conv = LLConversationLog::instance().getConversation(mSessionID);

-    std::string name;

-    std::string file;

-

-    if (mAccountName != "")

-    {

-        name = mCompleteName;

-        file = mAccountName;

-    }

-    else if (mSessionID != LLUUID::null && conv)

-    {

-        name = conv->getConversationName();

-        file = conv->getHistoryFileName();

-        mIsGroup = (LLIMModel::LLIMSession::GROUP_SESSION == conv->getConversationType());

-    }

-    else

-    {

-        name = LLTrans::getString("NearbyChatTitle");

-        file = "chat";

-    }

-    mChatHistoryFileName = file;

-    if (mIsGroup && !LLStringUtil::endsWith(mChatHistoryFileName, GROUP_CHAT_SUFFIX))

-    {

-        mChatHistoryFileName += GROUP_CHAT_SUFFIX;

-    }

-    LLStringUtil::format_map_t args;

-    args["[NAME]"] = name;

-    std::string title = getString("Title", args);

-    setTitle(title);

-

-    return LLFloater::postBuild();

-}

-

-void LLFloaterConversationPreview::setPages(std::list<LLSD>* messages, const std::string& file_name)

-{

-    if(file_name == mChatHistoryFileName && messages)

-    {

-        // additional protection to avoid changes of mMessages in setPages()

-        LLMutexLock lock(&mMutex);

-        if (mMessages)

-        {

-            delete mMessages; // Clean up temporary message list with "Loading..." text

-        }

-        mMessages = messages;

-        mCurrentPage = (mMessages->size() ? (mMessages->size() - 1) / mPageSize : 0);

-

-        mPageSpinner->setEnabled(true);

-        mPageSpinner->setMaxValue(mCurrentPage+1);

-        mPageSpinner->set(mCurrentPage+1);

-

-        std::string total_page_num = llformat("/ %d", mCurrentPage+1);

-        getChild<LLTextBox>("page_num_label")->setValue(total_page_num);

-        mShowHistory = true;

-    }

-    LLLoadHistoryThread* loadThread = LLLogChat::getInstance()->getLoadHistoryThread(mSessionID);

-    if (loadThread)

-    {

-        loadThread->removeLoadEndSignal(boost::bind(&LLFloaterConversationPreview::setPages, this, _1, _2));

-    }

-}

-

-void LLFloaterConversationPreview::draw()

-{

-    if(mShowHistory)

-    {

-        showHistory();

-        mShowHistory = false;

-    }

-    LLFloater::draw();

-}

-

-void LLFloaterConversationPreview::onOpen(const LLSD& key)

-{

-    if (mOpened)

-    {

-        return;

-    }

-    mOpened = true;

-    if (!LLLogChat::getInstance()->historyThreadsFinished(mSessionID))

-    {

-        LLNotificationsUtil::add("ChatHistoryIsBusyAlert");

-        mHistoryThreadsBusy = true;

-        closeFloater();

-        return;

-    }

-    LLSD load_params;

-    load_params["load_all_history"] = true;

-    load_params["cut_off_todays_date"] = false;

-    load_params["is_group"] = mIsGroup;

-

-    // The temporary message list with "Loading..." text

-    // Will be deleted upon loading completion in setPages() method

-    mMessages = new std::list<LLSD>();

-

-

-    LLSD loading;

-    loading[LL_IM_TEXT] = LLTrans::getString("loading_chat_logs");

-    mMessages->push_back(loading);

-    mPageSpinner = getChild<LLSpinCtrl>("history_page_spin");

-    mPageSpinner->setCommitCallback(boost::bind(&LLFloaterConversationPreview::onMoreHistoryBtnClick, this));

-    mPageSpinner->setMinValue(1);

-    mPageSpinner->set(1);

-    mPageSpinner->setEnabled(false);

-

-    // The actual message list to load from file

-    // Will be deleted in a separate thread LLDeleteHistoryThread not to freeze UI

-    // LLDeleteHistoryThread is started in destructor

-    std::list<LLSD>* messages = new std::list<LLSD>();

-

-    LLLogChat *log_chat_inst = LLLogChat::getInstance();

-    log_chat_inst->cleanupHistoryThreads();

-

-    LLLoadHistoryThread* loadThread = new LLLoadHistoryThread(mChatHistoryFileName, messages, load_params);

-    loadThread->setLoadEndSignal(boost::bind(&LLFloaterConversationPreview::setPages, this, _1, _2));

-    loadThread->start();

-    log_chat_inst->addLoadHistoryThread(mSessionID, loadThread);

-

-    LLDeleteHistoryThread* deleteThread = new LLDeleteHistoryThread(messages, loadThread);

-    log_chat_inst->addDeleteHistoryThread(mSessionID, deleteThread);

-

-    mShowHistory = true;

-}

-

-void LLFloaterConversationPreview::onClose(bool app_quitting)

-{

-    mOpened = false;

-    if (!mHistoryThreadsBusy)

-    {

-        LLDeleteHistoryThread* deleteThread = LLLogChat::getInstance()->getDeleteHistoryThread(mSessionID);

-        if (deleteThread)

-        {

-            deleteThread->start();

-        }

-    }

-}

-

-void LLFloaterConversationPreview::showHistory()

-{

-    // additional protection to avoid changes of mMessages in setPages

-    LLMutexLock lock(&mMutex);

-    if(mMessages == NULL || !mMessages->size() || mCurrentPage * mPageSize >= mMessages->size())

-    {

-        return;

-    }

-

-    mChatHistory->clear();

-    std::ostringstream message;

-    std::list<LLSD>::const_iterator iter = mMessages->begin();

-    std::advance(iter, mCurrentPage * mPageSize);

-

-    for (int msg_num = 0; iter != mMessages->end() && msg_num < mPageSize; ++iter, ++msg_num)

-    {

-        LLSD msg = *iter;

-

-        LLUUID from_id      = LLUUID::null;

-        std::string time    = msg["time"].asString();

-        std::string from    = msg["from"].asString();

-        std::string message = msg["message"].asString();

-

-        if (msg["from_id"].isDefined())

-        {

-            from_id = msg["from_id"].asUUID();

-        }

-        else

-        {

-            std::string legacy_name = gCacheName->buildLegacyName(from);

-            from_id = LLAvatarNameCache::getInstance()->findIdByName(legacy_name);

-        }

-

-        LLChat chat;

-        chat.mFromID = from_id;

-        chat.mSessionID = mSessionID;

-        chat.mFromName = from;

-        chat.mTimeStr = time;

-        chat.mChatStyle = CHAT_STYLE_HISTORY;

-        chat.mText = message;

-

-        if (from_id.isNull() && SYSTEM_FROM == from)

-        {

-            chat.mSourceType = CHAT_SOURCE_SYSTEM;

-

-        }

-        else if (from_id.isNull())

-        {

-            chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;

-        }

-

-        LLSD chat_args;

-        chat_args["use_plain_text_chat_history"] =

-                        gSavedSettings.getBOOL("PlainTextChatHistory");

-        chat_args["show_time"] = gSavedSettings.getBOOL("IMShowTime");

-        chat_args["show_names_for_p2p_conv"] = gSavedSettings.getBOOL("IMShowNamesForP2PConv");

-

-        mChatHistory->appendMessage(chat,chat_args);

-    }

-}

-

-void LLFloaterConversationPreview::onMoreHistoryBtnClick()

-{

-    mCurrentPage = (int)(mPageSpinner->getValueF32());

-    if (!mCurrentPage)

-    {

-        return;

-    }

-

-    mCurrentPage--;

-    mShowHistory = true;

-}

+/**
+ * @file llfloaterconversationpreview.cpp
+ *
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2012, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llavatarnamecache.h"
+#include "llconversationlog.h"
+#include "llfloaterconversationpreview.h"
+#include "llimview.h"
+#include "lllineeditor.h"
+#include "llfloaterimnearbychat.h"
+#include "llspinctrl.h"
+#include "lltrans.h"
+#include "llnotificationsutil.h"
+
+const std::string LL_FCP_COMPLETE_NAME("complete_name");
+const std::string LL_FCP_ACCOUNT_NAME("user_name");
+const S32 CONVERSATION_HISTORY_PAGE_SIZE = 100;
+
+LLFloaterConversationPreview::LLFloaterConversationPreview(const LLSD& session_id)
+:   LLFloater(session_id),
+    mChatHistory(NULL),
+    mSessionID(session_id.asUUID()),
+    mCurrentPage(0),
+    mPageSize(CONVERSATION_HISTORY_PAGE_SIZE),
+    mAccountName(session_id[LL_FCP_ACCOUNT_NAME]),
+    mCompleteName(session_id[LL_FCP_COMPLETE_NAME]),
+    mMutex(),
+    mShowHistory(false),
+    mMessages(NULL),
+    mHistoryThreadsBusy(false),
+    mIsGroup(false),
+    mOpened(false)
+{
+}
+
+LLFloaterConversationPreview::~LLFloaterConversationPreview()
+{
+}
+
+bool LLFloaterConversationPreview::postBuild()
+{
+    mChatHistory = getChild<LLChatHistory>("chat_history");
+
+    const LLConversation* conv = LLConversationLog::instance().getConversation(mSessionID);
+    std::string name;
+    std::string file;
+
+    if (mAccountName != "")
+    {
+        name = mCompleteName;
+        file = mAccountName;
+    }
+    else if (mSessionID != LLUUID::null && conv)
+    {
+        name = conv->getConversationName();
+        file = conv->getHistoryFileName();
+        mIsGroup = (LLIMModel::LLIMSession::GROUP_SESSION == conv->getConversationType());
+    }
+    else
+    {
+        name = LLTrans::getString("NearbyChatTitle");
+        file = "chat";
+    }
+    mChatHistoryFileName = file;
+    if (mIsGroup && !LLStringUtil::endsWith(mChatHistoryFileName, GROUP_CHAT_SUFFIX))
+    {
+        mChatHistoryFileName += GROUP_CHAT_SUFFIX;
+    }
+    LLStringUtil::format_map_t args;
+    args["[NAME]"] = name;
+    std::string title = getString("Title", args);
+    setTitle(title);
+
+    return LLFloater::postBuild();
+}
+
+void LLFloaterConversationPreview::setPages(std::list<LLSD>* messages, const std::string& file_name)
+{
+    if(file_name == mChatHistoryFileName && messages)
+    {
+        // additional protection to avoid changes of mMessages in setPages()
+        LLMutexLock lock(&mMutex);
+        if (mMessages)
+        {
+            delete mMessages; // Clean up temporary message list with "Loading..." text
+        }
+        mMessages = messages;
+        mCurrentPage = (mMessages->size() ? (mMessages->size() - 1) / mPageSize : 0);
+
+        mPageSpinner->setEnabled(true);
+        mPageSpinner->setMaxValue(mCurrentPage+1);
+        mPageSpinner->set(mCurrentPage+1);
+
+        std::string total_page_num = llformat("/ %d", mCurrentPage+1);
+        getChild<LLTextBox>("page_num_label")->setValue(total_page_num);
+        mShowHistory = true;
+    }
+    LLLoadHistoryThread* loadThread = LLLogChat::getInstance()->getLoadHistoryThread(mSessionID);
+    if (loadThread)
+    {
+        loadThread->removeLoadEndSignal(boost::bind(&LLFloaterConversationPreview::setPages, this, _1, _2));
+    }
+}
+
+void LLFloaterConversationPreview::draw()
+{
+    if(mShowHistory)
+    {
+        showHistory();
+        mShowHistory = false;
+    }
+    LLFloater::draw();
+}
+
+void LLFloaterConversationPreview::onOpen(const LLSD& key)
+{
+    if (mOpened)
+    {
+        return;
+    }
+    mOpened = true;
+    if (!LLLogChat::getInstance()->historyThreadsFinished(mSessionID))
+    {
+        LLNotificationsUtil::add("ChatHistoryIsBusyAlert");
+        mHistoryThreadsBusy = true;
+        closeFloater();
+        return;
+    }
+    LLSD load_params;
+    load_params["load_all_history"] = true;
+    load_params["cut_off_todays_date"] = false;
+    load_params["is_group"] = mIsGroup;
+
+    // The temporary message list with "Loading..." text
+    // Will be deleted upon loading completion in setPages() method
+    mMessages = new std::list<LLSD>();
+
+
+    LLSD loading;
+    loading[LL_IM_TEXT] = LLTrans::getString("loading_chat_logs");
+    mMessages->push_back(loading);
+    mPageSpinner = getChild<LLSpinCtrl>("history_page_spin");
+    mPageSpinner->setCommitCallback(boost::bind(&LLFloaterConversationPreview::onMoreHistoryBtnClick, this));
+    mPageSpinner->setMinValue(1);
+    mPageSpinner->set(1);
+    mPageSpinner->setEnabled(false);
+
+    // The actual message list to load from file
+    // Will be deleted in a separate thread LLDeleteHistoryThread not to freeze UI
+    // LLDeleteHistoryThread is started in destructor
+    std::list<LLSD>* messages = new std::list<LLSD>();
+
+    LLLogChat *log_chat_inst = LLLogChat::getInstance();
+    log_chat_inst->cleanupHistoryThreads();
+
+    LLLoadHistoryThread* loadThread = new LLLoadHistoryThread(mChatHistoryFileName, messages, load_params);
+    loadThread->setLoadEndSignal(boost::bind(&LLFloaterConversationPreview::setPages, this, _1, _2));
+    loadThread->start();
+    log_chat_inst->addLoadHistoryThread(mSessionID, loadThread);
+
+    LLDeleteHistoryThread* deleteThread = new LLDeleteHistoryThread(messages, loadThread);
+    log_chat_inst->addDeleteHistoryThread(mSessionID, deleteThread);
+
+    mShowHistory = true;
+}
+
+void LLFloaterConversationPreview::onClose(bool app_quitting)
+{
+    mOpened = false;
+    if (!mHistoryThreadsBusy)
+    {
+        LLDeleteHistoryThread* deleteThread = LLLogChat::getInstance()->getDeleteHistoryThread(mSessionID);
+        if (deleteThread)
+        {
+            deleteThread->start();
+        }
+    }
+}
+
+void LLFloaterConversationPreview::showHistory()
+{
+    // additional protection to avoid changes of mMessages in setPages
+    LLMutexLock lock(&mMutex);
+    if(mMessages == NULL || !mMessages->size() || mCurrentPage * mPageSize >= mMessages->size())
+    {
+        return;
+    }
+
+    mChatHistory->clear();
+    std::ostringstream message;
+    std::list<LLSD>::const_iterator iter = mMessages->begin();
+    std::advance(iter, mCurrentPage * mPageSize);
+
+    for (int msg_num = 0; iter != mMessages->end() && msg_num < mPageSize; ++iter, ++msg_num)
+    {
+        LLSD msg = *iter;
+
+        LLUUID from_id      = LLUUID::null;
+        std::string time    = msg["time"].asString();
+        std::string from    = msg["from"].asString();
+        std::string message = msg["message"].asString();
+
+        if (msg["from_id"].isDefined())
+        {
+            from_id = msg["from_id"].asUUID();
+        }
+        else
+        {
+            std::string legacy_name = gCacheName->buildLegacyName(from);
+            from_id = LLAvatarNameCache::getInstance()->findIdByName(legacy_name);
+        }
+
+        LLChat chat;
+        chat.mFromID = from_id;
+        chat.mSessionID = mSessionID;
+        chat.mFromName = from;
+        chat.mTimeStr = time;
+        chat.mChatStyle = CHAT_STYLE_HISTORY;
+        chat.mText = message;
+
+        if (from_id.isNull() && SYSTEM_FROM == from)
+        {
+            chat.mSourceType = CHAT_SOURCE_SYSTEM;
+
+        }
+        else if (from_id.isNull())
+        {
+            chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
+        }
+
+        LLSD chat_args;
+        chat_args["use_plain_text_chat_history"] =
+                        gSavedSettings.getBOOL("PlainTextChatHistory");
+        chat_args["show_time"] = gSavedSettings.getBOOL("IMShowTime");
+        chat_args["show_names_for_p2p_conv"] = gSavedSettings.getBOOL("IMShowNamesForP2PConv");
+
+        mChatHistory->appendMessage(chat,chat_args);
+    }
+}
+
+void LLFloaterConversationPreview::onMoreHistoryBtnClick()
+{
+    mCurrentPage = (int)(mPageSpinner->getValueF32());
+    if (!mCurrentPage)
+    {
+        return;
+    }
+
+    mCurrentPage--;
+    mShowHistory = true;
+}