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

Feature Request: Make Log viewing cross platform by opening in a browser window

Browse Source 
INB4 Windows users express discomfort.
This commit is contained in:
Inusaito Sayori
2013-10-03 19:59:11 -04:00
parent cfeb50ae4d
commit 36d658c4c4
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloaterchat.cpp
View File

@@ -650,13 +650,12 @@ void LLFloaterChat::onClickToggleActiveSpeakers(void* userdata)
//self->childSetVisible("active_speakers_panel", !self->childIsVisible("active_speakers_panel")); //self->childSetVisible("active_speakers_panel", !self->childIsVisible("active_speakers_panel"));
} }
void show_log_browser(const std::string& name = "chat", const std::string& id = "chat");
// static // static
void LLFloaterChat::onClickChatHistoryOpen(void* userdata) void LLFloaterChat::onClickChatHistoryOpen(void* userdata)
{ {
std::string command("\"" + LLLogChat::makeLogFileName("chat") + "\""); show_log_browser();
gViewerWindow->getWindow()->ShellEx(command);
llinfos << command << llendl;
} }
//static //static

18
indra/newview/llimpanel.cpp
View File

@@ -41,6 +41,7 @@
#include "llcombobox.h" #include "llcombobox.h"
#include "llfloaterchat.h" #include "llfloaterchat.h"
#include "llfloaterinventory.h" #include "llfloaterinventory.h"
#include "llfloaterwebcontent.h" // For web browser display of logs
#include "llgroupactions.h" #include "llgroupactions.h"
#include "llhttpclient.h" #include "llhttpclient.h"
#include "llimview.h" #include "llimview.h"
@@ -1086,17 +1087,24 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
} }
} }
void show_log_browser(const std::string& name, const std::string& id)
{
LLFloaterWebContent::Params p;
p.url("file:///" + LLLogChat::makeLogFileName(name));
p.id(id);
p.show_chrome(false);
p.trusted_content(true);
LLFloaterWebContent::showInstance("log", p); // If we passed id instead of "log", there would be no control over how many log browsers opened at once.
}
void LLFloaterIMPanel::onClickHistory() void LLFloaterIMPanel::onClickHistory()
{ {
if (mOtherParticipantUUID.notNull()) if (mOtherParticipantUUID.notNull())
{ {
// [Ansariel: Display name support] // [Ansariel: Display name support]
//std::string command("\"" + LLLogChat::makeLogFileName(getTitle()) + "\""); //show_log_browser(getTitle(), mOtherParticipantUUID.asString());
std::string command("\"" + LLLogChat::makeLogFileName(mSessionLabel) + "\""); show_log_browser(mSessionLabel, mOtherParticipantUUID.asString());
// [/Ansariel: Display name support] // [/Ansariel: Display name support]
gViewerWindow->getWindow()->ShellEx(command);
llinfos << command << llendl;
} }
} }