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

Default legacy log launch to on, and limit it to platforms it works on(windows) at compile time.

Browse Source
This commit is contained in:
Inusaito Sayori
2013-11-26 04:49:37 -05:00
parent 7383b0a974
commit 4c1880acac
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@@ -717,7 +717,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<boolean>0</boolean> <boolean>1</boolean>
</map> </map>
<key>LiruLegacyOutfitStoreObjChanges</key> <key>LiruLegacyOutfitStoreObjChanges</key>
<map> <map>

2
indra/newview/llimpanel.cpp
View File

@@ -995,11 +995,13 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
void show_log_browser(const std::string& name, const std::string& id) void show_log_browser(const std::string& name, const std::string& id)
{ {
#if LL_WINDOWS // Singu TODO: Other platforms?
if (gSavedSettings.getBOOL("LiruLegacyLogLaunch")) if (gSavedSettings.getBOOL("LiruLegacyLogLaunch"))
{ {
gViewerWindow->getWindow()->ShellEx("\"" + LLLogChat::makeLogFileName(name) + "\""); gViewerWindow->getWindow()->ShellEx("\"" + LLLogChat::makeLogFileName(name) + "\"");
return; return;
} }
#endif
LLFloaterWebContent::Params p; LLFloaterWebContent::Params p;
p.url("file:///" + LLLogChat::makeLogFileName(name)); p.url("file:///" + LLLogChat::makeLogFileName(name));
p.id(id); p.id(id);