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

Merge branch 'master' of https://github.com/LightDrake/SingularityViewer

Browse Source
This commit is contained in:
Drake Arconis
2013-10-07 23:24:04 -04:00
parent a4fa66655e 008eac5a8d
commit 010723eea6
9 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/aihttpview.cpp
View File

@@ -109,14 +109,14 @@ void AIServiceBar::draw()
{
if (col < 2)
{
text = llformat(" | %hu-%hu-%lu,{%hu/%hu,%u}/%u",
text = llformat(" | %hu-%hd-%lu,{%hu/%hu,%u}/%u",
ct.mApprovedRequests, ct.mQueuedCommands, ct.mQueuedRequests.size(),
ct.mAdded, ct.mConcurrentConnections, ct.mDownloading,
ct.mMaxPipelinedRequests);
}
else
{
text = llformat(" | --%hu-%lu,{%hu/%hu,%u}",
text = llformat(" | --%hd-%lu,{%hu/%hu,%u}",
ct.mQueuedCommands, ct.mQueuedRequests.size(),
ct.mAdded, ct.mConcurrentConnections, ct.mDownloading);
}

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

@@ -731,6 +731,17 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>LiruLegacyLogLaunch</key>
<map>
<key>Comment</key>
<string>When opening a chat log, open in an external text editor instead of a browser floater(Windows Only).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<boolean>0</boolean>
</map>
<key>LiruLegacyOutfitStoreObjChanges</key>
<map>
<key>Comment</key>

5
indra/newview/llimpanel.cpp
View File

@@ -1089,6 +1089,11 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
void show_log_browser(const std::string& name, const std::string& id)
{
if (gSavedSettings.getBOOL("LiruLegacyLogLaunch"))
{
gViewerWindow->getWindow()->ShellEx("\"" + LLLogChat::makeLogFileName(name) + "\"");
return;
}
LLFloaterWebContent::Params p;
p.url("file:///" + LLLogChat::makeLogFileName(name));
p.id(id);